diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-03 23:02:46 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-03 23:02:46 +0200 |
| commit | a24605961a1572f7e1800cc177b5b7defe45969c (patch) | |
| tree | b39e9a865cd91a052da53f2317a1d40871557c19 /app/lib/activitypub | |
| parent | 8c601b54ccf530bd193b4500fee439aa4e9162d0 (diff) | |
Fixes/do not override timestamps (#7336)
* Revert "Fixes/do not override timestamps (#7331)" This reverts commit 581a5c9d29ef2a12f46b67a1097a9ad6df1c6953. * Document Snowflake ID corner-case a bit more Snowflake IDs are used for two purposes: making object identifiers harder to guess and ensuring they are in chronological order. For this reason, they are based on the `created_at` attribute of the object. Unfortunately, inserting items with older snowflakes IDs will break the assumption of consumers of the paging APIs that new items will always have a greater identifier than the last seen one. * Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 8 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 1 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 5b97a6208..84d4b1752 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -78,9 +78,11 @@ class ActivityPub::Activity 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 status.within_realtime_window? + # Only continue if the status is supposed to have arrived in real-time. + # Note that if @options[:override_timestamps] isn't set, the status + # may have a lower snowflake id than other existing statuses, potentially + # "hiding" it from paginated API calls + return unless @options[:override_timestamps] || status.within_realtime_window? distribute_to_followers(status) end diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 8840a450c..7e146ea8c 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -16,6 +16,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity reblog: original_status, uri: @json['id'], created_at: @json['published'], + override_timestamps: @options[:override_timestamps], visibility: original_status.visibility ) diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index edee2691f..8d17a4ebe 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -48,6 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity language: detected_language, spoiler_text: @object['summary'] || '', created_at: @object['published'], + override_timestamps: @options[:override_timestamps], reply: @object['inReplyTo'].present?, sensitive: @object['sensitive'] || false, visibility: visibility_from_audience, |