diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-13 16:54:21 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-13 16:54:21 +0900 |
| commit | ae16b45c1170cd4361b8fac9fadc225101803f9a (patch) | |
| tree | 9f7d2903069fc0ed3e9984174a831e403e5ce4b3 /src/server/api/endpoints | |
| parent | 11.0.0-beta.7 (diff) | |
| download | sharkey-ae16b45c1170cd4361b8fac9fadc225101803f9a.tar.gz sharkey-ae16b45c1170cd4361b8fac9fadc225101803f9a.tar.bz2 sharkey-ae16b45c1170cd4361b8fac9fadc225101803f9a.zip | |
Fix bug
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/admin/emoji/list.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/followers.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/following.ts | 4 |
3 files changed, 6 insertions, 6 deletions
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); |