diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-21 17:59:29 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-21 17:59:29 +0900 |
| commit | f00ceedae48e7969ca9e80f0af2280bf060421ec (patch) | |
| tree | 620bb82f6a2ce41f3b3b3d187242bd5bc8e35171 /src/server/api/endpoints/users.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.89.0 (diff) | |
| download | misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.tar.gz misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.tar.bz2 misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints/users.ts')
| -rw-r--r-- | src/server/api/endpoints/users.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index 3c30f459da..930dcc7616 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; import define from '../define'; -import { Users } from '../../../models'; +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); |