diff options
| author | Kaity A <kaity@atikayda.au> | 2024-02-24 05:05:25 +0000 |
|---|---|---|
| committer | Kaity A <kaity@atikayda.au> | 2024-02-24 05:05:25 +0000 |
| commit | def2e8dff03da399e68045eec02dddc9d1781a0a (patch) | |
| tree | 6246b4898fb88d045c09accaf51d6a60b554d80e /packages/frontend/src/scripts/get-note-menu.ts | |
| parent | fix: delete old follow request (if exists) before creating new (diff) | |
| parent | merge: Reactions not working on child notes in detailed view (!438) (diff) | |
| download | sharkey-def2e8dff03da399e68045eec02dddc9d1781a0a.tar.gz sharkey-def2e8dff03da399e68045eec02dddc9d1781a0a.tar.bz2 sharkey-def2e8dff03da399e68045eec02dddc9d1781a0a.zip | |
Merge remote-tracking branch 'origin/develop' into fix/failed-follow
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'); }, }; |