From 734b30e59adadfc91238cb9fca738669d5d79b9e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 21 Jul 2022 20:12:07 -0600 Subject: [PATCH 1/2] Fix NotificationService bug returning html response on /api/v1/notifications endpoint when a notification id belonging to a deleted account is rendered by checking AccountService before NotificationTransformer. --- app/Services/NotificationService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php index f8d9a62e..51ff829c 100644 --- a/app/Services/NotificationService.php +++ b/app/Services/NotificationService.php @@ -203,13 +203,19 @@ class NotificationService { public static function getNotification($id) { - return Cache::remember('service:notification:'.$id, now()->addDays(3), function() use($id) { + return Cache::remember('service:notification:'.$id, 86400, function() use($id) { $n = Notification::with('item')->find($id); if(!$n) { return null; } + $account = AccountService::get($n->actor_id, true); + + if(!$account) { + return null; + } + $fractal = new Fractal\Manager(); $fractal->setSerializer(new ArraySerializer()); $resource = new Fractal\Resource\Item($n, new NotificationTransformer()); From 6d52550ee18cd58b8f8683d77f9d17d1a3dde3c6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 21 Jul 2022 20:12:31 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da733fe1..b3f68743 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ - Fix remote avatar urls when not using cloud storage ([672f7c8c](https://github.com/pixelfed/pixelfed/commit/672f7c8c)) - Update ResetPasswordController redirectTo path to /i/web as /home is deprecated ([8803c6de](https://github.com/pixelfed/pixelfed/commit/8803c6de)) - Fix v1 api block/mute endpoints, refresh RelationshipService cache after relationship changes ([54a5c3be](https://github.com/pixelfed/pixelfed/commit/54a5c3be)) +- Fix NotificationService bug returning html response on /api/v1/notifications endpoint when a notification id belonging to a deleted account is rendered by checking AccountService before NotificationTransformer. ([734b30e5](https://github.com/pixelfed/pixelfed/commit/734b30e5)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)