Improve process feed service

1 files changed, 3 insertions, 0 deletions

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 4ed0bf0bb..ff626a0f1 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -34,12 +34,15 @@ class ProcessFeedService < BaseService
       else
         add_reply!(entry, status)
       end
+    else
+      return
     end
 
     # If we added a status, go through accounts it mentions and create respective relations
     # Also record all media attachments for the status and for the reblogged status if present
     unless status.new_record?
       record_remote_mentions(status, entry.xpath('./xmlns:link[@rel="mentioned"]'))
+      record_remote_mentions(status.reblog, entry.xpath('./activity:object/xmlns:link[@rel="mentioned"]')) if status.reblog?
 
       process_attachments(entry, status)
       process_attachments(entry.xpath('./activity:object'), status.reblog) if status.reblog?