diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2024-09-24 19:27:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 19:27:20 +0900 |
| commit | c9819babfefb9c97fa56c33439f0d29351462e31 (patch) | |
| tree | 50799bf1fd17b16dc1570d67340dbd0e8f4bc818 /packages/frontend-embed | |
| parent | Bump version to 2024.9.0-alpha.9 (diff) | |
| download | sharkey-c9819babfefb9c97fa56c33439f0d29351462e31.tar.gz sharkey-c9819babfefb9c97fa56c33439f0d29351462e31.tar.bz2 sharkey-c9819babfefb9c97fa56c33439f0d29351462e31.zip | |
fix(frontend-embed): #14613 で抜け落ちた処理を戻す (#14623)
Diffstat (limited to 'packages/frontend-embed')
| -rw-r--r-- | packages/frontend-embed/src/pages/note.vue | 9 | ||||
| -rw-r--r-- | packages/frontend-embed/src/utils.ts | 2 |
2 files changed, 9 insertions, 2 deletions
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}`; }; |