about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-01-19 19:11:35 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-01-19 19:11:35 +0100
commitb1e03197fa933f290979865d78381a3b22c05c69 (patch)
tree837b012a911befbfaf9246511431fbc9281bb63c /app
parent7be53a10b0df3f3cfaaa82e7ab2ba16f85343546 (diff)
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.
Diffstat (limited to 'app')
-rw-r--r--app/lib/activitypub/activity.rb5
1 files 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