about summary refs log tree commit diff
path: root/app/lib/activitypub/activity.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-03 13:33:08 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-03 13:33:08 +0200
commit581a5c9d29ef2a12f46b67a1097a9ad6df1c6953 (patch)
tree5016948b9e295c703ff671baddaa8f78e29b5a80 /app/lib/activitypub/activity.rb
parentd5fa4fbcd2649341f3f2809060c5a64e25ebfa81 (diff)
Fixes/do not override timestamps (#7331)
* Do not override timestamps for incoming toots

* Remove every reference to override_timestamps

Statuses are now created with the announced publishing date
and are only pushed to timelines if that date is at most
6 hours earlier than the time at which it is processed.
Diffstat (limited to 'app/lib/activitypub/activity.rb')
-rw-r--r--app/lib/activitypub/activity.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 9b00f0f52..5b97a6208 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -80,7 +80,7 @@ class ActivityPub::Activity
 
     # Only continue if the status is supposed to have
     # arrived in real-time
-    return unless @options[:override_timestamps] || status.within_realtime_window?
+    return unless status.within_realtime_window?
 
     distribute_to_followers(status)
   end