データ取得のフォールバックを強化

misskey-dev · Dec 29, 2024 · d66c2a6 · d66c2a6
1 parent a7d3a34
commit d66c2a6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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);