diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue index 5b7f49368f..3586d82ee4 100644 --- a/packages/frontend/src/components/MkTimeline.vue +++ b/packages/frontend/src/components/MkTimeline.vue @@ -91,12 +91,16 @@ async function prepend(data: Misskey.entities.Note | Misskey.entities.StreamNote credentials: 'omit', }); if (!res.ok) return; - fullNote = (await res.json()) as Misskey.entities.Note; - } else { + fullNote = (await res.json().catch(() => null)) as Misskey.entities.Note | null; + } + + // キャッシュできないノート or キャッシュ用のノートが取得できなかった場合 + if (fullNote == null) { fullNote = await misskeyApi('notes/show', { noteId: data.id, - }); + }).catch(() => null); } + if (fullNote == null) return; note = deepMerge(_data, fullNote);