worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix null in query

Browse source
This commit is contained in:
syuilo 2022-03-26 19:48:22 +09:00
parent fa1a53270e
commit e6f455a9bb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/server/well-known.ts
View file

@ -6,6 +6,7 @@ import { links } from './nodeinfo.js';
import { escapeAttribute, escapeValue } from '@/prelude/xml.js'; import { escapeAttribute, escapeValue } from '@/prelude/xml.js';
import { Users } from '@/models/index.js'; import { Users } from '@/models/index.js';
import { User } from '@/models/entities/user.js'; import { User } from '@/models/entities/user.js';
import { FindOptionsWhere, IsNull } from 'typeorm';
// Init router // Init router
const router = new Router(); const router = new Router();
@ -66,13 +67,13 @@ router.get('/.well-known/change-password', async ctx => {
*/ */
router.get(webFingerPath, async ctx => { router.get(webFingerPath, async ctx => {
const fromId = (id: User['id']): Record<string, any> => ({ const fromId = (id: User['id']): FindOptionsWhere<User> => ({
id, id,
host: null, host: IsNull(),
isSuspended: false, isSuspended: false,
}); });
const generateQuery = (resource: string) => const generateQuery = (resource: string): FindOptionsWhere<User> | number =>
resource.startsWith(`${config.url.toLowerCase()}/users/`) ? resource.startsWith(`${config.url.toLowerCase()}/users/`) ?
fromId(resource.split('/').pop()!) : fromId(resource.split('/').pop()!) :
fromAcct(Acct.parse( fromAcct(Acct.parse(
@ -80,10 +81,10 @@ router.get(webFingerPath, async ctx => {
resource.startsWith('acct:') ? resource.slice('acct:'.length) : resource.startsWith('acct:') ? resource.slice('acct:'.length) :
resource)); 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() ? { !acct.host || acct.host === config.host.toLowerCase() ? {
usernameLower: acct.username, usernameLower: acct.username,
host: null, host: IsNull(),
isSuspended: false, isSuspended: false,
} : 422; } : 422;