diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue
index 1f28f5f195..06928b61d3 100644
--- a/src/client/components/sidebar.vue
+++ b/src/client/components/sidebar.vue
@@ -63,7 +63,7 @@
-
+
@@ -544,7 +544,7 @@ export default defineComponent({
&:first-child, &:last-child {
position: sticky;
background: var(--bg);
- z-index: 1;
+ z-index: 1;
}
&:first-child {
diff --git a/src/client/pages/instance/user-dialog.vue b/src/client/pages/instance/user-dialog.vue
index 6a171eff46..afbc38ace9 100644
--- a/src/client/pages/instance/user-dialog.vue
+++ b/src/client/pages/instance/user-dialog.vue
@@ -30,7 +30,7 @@
{{ $ts.verify }}
{{ $ts.premium }}
{{ $ts.silence }}
- {{ $ts.suspend }}
+ {{ $ts.suspend }}
@@ -39,7 +39,7 @@
{{ $ts.updateRemoteUser }}
{{ $ts.resetPassword }}
{{ $ts.deleteAllFiles }}
- {{ $ts.deleteAccount }}
+ {{ $ts.deleteAccount }}
diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue
index 831e79ebdc..eacb8a1739 100644
--- a/src/client/pages/welcome.entrance.a.vue
+++ b/src/client/pages/welcome.entrance.a.vue
@@ -28,7 +28,7 @@
- {{ $ts.signup }}
+ {{ $ts.signup }}
{{ $ts.login }}
{{ $ts.explore }}
diff --git a/src/client/scripts/get-user-menu.ts b/src/client/scripts/get-user-menu.ts
index 2b4633c65f..ce77791931 100644
--- a/src/client/scripts/get-user-menu.ts
+++ b/src/client/scripts/get-user-menu.ts
@@ -204,7 +204,11 @@ export function getUserMenu(user) {
icon: faMicrophoneSlash,
text: user.isSilenced ? i18n.locale.unsilence : i18n.locale.silence,
action: toggleSilence
- }, {
+ }]);
+ }
+
+ if ($i && ($i.isAdmin || $i.isModerator) && ((!user.isAdmin && !user.isModerator) || ((user.isAdmin || user.isModerator) && user.isSuspended))) {
+ menu = menu.concat([{
icon: faSnowflake,
text: user.isSuspended ? i18n.locale.unsuspend : i18n.locale.suspend,
action: toggleSuspend
diff --git a/src/server/api/endpoints/users/report-abuse.ts b/src/server/api/endpoints/users/report-abuse.ts
index f29830f346..8cbc68348b 100644
--- a/src/server/api/endpoints/users/report-abuse.ts
+++ b/src/server/api/endpoints/users/report-abuse.ts
@@ -69,10 +69,6 @@ export default define(meta, async (ps, me) => {
throw new ApiError(meta.errors.cannotReportYourself);
}
- if (user.isAdmin) {
- throw new ApiError(meta.errors.cannotReportAdmin);
- }
-
const report = await AbuseUserReports.save({
id: genId(),
createdAt: new Date(),