summaryrefslogtreecommitdiff
path: root/packages/frontend/src/pages/admin/modlog.ModLog.vue
diff options
context:
space:
mode:
authorMarie <github@yuugi.dev>2024-10-06 19:39:38 +0000
committerMarie <github@yuugi.dev>2024-10-06 19:39:38 +0000
commit28bfd875372bb7769e1e303b4153ca2fdd0f2b8d (patch)
treea9ddb132cd78c1f99a491bb458f51fae5bceba2f /packages/frontend/src/pages/admin/modlog.ModLog.vue
parentmerge: Change the recent external url warning popup to the one from Cherrypic... (diff)
parentMerge branch 'develop' into hazelnoot/579-reject-reports (diff)
downloadsharkey-28bfd875372bb7769e1e303b4153ca2fdd0f2b8d.tar.gz
sharkey-28bfd875372bb7769e1e303b4153ca2fdd0f2b8d.tar.bz2
sharkey-28bfd875372bb7769e1e303b4153ca2fdd0f2b8d.zip
merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662 Closes #579, #715, and #716 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src/pages/admin/modlog.ModLog.vue')
-rw-r--r--packages/frontend/src/pages/admin/modlog.ModLog.vue8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index f6f276de53..9fe804b2bd 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -23,6 +23,10 @@ SPDX-License-Identifier: AGPL-3.0-only
'markSensitiveDriveFile',
'resetPassword',
'suspendRemoteInstance',
+ 'setRemoteInstanceNSFW',
+ 'unsetRemoteInstanceNSFW',
+ 'rejectRemoteInstanceReports',
+ 'acceptRemoteInstanceReports',
].includes(log.type),
[$style.logRed]: [
'suspend',
@@ -61,6 +65,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<span v-else-if="log.type === 'unmarkSensitiveDriveFile'">: @{{ log.info.fileUserUsername }}{{ log.info.fileUserHost ? '@' + log.info.fileUserHost : '' }}</span>
<span v-else-if="log.type === 'suspendRemoteInstance'">: {{ log.info.host }}</span>
<span v-else-if="log.type === 'unsuspendRemoteInstance'">: {{ log.info.host }}</span>
+ <span v-else-if="log.type === 'setRemoteInstanceNSFW'">: {{ log.info.host }}</span>
+ <span v-else-if="log.type === 'unsetRemoteInstanceNSFW'">: {{ log.info.host }}</span>
+ <span v-else-if="log.type === 'rejectRemoteInstanceReports'">: {{ log.info.host }}</span>
+ <span v-else-if="log.type === 'acceptRemoteInstanceReports'">: {{ log.info.host }}</span>
<span v-else-if="log.type === 'createGlobalAnnouncement'">: {{ log.info.announcement.title }}</span>
<span v-else-if="log.type === 'updateGlobalAnnouncement'">: {{ log.info.before.title }}</span>
<span v-else-if="log.type === 'deleteGlobalAnnouncement'">: {{ log.info.announcement.title }}</span>