Fixes/do not override timestamps (#7336)

* Revert "Fixes/do not override timestamps (#7331)"

This reverts commit 581a5c9d29.

* 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
This commit is contained in:
ThibG 2018-05-03 23:02:46 +02:00 committed by Eugen Rochko
parent 8c601b54cc
commit a24605961a
8 changed files with 23 additions and 7 deletions

View file

@ -78,9 +78,11 @@ class ActivityPub::Activity
notify_about_reblog(status) if reblog_of_local_account?(status) notify_about_reblog(status) if reblog_of_local_account?(status)
notify_about_mentions(status) notify_about_mentions(status)
# Only continue if the status is supposed to have # Only continue if the status is supposed to have arrived in real-time.
# arrived in real-time # Note that if @options[:override_timestamps] isn't set, the status
return unless status.within_realtime_window? # 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) distribute_to_followers(status)
end end

View file

@ -16,6 +16,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
reblog: original_status, reblog: original_status,
uri: @json['id'], uri: @json['id'],
created_at: @json['published'], created_at: @json['published'],
override_timestamps: @options[:override_timestamps],
visibility: original_status.visibility visibility: original_status.visibility
) )

View file

@ -48,6 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
language: detected_language, language: detected_language,
spoiler_text: @object['summary'] || '', spoiler_text: @object['summary'] || '',
created_at: @object['published'], created_at: @object['published'],
override_timestamps: @options[:override_timestamps],
reply: @object['inReplyTo'].present?, reply: @object['inReplyTo'].present?,
sensitive: @object['sensitive'] || false, sensitive: @object['sensitive'] || false,
visibility: visibility_from_audience, visibility: visibility_from_audience,

View file

@ -40,6 +40,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
text: content, text: content,
spoiler_text: content_warning, spoiler_text: content_warning,
created_at: published, created_at: published,
override_timestamps: @options[:override_timestamps],
reply: thread?, reply: thread?,
language: content_language, language: content_language,
visibility: visibility_scope, 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" Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? 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 status
end end

View file

@ -31,6 +31,10 @@ class Status < ApplicationRecord
include Cacheable include Cacheable
include StatusThreadingConcern include StatusThreadingConcern
# If `override_timestamps` is set at creation time, Snowflake ID creation
# will be based on current time instead of `created_at`
attr_accessor :override_timestamps
update_index('statuses#status', :proper) if Chewy.enabled? update_index('statuses#status', :proper) if Chewy.enabled?
enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility

View file

@ -6,6 +6,6 @@ class ActivityPub::ProcessingWorker
sidekiq_options backtrace: true sidekiq_options backtrace: true
def perform(account_id, body) def perform(account_id, body)
ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id)) ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true)
end end
end end

View file

@ -6,6 +6,6 @@ class ProcessingWorker
sidekiq_options backtrace: true sidekiq_options backtrace: true
def perform(account_id, body) def perform(account_id, body)
ProcessFeedService.new.call(body, Account.find(account_id)) ProcessFeedService.new.call(body, Account.find(account_id), override_timestamps: true)
end end
end end

View file

@ -7,7 +7,7 @@ module Mastodon::Snowflake
def self.around_create(record) def self.around_create(record)
now = Time.now.utc now = Time.now.utc
if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at || record.override_timestamps
yield yield
else else
record.id = Mastodon::Snowflake.id_at(record.created_at) record.id = Mastodon::Snowflake.id_at(record.created_at)