summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/admin/show-users.ts
diff options
context:
space:
mode:
authormisskey-release-bot[bot] <157398866+misskey-release-bot[bot]@users.noreply.github.com>2024-10-15 04:53:46 +0000
committerGitHub <noreply@github.com>2024-10-15 04:53:46 +0000
commitb99e13e66730209ffa7a87785257b9a785efc7ea (patch)
tree73f32398d2afa502dcef62ff37fe99bc832eb792 /packages/backend/src/server/api/endpoints/admin/show-users.ts
parentMerge pull request #14675 from misskey-dev/develop (diff)
parentRelease: 2024.10.1 (diff)
downloadmisskey-b99e13e66730209ffa7a87785257b9a785efc7ea.tar.gz
misskey-b99e13e66730209ffa7a87785257b9a785efc7ea.tar.bz2
misskey-b99e13e66730209ffa7a87785257b9a785efc7ea.zip
Merge pull request #14741 from misskey-dev/develop
Release: 2024.10.1
Diffstat (limited to 'packages/backend/src/server/api/endpoints/admin/show-users.ts')
-rw-r--r--packages/backend/src/server/api/endpoints/admin/show-users.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts
index 2fef9abbf9..2b2c8c60ab 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts
@@ -71,13 +71,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
break;
}
case 'moderator': {
- const moderatorIds = await this.roleService.getModeratorIds(false);
+ const moderatorIds = await this.roleService.getModeratorIds({ includeAdmins: false });
if (moderatorIds.length === 0) return [];
query.where('user.id IN (:...moderatorIds)', { moderatorIds: moderatorIds });
break;
}
case 'adminOrModerator': {
- const adminOrModeratorIds = await this.roleService.getModeratorIds();
+ const adminOrModeratorIds = await this.roleService.getModeratorIds({ includeAdmins: true });
if (adminOrModeratorIds.length === 0) return [];
query.where('user.id IN (:...adminOrModeratorIds)', { adminOrModeratorIds: adminOrModeratorIds });
break;