From c9819babfefb9c97fa56c33439f0d29351462e31 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:27:20 +0900
Subject: fix(frontend-embed): #14613 で抜け落ちた処理を戻す (#14623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend-embed/src/pages/note.vue | 9 ++++++++-
 packages/frontend-embed/src/utils.ts       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'packages/frontend-embed/src')

diff --git a/packages/frontend-embed/src/pages/note.vue b/packages/frontend-embed/src/pages/note.vue
index 918583ecc7..6f6c8c0f63 100644
--- 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
index 48e06b21ef..939648aa38 100644
--- 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}`;
 };
-- 
cgit v1.2.3-freya