From 963f5387287c761a4a568f6163e18fb01ecb8a45 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 14 Jun 2022 18:01:23 +0900 Subject: lint fixes --- packages/backend/src/server/api/endpoints/users.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/backend/src/server/api/endpoints/users.ts') diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index 10527d15cc..2377faebd3 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -1,5 +1,5 @@ -import define from '../define.js'; import { Users } from '@/models/index.js'; +import define from '../define.js'; import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query.js'; import { generateBlockQueryForUsers } from '../common/generate-block-query.js'; @@ -25,8 +25,8 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, offset: { type: 'integer', default: 0 }, sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] }, - state: { type: 'string', enum: ['all', 'admin', 'moderator', 'adminOrModerator', 'alive'], default: "all" }, - origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "local" }, + state: { type: 'string', enum: ['all', 'admin', 'moderator', 'adminOrModerator', 'alive'], default: 'all' }, + origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' }, }, required: [], } as const; -- cgit v1.2.3-freya From 6f3e64f13e146ba3bf9b97f0444c7518d98195ab Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 30 Jun 2022 15:32:11 +0900 Subject: chore(client): tweak client --- packages/backend/src/server/api/endpoints/users.ts | 10 ++++++++++ packages/client/src/pages/instance-info.vue | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'packages/backend/src/server/api/endpoints/users.ts') diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index 2377faebd3..3a8211374b 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -27,6 +27,12 @@ export const paramDef = { sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] }, state: { type: 'string', enum: ['all', 'admin', 'moderator', 'adminOrModerator', 'alive'], default: 'all' }, origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' }, + hostname: { + type: 'string', + nullable: true, + default: null, + description: 'The local host is represented with `null`.', + }, }, required: [], } as const; @@ -48,6 +54,10 @@ export default define(meta, paramDef, async (ps, me) => { case 'remote': query.andWhere('user.host IS NOT NULL'); break; } + if (ps.hostname) { + query.andWhere('user.host = :hostname', { hostname: ps.hostname.toLowerCase() }); + } + switch (ps.sort) { case '+follower': query.orderBy('user.followersCount', 'DESC'); break; case '-follower': query.orderBy('user.followersCount', 'ASC'); break; diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index b72fcb1528..83f3354df1 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -143,12 +143,11 @@ let suspended = $ref(false); let isBlocked = $ref(false); const usersPagination = { - endpoint: 'admin/show-users' as const, + endpoint: iAmModerator ? 'admin/show-users' : 'users' as const, limit: 10, params: { sort: '+updatedAt', state: 'all', - origin: 'remote', hostname: props.host, }, offsetMode: true, -- cgit v1.2.3-freya