diff options
| author | Marie <marie@kaifa.ch> | 2024-02-19 19:05:15 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-19 19:05:15 +0000 |
| commit | 4246b6434dd1daf4e16a873bee211ce5d43fc4fd (patch) | |
| tree | e5c680875320237716f8b77381fb14a06f3c9e98 /packages/frontend/src/scripts/get-note-menu.ts | |
| parent | merge: Bridged error message for when you try search for a post and it fails ... (diff) | |
| parent | fix: icons and update urls (diff) | |
| download | sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.tar.gz sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.tar.bz2 sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.zip | |
merge: Merge upstream from 19th Feburary (!428)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/428
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Diffstat (limited to 'packages/frontend/src/scripts/get-note-menu.ts')
| -rw-r--r-- | packages/frontend/src/scripts/get-note-menu.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index e9e0f89556..40359a88bb 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-FileCopyrightText: syuilo and misskey-project * SPDX-License-Identifier: AGPL-3.0-only */ @@ -102,10 +102,13 @@ export function getAbuseNoteMenu(note: Misskey.entities.Note, text: string): Men icon: 'ph-warning-circle ph-bold ph-lg', text, action: (): void => { - const u = note.url ?? note.uri ?? `${url}/notes/${note.id}`; + const localUrl = `${url}/notes/${note.id}`; + let noteInfo = ''; + if (note.url ?? note.uri != null) noteInfo = `Note: ${note.url ?? note.uri}\n`; + noteInfo += `Local Note: ${localUrl}\n`; os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { user: note.user, - initialComment: `Note: ${u}\n-----\n`, + initialComment: `${noteInfo}-----\n`, }, {}, 'closed'); }, }; |