diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index 130ae30244..930dcc7616 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -2,7 +2,7 @@ import $ from 'cafy'; import define from '../define'; import { Users } from '@/models/index'; import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query'; -import { generateBlockedUserQuery } from '../common/generate-block-query'; +import { generateBlockQueryForUsers } from '../common/generate-block-query'; export const meta = { tags: ['users'], @@ -90,7 +90,7 @@ export default define(meta, async (ps, me) => { } if (me) generateMutedUserQueryForUsers(query, me); - if (me) generateBlockedUserQuery(query, me); + if (me) generateBlockQueryForUsers(query, me); query.take(ps.limit!); query.skip(ps.offset); diff --git a/src/services/logger.ts b/src/services/logger.ts index 032e43c9ca..229be891e1 100644 --- a/src/services/logger.ts +++ b/src/services/logger.ts @@ -8,7 +8,7 @@ import { Log } from '@/models/entities/log'; import { genId } from '@/misc/gen-id'; import config from '@/config/index'; -import SyslogPro from 'syslog-pro'; +import * as SyslogPro from 'syslog-pro'; type Domain = { name: string;