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/activitypub/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/activitypub/activity')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 2 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index c8a358195..8840a450c 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -15,7 +15,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity account: @account, reblog: original_status, uri: @json['id'], - created_at: @options[:override_timestamps] ? nil : @json['published'], + created_at: @json['published'], visibility: original_status.visibility ) diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 411286fa5..edee2691f 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -47,7 +47,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity text: text_from_content || '', language: detected_language, spoiler_text: @object['summary'] || '', - created_at: @options[:override_timestamps] ? nil : @object['published'], + created_at: @object['published'], reply: @object['inReplyTo'].present?, sensitive: @object['sensitive'] || false, visibility: visibility_from_audience, |