From 236d72685dfec013135fc1450b890e33ec377de1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 10 Apr 2019 00:59:41 +0900
Subject: More puny

---
 src/server/api/endpoints/admin/emoji/list.ts                 | 3 ++-
 src/server/api/endpoints/admin/federation/update-instance.ts | 5 +++--
 src/server/api/endpoints/federation/show-instance.ts         | 3 ++-
 src/server/api/endpoints/users/followers.ts                  | 3 ++-
 src/server/api/endpoints/users/following.ts                  | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/server/api/endpoints')

diff --git a/src/server/api/endpoints/admin/emoji/list.ts b/src/server/api/endpoints/admin/emoji/list.ts
index 07174723b9..26385d4e23 100644
--- a/src/server/api/endpoints/admin/emoji/list.ts
+++ b/src/server/api/endpoints/admin/emoji/list.ts
@@ -1,6 +1,7 @@
 import $ from 'cafy';
 import define from '../../../define';
 import { Emojis } from '../../../../../models';
+import { toPuny } from '../../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -22,7 +23,7 @@ export const meta = {
 
 export default define(meta, async (ps) => {
 	const emojis = await Emojis.find({
-		host: ps.host
+		host: toPuny(ps.host)
 	});
 
 	return emojis.map(e => ({
diff --git a/src/server/api/endpoints/admin/federation/update-instance.ts b/src/server/api/endpoints/admin/federation/update-instance.ts
index d1abe95a5b..90ab7a3ec5 100644
--- a/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -1,6 +1,7 @@
 import $ from 'cafy';
 import define from '../../../define';
 import { Instances } from '../../../../../models';
+import { toPuny } from '../../../../../misc/convert-host';
 
 export const meta = {
 	tags: ['admin'],
@@ -20,13 +21,13 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
-	const instance = await Instances.findOne({ host: ps.host });
+	const instance = await Instances.findOne({ host: toPuny(ps.host) });
 
 	if (instance == null) {
 		throw new Error('instance not found');
 	}
 
-	Instances.update({ host: ps.host }, {
+	Instances.update({ host: toPuny(ps.host) }, {
 		isMarkedAsClosed: ps.isClosed
 	});
 });
diff --git a/src/server/api/endpoints/federation/show-instance.ts b/src/server/api/endpoints/federation/show-instance.ts
index 875afa05b2..9afcf28a7c 100644
--- a/src/server/api/endpoints/federation/show-instance.ts
+++ b/src/server/api/endpoints/federation/show-instance.ts
@@ -1,6 +1,7 @@
 import $ from 'cafy';
 import define from '../../define';
 import { Instances } from '../../../../models';
+import { toPuny } from '../../../../misc/convert-host';
 
 export const meta = {
 	tags: ['federation'],
@@ -16,7 +17,7 @@ export const meta = {
 
 export default define(meta, async (ps, me) => {
 	const instance = await Instances
-		.findOne({ host: ps.host });
+		.findOne({ host: toPuny(ps.host) });
 
 	return instance;
 });
diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts
index 51b007ddaa..64d63e2d03 100644
--- a/src/server/api/endpoints/users/followers.ts
+++ b/src/server/api/endpoints/users/followers.ts
@@ -4,6 +4,7 @@ import define from '../../define';
 import { ApiError } from '../../error';
 import { Users, Followings } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
+import { toPuny } from '../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -65,7 +66,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId != null
 		? { id: ps.userId }
-		: { usernameLower: ps.username.toLowerCase(), host: ps.host });
+		: { usernameLower: ps.username.toLowerCase(), host: toPuny(ps.host) });
 
 	if (user == null) {
 		throw new ApiError(meta.errors.noSuchUser);
diff --git a/src/server/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts
index 46550f0f77..0e28001680 100644
--- a/src/server/api/endpoints/users/following.ts
+++ b/src/server/api/endpoints/users/following.ts
@@ -4,6 +4,7 @@ import define from '../../define';
 import { ApiError } from '../../error';
 import { Users, Followings } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
+import { toPuny } from '../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -65,7 +66,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId != null
 		? { id: ps.userId }
-		: { usernameLower: ps.username.toLowerCase(), host: ps.host });
+		: { usernameLower: ps.username.toLowerCase(), host: toPuny(ps.host) });
 
 	if (user == null) {
 		throw new ApiError(meta.errors.noSuchUser);
-- 
cgit v1.2.3-freya