diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 141aefd5af..66200a7f54 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1547,6 +1547,7 @@ admin/views/users.vue: state: title: "状態" all: "すべて" + available: "利用可能" admin: "管理者" moderator: "モデレーター" adminOrModerator: "管理者+モデレーター" diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue index 92b23749ff..920bfc381e 100644 --- a/src/client/app/admin/views/users.vue +++ b/src/client/app/admin/views/users.vue @@ -42,6 +42,7 @@ + diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts index 89e0cf1e2a..a1fadf3d81 100644 --- a/src/server/api/endpoints/admin/show-users.ts +++ b/src/server/api/endpoints/admin/show-users.ts @@ -33,6 +33,7 @@ export const meta = { state: { validator: $.optional.str.or([ 'all', + 'available', 'admin', 'moderator', 'adminOrModerator', @@ -67,6 +68,7 @@ export default define(meta, async (ps, me) => { const query = Users.createQueryBuilder('user'); switch (ps.state) { + case 'available': query.where('user.isSuspended = FALSE'); break; case 'admin': query.where('user.isAdmin = TRUE'); break; case 'moderator': query.where('user.isModerator = TRUE'); break; case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;