fix(frontend-embed): misskey-dev#14613 で抜け落ちた処理を戻す

kakkokari-gtyih · Sep 24, 2024 · 58cdc0c · 58cdc0c
1 parent 4be307f
commit 58cdc0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/frontend-embed/src/pages/note.vue b/packages/frontend-embed/src/pages/note.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="$style.noteEmbedRoot">
-	<EmNoteDetailed v-if="note" :note="note"/>
+	<EmNoteDetailed v-if="note && !prohibited" :note="note"/>
 	<XNotFound v-else/>
 </div>
 </template>
@@ -27,6 +27,8 @@ const serverContext = inject(DI.serverContext)!;
 
 const note = ref<Misskey.entities.Note | null>(null);
 
+const prohibited = ref(false);
+
 if (assertServerContext(serverContext, 'note')) {
 	note.value = serverContext.note;
 } else {
@@ -36,6 +38,11 @@ if (assertServerContext(serverContext, 'note')) {
 		return null;
 	});
 }
+
+if (note.value?.url != null || note.value?.uri != null) {
+	// リモートサーバーのノートは弾く
+	prohibited.value = true;
+}
 </script>
 
 <style lang="scss" module>

diff --git a/packages/frontend-embed/src/utils.ts b/packages/frontend-embed/src/utils.ts
@@ -18,6 +18,6 @@ export const userPage = (user: Misskey.Acct, path?: string, absolute = false) =>
 	return `${absolute ? url : ''}/@${acct(user)}${(path ? `/${path}` : '')}`;
 };
 
-export const notePage = note => {
+export const notePage = (note: Misskey.entities.Note) => {
 	return `/notes/${note.id}`;
 };