From b1e03197fa933f290979865d78381a3b22c05c69 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 19 Jan 2018 19:11:35 +0100
Subject: [PATCH] Process mentions and reblogs even from resolved threads
 (#6299)

This may lead to out-of-order notifications, but this is better than not having
notifications at all.
---
 app/lib/activitypub/activity.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 820189d29..0f9e4f263 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -69,12 +69,13 @@ class ActivityPub::Activity
   def distribute(status)
     crawl_links(status)
 
+    notify_about_reblog(status) if reblog_of_local_account?(status)
+    notify_about_mentions(status)
+
     # Only continue if the status is supposed to have
     # arrived in real-time
     return unless @options[:override_timestamps]
 
-    notify_about_reblog(status) if reblog_of_local_account?(status)
-    notify_about_mentions(status)
     distribute_to_followers(status)
   end