diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-03-26 19:48:22 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-03-26 19:48:22 +0900 |
| commit | e6f455a9bb1ff8cb7e4d20766784527e8991931d (patch) | |
| tree | fd00f5290ee09ca94440f26b60c275f40ba6984b /packages/backend/src/server | |
| parent | refactor (diff) | |
| download | misskey-e6f455a9bb1ff8cb7e4d20766784527e8991931d.tar.gz misskey-e6f455a9bb1ff8cb7e4d20766784527e8991931d.tar.bz2 misskey-e6f455a9bb1ff8cb7e4d20766784527e8991931d.zip | |
fix null in query
Diffstat (limited to 'packages/backend/src/server')
| -rw-r--r-- | packages/backend/src/server/well-known.ts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/backend/src/server/well-known.ts b/packages/backend/src/server/well-known.ts index e3ceb04fff..7530b4e0ba 100644 --- a/packages/backend/src/server/well-known.ts +++ b/packages/backend/src/server/well-known.ts @@ -6,6 +6,7 @@ import { links } from './nodeinfo.js'; import { escapeAttribute, escapeValue } from '@/prelude/xml.js'; import { Users } from '@/models/index.js'; import { User } from '@/models/entities/user.js'; +import { FindOptionsWhere, IsNull } from 'typeorm'; // Init router const router = new Router(); @@ -66,13 +67,13 @@ router.get('/.well-known/change-password', async ctx => { */ router.get(webFingerPath, async ctx => { - const fromId = (id: User['id']): Record<string, any> => ({ + const fromId = (id: User['id']): FindOptionsWhere<User> => ({ id, - host: null, + host: IsNull(), isSuspended: false, }); - const generateQuery = (resource: string) => + const generateQuery = (resource: string): FindOptionsWhere<User> | number => resource.startsWith(`${config.url.toLowerCase()}/users/`) ? fromId(resource.split('/').pop()!) : fromAcct(Acct.parse( @@ -80,10 +81,10 @@ router.get(webFingerPath, async ctx => { resource.startsWith('acct:') ? resource.slice('acct:'.length) : resource)); - const fromAcct = (acct: Acct.Acct): Record<string, any> | number => + const fromAcct = (acct: Acct.Acct): FindOptionsWhere<User> | number => !acct.host || acct.host === config.host.toLowerCase() ? { usernameLower: acct.username, - host: null, + host: IsNull(), isSuspended: false, } : 422; |