summaryrefslogtreecommitdiff
path: root/packages/frontend/src/scripts/get-note-menu.ts
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-19 10:47:42 +0100
committerMarie <marie@kaifa.ch>2024-02-19 10:47:42 +0100
commit10bfc616706e2903e3a7fd2b461ccfff71b09029 (patch)
tree852f49cd59c678d5a28bba755e0d75255b139c3a /packages/frontend/src/scripts/get-note-menu.ts
parentmerge: Bridged error message for when you try search for a post and it fails ... (diff)
parentFix(frontend): オートコンプリートが出るべき状況で出ない... (diff)
downloadsharkey-10bfc616706e2903e3a7fd2b461ccfff71b09029.tar.gz
sharkey-10bfc616706e2903e3a7fd2b461ccfff71b09029.tar.bz2
sharkey-10bfc616706e2903e3a7fd2b461ccfff71b09029.zip
merge: upstream
Diffstat (limited to 'packages/frontend/src/scripts/get-note-menu.ts')
-rw-r--r--packages/frontend/src/scripts/get-note-menu.ts9
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');
},
};