From b7ed3ddfddb5de60a29707f15fbeb115c262d07b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:02:52 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E9=80=9A=E7=9F=A5=E8=AA=AD?=
 =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                          | 2 +-
 packages/backend/src/core/FederatedInstanceService.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6ea16a3ba..b2e90d9403 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@
 - PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
 
 ### Server
--
+- 通知読み込みでエラーが発生する場合がある問題を修正
 
 
 ## 13.11.0
diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 1d0c87280f..56660ae0d0 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -29,6 +29,7 @@ export class FederatedInstanceService {
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => {
 				const parsed = JSON.parse(value);
+				if (parsed == null) return null;
 				return {
 					...parsed,
 					firstRetrievedAt: new Date(parsed.firstRetrievedAt),