about summary refs log tree commit diff
path: root/app/lib/activitypub
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-10-17 20:05:21 +0200
committerGitHub <noreply@github.com>2017-10-17 20:05:21 +0200
commit484208ce12402d8b82070038d9be8441b82f86e7 (patch)
treedfbd236898bd2a480e0df2d263140ec1999f22f7 /app/lib/activitypub
parent3bc8924940ac37b1efa458e160e51f4f0e328d6b (diff)
When status is fetched instead of delivered, do not stream it (#5437)
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r--app/lib/activitypub/activity.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 9688f57a6..01144f595 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -67,9 +67,14 @@ class ActivityPub::Activity
   end
 
   def distribute(status)
+    crawl_links(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)
-    crawl_links(status)
     distribute_to_followers(status)
   end