From 27d43879a24b9243657af50d32d459a36b6596ec Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 26 Feb 2025 23:18:30 -0500 Subject: add moderation logs for many endpoints - `/admin/delete-all-files-of-a-user` - `/admin/nsfw-user` - `/admin/unnsfw-user` - `/admin/silence-user` - `/admin/unsilence-user` - `/admin/accounts/create` - `/admin/drive/clean-remote-files` - `/admin/drive/cleanup` - `/admin/emoji/set-category-bulk` - `/admin/emoji/set-license-bulk` - `/admin/emoji/set-aliases-bulk` - `/admin/emoji/add-aliases-bulk` - `/admin/emoji/remove-aliases-bulk` - `/admin/emoji/import-zip` - `/admin/federation/delete-all-files` - `/admin/federation/remove-all-following` - `/admin/promo/create` - `/admin/relay/add` - `/admin/relay/remove` --- .../frontend/src/pages/admin/modlog.ModLog.vue | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'packages/frontend/src') diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue index 306a873173..a4731af47b 100644 --- a/packages/frontend/src/pages/admin/modlog.ModLog.vue +++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue @@ -18,6 +18,10 @@ SPDX-License-Identifier: AGPL-3.0-only 'createAvatarDecoration', 'createSystemWebhook', 'createAbuseReportNotificationRecipient', + 'createAccount', + 'importCustomEmojis', + 'createPromo', + 'addRelay', ].includes(log.type), [$style.logYellow]: [ 'markSensitiveDriveFile', @@ -30,6 +34,11 @@ SPDX-License-Identifier: AGPL-3.0-only 'acceptRemoteInstanceReports', 'rejectQuotesUser', 'acceptQuotesUser', + 'nsfwUser', + 'unNsfwUser', + 'silenceUser', + 'unSilenceUser', + 'updateCustomEmojis', ].includes(log.type), [$style.logRed]: [ 'suspend', @@ -49,6 +58,12 @@ SPDX-License-Identifier: AGPL-3.0-only 'deletePage', 'deleteFlash', 'deleteGalleryPost', + 'clearUserFiles', + 'clearRemoteFiles', + 'clearOwnerlessFiles', + 'clearInstanceFiles', + 'severFollowRelations', + 'removeRelay', ].includes(log.type) }" >{{ i18n.ts._moderationLogTypes[log.type] }} @@ -100,6 +115,17 @@ SPDX-License-Identifier: AGPL-3.0-only : @{{ log.info.pageUserUsername }} : @{{ log.info.flashUserUsername }} : @{{ log.info.postUserUsername }} + : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} + : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} + : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} + : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} + : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} + : @{{ log.info.userUsername }} + : {{ log.info.fileName }} + : {{ log.info.host }} + : {{ log.info.host }} + : {{ log.info.inbox }} + : {{ log.info.inbox }} + + + + + + + + +
raw -- cgit v1.2.3-freya From cea77f3e2c799d062adbd78c289c7094f6ada091 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 27 Feb 2025 10:26:36 -0500 Subject: emit "show" event from MkLazy --- packages/frontend/src/components/global/MkLazy.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'packages/frontend/src') diff --git a/packages/frontend/src/components/global/MkLazy.vue b/packages/frontend/src/components/global/MkLazy.vue index f35932ae77..29908f303d 100644 --- a/packages/frontend/src/components/global/MkLazy.vue +++ b/packages/frontend/src/components/global/MkLazy.vue @@ -16,10 +16,20 @@ import { nextTick, onMounted, onActivated, onBeforeUnmount, ref, shallowRef } fr const rootEl = shallowRef(); const showing = ref(false); +const emit = defineEmits<{ + (ev: 'show'): void, +}>(); + const observer = new IntersectionObserver( (entries) => { if (entries.some((entry) => entry.isIntersecting)) { showing.value = true; + + // Disconnect to avoid observer soft-leaks + observer.disconnect(); + + // Notify containing element to trigger edge logic + emit('show'); } }, ); -- cgit v1.2.3-freya From 9e833f724b61bfbe0f09bb09027650020016f30d Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 27 Feb 2025 10:27:00 -0500 Subject: add DynamicNote to encapsulate MkNote / SkNote switching logic --- packages/frontend/src/components/DynamicNote.vue | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/frontend/src/components/DynamicNote.vue (limited to 'packages/frontend/src') diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue new file mode 100644 index 0000000000..6703099591 --- /dev/null +++ b/packages/frontend/src/components/DynamicNote.vue @@ -0,0 +1,49 @@ + + + + + -- cgit v1.2.3-freya From 20e2a6e95aefea2a84943e4846ad9bfc26755afd Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 27 Feb 2025 10:27:48 -0500 Subject: add SkFetchNote to render a note by ID --- locales/index.d.ts | 4 ++ packages/frontend/src/components/SkFetchNote.vue | 74 ++++++++++++++++++++++++ sharkey-locales/en-US.yml | 1 + 3 files changed, 79 insertions(+) create mode 100644 packages/frontend/src/components/SkFetchNote.vue (limited to 'packages/frontend/src') diff --git a/locales/index.d.ts b/locales/index.d.ts index 4907754394..ee99a9513d 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -11665,6 +11665,10 @@ export interface Locale extends ILocale { * Files removed: */ "filesRemoved": string; + /** + * Failed to load no + */ + "cannotLoadNote": string; "_flash": { /** * Flash Content Hidden diff --git a/packages/frontend/src/components/SkFetchNote.vue b/packages/frontend/src/components/SkFetchNote.vue new file mode 100644 index 0000000000..57577aa15b --- /dev/null +++ b/packages/frontend/src/components/SkFetchNote.vue @@ -0,0 +1,74 @@ + + + + + + + diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 7e69c9b97d..5336a36340 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -170,6 +170,7 @@ blockingYou: "Blocking you" warnExternalUrl: "Show warning when opening external URLs" flash: "Flash" filesRemoved: "Files removed:" +cannotLoadNote: "Failed to load no" _flash: contentHidden: "Flash Content Hidden" poweredByRuffle: "Powered by Ruffle." -- cgit v1.2.3-freya From e5b8fc3c800abaca820f292e4481f7a338cde0f4 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 27 Feb 2025 10:29:03 -0500 Subject: add missing modlog render blocks --- locales/index.d.ts | 6 +++++- packages/frontend/src/pages/admin/modlog.ModLog.vue | 15 +++++++++++++++ sharkey-locales/en-US.yml | 3 ++- 3 files changed, 22 insertions(+), 2 deletions(-) (limited to 'packages/frontend/src') diff --git a/locales/index.d.ts b/locales/index.d.ts index ee99a9513d..25662afe6a 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -11662,9 +11662,13 @@ export interface Locale extends ILocale { */ "flash": string; /** - * Files removed: + * Files removed */ "filesRemoved": string; + /** + * File imported + */ + "fileImported": string; /** * Failed to load no */ diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue index a4731af47b..1d60403f07 100644 --- a/packages/frontend/src/pages/admin/modlog.ModLog.vue +++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue @@ -121,9 +121,11 @@ SPDX-License-Identifier: AGPL-3.0-only : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} : @{{ log.info.userUsername }} + : {{ log.info.count }} : {{ log.info.fileName }} : {{ log.info.host }} : {{ log.info.host }} + : @{{ log.info.noteUserUsername }}{{ log.info.noteUserHost ? '@' + log.info.noteUserHost : '' }} : {{ log.info.inbox }} : {{ log.info.inbox }} @@ -253,6 +255,9 @@ SPDX-License-Identifier: AGPL-3.0-only +