about summary refs log tree commit diff
path: root/app/lib/ostatus
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-03 23:02:46 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-03 23:02:46 +0200
commita24605961a1572f7e1800cc177b5b7defe45969c (patch)
treeb39e9a865cd91a052da53f2317a1d40871557c19 /app/lib/ostatus
parent8c601b54ccf530bd193b4500fee439aa4e9162d0 (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/ostatus')
-rw-r--r--app/lib/ostatus/activity/creation.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index a24a0093c..1e7f47029 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -40,6 +40,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
         text: content,
         spoiler_text: content_warning,
         created_at: published,
+        override_timestamps: @options[:override_timestamps],
         reply: thread?,
         language: content_language,
         visibility: visibility_scope,
@@ -61,7 +62,14 @@ 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 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 status unless @options[:override_timestamps] || status.within_realtime_window?
+
+    DistributionWorker.perform_async(status.id)
 
     status
   end