From d2d069223284900bc75d2fc80dd0c453cf64ddee Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 20 Sep 2024 16:58:06 +0200 Subject: [PATCH] Fix issue when encountering reblog of deleted post in feed rebuild (#32001) --- app/lib/feed_manager.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 8d7540e0f..baa460f74 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -535,8 +535,8 @@ class FeedManager arr = crutches[:active_mentions][s.id] || [] arr.concat([s.account_id]) - if s.reblog? - arr.concat([s.reblog.account_id]) + if s.reblog? && s.reblog.present? + arr.push(s.reblog.account_id) arr.concat(crutches[:active_mentions][s.reblog_of_id] || []) end