From ae16b45c1170cd4361b8fac9fadc225101803f9a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 13 Apr 2019 16:54:21 +0900
Subject: Fix bug

---
 src/server/api/endpoints/admin/emoji/list.ts | 4 ++--
 src/server/api/endpoints/users/followers.ts  | 4 ++--
 src/server/api/endpoints/users/following.ts  | 4 ++--
 src/server/api/private/signup.ts             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/server')

diff --git a/src/server/api/endpoints/admin/emoji/list.ts b/src/server/api/endpoints/admin/emoji/list.ts
index cf73e4cc75..54686a5c5a 100644
--- a/src/server/api/endpoints/admin/emoji/list.ts
+++ b/src/server/api/endpoints/admin/emoji/list.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import define from '../../../define';
 import { Emojis } from '../../../../../models';
-import { toPuny } from '../../../../../misc/convert-host';
+import { toPunyNullable } from '../../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -23,7 +23,7 @@ export const meta = {
 
 export default define(meta, async (ps) => {
 	const emojis = await Emojis.find({
-		host: ps.host ? toPuny(ps.host) : null
+		host: toPunyNullable(ps.host)
 	});
 
 	return emojis.map(e => ({
diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts
index 88a474be7c..0cb68353ca 100644
--- a/src/server/api/endpoints/users/followers.ts
+++ b/src/server/api/endpoints/users/followers.ts
@@ -4,7 +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';
+import { toPunyNullable } from '../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -66,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: toPuny(ps.host!) });
+		: { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(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 5e017150e8..2e273dc0c2 100644
--- a/src/server/api/endpoints/users/following.ts
+++ b/src/server/api/endpoints/users/following.ts
@@ -4,7 +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';
+import { toPunyNullable } from '../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -66,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: toPuny(ps.host!) });
+		: { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) });
 
 	if (user == null) {
 		throw new ApiError(meta.errors.noSuchUser);
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index 80f2d87b12..f8dba2eb29 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -10,7 +10,7 @@ import { genId } from '../../../misc/gen-id';
 import { usersChart } from '../../../services/chart';
 import { User } from '../../../models/entities/user';
 import { UserKeypair } from '../../../models/entities/user-keypair';
-import { toPuny } from '../../../misc/convert-host';
+import { toPunyNullable } from '../../../misc/convert-host';
 import { UserProfile } from '../../../models/entities/user-profile';
 import { getConnection } from 'typeorm';
 
@@ -109,7 +109,7 @@ export default async (ctx: Koa.BaseContext) => {
 			createdAt: new Date(),
 			username: username,
 			usernameLower: username.toLowerCase(),
-			host: host ? toPuny(host) : null,
+			host: toPunyNullable(host),
 			token: secret,
 			isAdmin: config.autoAdmin && usersCount === 0,
 		}));
-- 
cgit v1.2.3-freya