From bfd1adf761d1dbb0d79ce9891c5c90c047414c4b Mon Sep 17 00:00:00 2001 From: Johann150 Date: Sun, 19 Feb 2023 17:57:49 +0100 Subject: [PATCH] BREAKING server: restructure endpoints related to user administration - `admin/abuse-user-reports` -> `admin/reports/list` - `admin/delete-all-files-of-a-user` -> `admin/users/delete-all-files` - `admin/resolve-abuse-user-report` -> `admin/reports/resolve` - `admin/accounts/create` -> `admin/users/create` - `admin/accounts/delete` -> `admin/users/delete` - `admin/show-user` -> `admin/users/show` - `admin/show-users` -> `admin/users` - `admin/silence-user` -> `admin/users/silence` - `admin/suspend-user` -> `admin/users/suspend` - `admin/unsilence-user` -> `admin/users/unsilence` - `admin/unsuspend-user` -> `admin/users/unsuspend` - `admin/reset-password` -> `admin/users/reset-password` Changelog: Changed --- packages/backend/src/server/api/endpoints.ts | 48 +++++++++---------- .../list.ts} | 0 .../resolve.ts} | 0 .../admin/{show-users.ts => users.ts} | 0 .../admin/{accounts => users}/create.ts | 0 .../delete-all-files.ts} | 0 .../admin/{accounts => users}/delete.ts | 0 .../admin/{ => users}/reset-password.ts | 0 .../admin/{show-user.ts => users/show.ts} | 0 .../{silence-user.ts => users/silence.ts} | 0 .../{suspend-user.ts => users/suspend.ts} | 0 .../{unsilence-user.ts => users/unsilence.ts} | 0 .../{unsuspend-user.ts => users/unsuspend.ts} | 0 13 files changed, 24 insertions(+), 24 deletions(-) rename packages/backend/src/server/api/endpoints/admin/{abuse-user-reports.ts => reports/list.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{resolve-abuse-user-report.ts => reports/resolve.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{show-users.ts => users.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{accounts => users}/create.ts (100%) rename packages/backend/src/server/api/endpoints/admin/{delete-all-files-of-a-user.ts => users/delete-all-files.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{accounts => users}/delete.ts (100%) rename packages/backend/src/server/api/endpoints/admin/{ => users}/reset-password.ts (100%) rename packages/backend/src/server/api/endpoints/admin/{show-user.ts => users/show.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{silence-user.ts => users/silence.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{suspend-user.ts => users/suspend.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{unsilence-user.ts => users/unsilence.ts} (100%) rename packages/backend/src/server/api/endpoints/admin/{unsuspend-user.ts => users/unsuspend.ts} (100%) diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index 02f13d3a9..8b4dfbebb 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -2,14 +2,10 @@ import { Schema } from '@/misc/schema.js'; import { errors } from './error.js'; import * as ep___admin_meta from './endpoints/admin/meta.js'; -import * as ep___admin_abuseUserReports from './endpoints/admin/abuse-user-reports.js'; -import * as ep___admin_accounts_create from './endpoints/admin/accounts/create.js'; -import * as ep___admin_accounts_delete from './endpoints/admin/accounts/delete.js'; import * as ep___admin_announcements_create from './endpoints/admin/announcements/create.js'; import * as ep___admin_announcements_delete from './endpoints/admin/announcements/delete.js'; import * as ep___admin_announcements_list from './endpoints/admin/announcements/list.js'; import * as ep___admin_announcements_update from './endpoints/admin/announcements/update.js'; -import * as ep___admin_deleteAllFilesOfAUser from './endpoints/admin/delete-all-files-of-a-user.js'; import * as ep___admin_drive_cleanRemoteFiles from './endpoints/admin/drive/clean-remote-files.js'; import * as ep___admin_drive_files from './endpoints/admin/drive/files.js'; import * as ep___admin_drive_showFile from './endpoints/admin/drive/show-file.js'; @@ -41,17 +37,21 @@ import * as ep___admin_queue_stats from './endpoints/admin/queue/stats.js'; import * as ep___admin_relays_add from './endpoints/admin/relays/add.js'; import * as ep___admin_relays_list from './endpoints/admin/relays/list.js'; import * as ep___admin_relays_remove from './endpoints/admin/relays/remove.js'; -import * as ep___admin_resetPassword from './endpoints/admin/reset-password.js'; -import * as ep___admin_resolveAbuseUserReport from './endpoints/admin/resolve-abuse-user-report.js'; +import * as ep___admin_reports_list from './endpoints/admin/reports/list.js'; +import * as ep___admin_reports_resolve from './endpoints/admin/reports/resolve.js'; import * as ep___admin_sendEmail from './endpoints/admin/send-email.js'; import * as ep___admin_serverInfo from './endpoints/admin/server-info.js'; import * as ep___admin_showModerationLogs from './endpoints/admin/show-moderation-logs.js'; -import * as ep___admin_showUser from './endpoints/admin/show-user.js'; -import * as ep___admin_showUsers from './endpoints/admin/show-users.js'; -import * as ep___admin_silenceUser from './endpoints/admin/silence-user.js'; -import * as ep___admin_suspendUser from './endpoints/admin/suspend-user.js'; -import * as ep___admin_unsilenceUser from './endpoints/admin/unsilence-user.js'; -import * as ep___admin_unsuspendUser from './endpoints/admin/unsuspend-user.js'; +import * as ep___admin_users from './endpoints/admin/users.js'; +import * as ep___admin_users_create from './endpoints/admin/users/create.js'; +import * as ep___admin_users_delete from './endpoints/admin/users/delete.js'; +import * as ep___admin_users_deleteAllFiles from './endpoints/admin/users/delete-all-files.js'; +import * as ep___admin_users_resetPassword from './endpoints/admin/users/reset-password.js'; +import * as ep___admin_users_show from './endpoints/admin/users/show.js'; +import * as ep___admin_users_silence from './endpoints/admin/users/silence.js'; +import * as ep___admin_users_suspend from './endpoints/admin/users/suspend.js'; +import * as ep___admin_users_unsilence from './endpoints/admin/users/unsilence.js'; +import * as ep___admin_users_unsuspend from './endpoints/admin/users/unsuspend.js'; import * as ep___admin_updateMeta from './endpoints/admin/update-meta.js'; import * as ep___admin_vacuum from './endpoints/admin/vacuum.js'; import * as ep___announcements from './endpoints/announcements.js'; @@ -298,14 +298,10 @@ import * as ep___fetchRss from './endpoints/fetch-rss.js'; const eps = [ ['admin/meta', ep___admin_meta], - ['admin/abuse-user-reports', ep___admin_abuseUserReports], - ['admin/accounts/create', ep___admin_accounts_create], - ['admin/accounts/delete', ep___admin_accounts_delete], ['admin/announcements/create', ep___admin_announcements_create], ['admin/announcements/delete', ep___admin_announcements_delete], ['admin/announcements/list', ep___admin_announcements_list], ['admin/announcements/update', ep___admin_announcements_update], - ['admin/delete-all-files-of-a-user', ep___admin_deleteAllFilesOfAUser], ['admin/drive/clean-remote-files', ep___admin_drive_cleanRemoteFiles], ['admin/drive/files', ep___admin_drive_files], ['admin/drive/show-file', ep___admin_drive_showFile], @@ -337,17 +333,21 @@ const eps = [ ['admin/relays/add', ep___admin_relays_add], ['admin/relays/list', ep___admin_relays_list], ['admin/relays/remove', ep___admin_relays_remove], - ['admin/reset-password', ep___admin_resetPassword], - ['admin/resolve-abuse-user-report', ep___admin_resolveAbuseUserReport], + ['admin/reports/list', ep___admin_reports_list], + ['admin/reports/resolve', ep___admin_reports_resolve], ['admin/send-email', ep___admin_sendEmail], ['admin/server-info', ep___admin_serverInfo], ['admin/show-moderation-logs', ep___admin_showModerationLogs], - ['admin/show-user', ep___admin_showUser], - ['admin/show-users', ep___admin_showUsers], - ['admin/silence-user', ep___admin_silenceUser], - ['admin/suspend-user', ep___admin_suspendUser], - ['admin/unsilence-user', ep___admin_unsilenceUser], - ['admin/unsuspend-user', ep___admin_unsuspendUser], + ['admin/users', ep___admin_users], + ['admin/users/create', ep___admin_users_create], + ['admin/users/delete', ep___admin_users_delete], + ['admin/users/delete-all-files', ep___admin_users_deleteAllFiles], + ['admin/users/reset-password', ep___admin_users_resetPassword], + ['admin/users/show', ep___admin_users_show], + ['admin/users/silence', ep___admin_users_silence], + ['admin/users/suspend', ep___admin_users_suspend], + ['admin/users/unsilence', ep___admin_users_unsilence], + ['admin/users/unsuspend', ep___admin_users_unsuspend], ['admin/update-meta', ep___admin_updateMeta], ['admin/vacuum', ep___admin_vacuum], ['announcements', ep___announcements], diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/reports/list.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts rename to packages/backend/src/server/api/endpoints/admin/reports/list.ts diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/reports/resolve.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts rename to packages/backend/src/server/api/endpoints/admin/reports/resolve.ts diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/users.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/show-users.ts rename to packages/backend/src/server/api/endpoints/admin/users.ts diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/users/create.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/accounts/create.ts rename to packages/backend/src/server/api/endpoints/admin/users/create.ts diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/users/delete-all-files.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts rename to packages/backend/src/server/api/endpoints/admin/users/delete-all-files.ts diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/users/delete.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/accounts/delete.ts rename to packages/backend/src/server/api/endpoints/admin/users/delete.ts diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/users/reset-password.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/reset-password.ts rename to packages/backend/src/server/api/endpoints/admin/users/reset-password.ts diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/users/show.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/show-user.ts rename to packages/backend/src/server/api/endpoints/admin/users/show.ts diff --git a/packages/backend/src/server/api/endpoints/admin/silence-user.ts b/packages/backend/src/server/api/endpoints/admin/users/silence.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/silence-user.ts rename to packages/backend/src/server/api/endpoints/admin/users/silence.ts diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/users/suspend.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/suspend-user.ts rename to packages/backend/src/server/api/endpoints/admin/users/suspend.ts diff --git a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts b/packages/backend/src/server/api/endpoints/admin/users/unsilence.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/unsilence-user.ts rename to packages/backend/src/server/api/endpoints/admin/users/unsilence.ts diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/users/unsuspend.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts rename to packages/backend/src/server/api/endpoints/admin/users/unsuspend.ts