Fix issue when encountering reblog of deleted post in feed rebuild (m…

…astodon#32001)
atsu1125 · Dec 2, 2024 · 4fd4350 · 4fd4350
1 parent 9ec8c05
commit 4fd4350
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
@@ -616,8 +616,8 @@ def build_crutches(receiver_id, statuses)
       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