diff options
author | ThibG <thib@sitedethib.com> | 2018-05-03 13:33:08 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-03 13:33:08 +0200 |
commit | 581a5c9d29ef2a12f46b67a1097a9ad6df1c6953 (patch) | |
tree | 5016948b9e295c703ff671baddaa8f78e29b5a80 /app/lib/ostatus/activity | |
parent | d5fa4fbcd2649341f3f2809060c5a64e25ebfa81 (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/ostatus/activity')
-rw-r--r-- | app/lib/ostatus/activity/creation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index 6235127b2..a24a0093c 100644 --- a/app/lib/ostatus/activity/creation.rb +++ b/app/lib/ostatus/activity/creation.rb @@ -39,7 +39,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base reblog: cached_reblog, text: content, spoiler_text: content_warning, - created_at: @options[:override_timestamps] ? nil : published, + created_at: published, reply: thread?, language: content_language, visibility: visibility_scope, @@ -61,7 +61,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution" LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? - DistributionWorker.perform_async(status.id) if @options[:override_timestamps] || status.within_realtime_window? + DistributionWorker.perform_async(status.id) if status.within_realtime_window? status end |