diff options
author | David Yip <yipdw@member.fsf.org> | 2018-05-04 03:23:57 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-05-04 03:23:57 -0500 |
commit | da70208b452bf751af92128ec46eea9707e1e6a9 (patch) | |
tree | d969e5e6092b5cd00ca8db5b12f83130dec4a010 /app/lib/activitypub/activity.rb | |
parent | 2d392fb3b80c04df5c575d72e4f7424a84909300 (diff) | |
parent | c61ddd82495f8997fc3034faa8281165f553280c (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'app/lib/activitypub/activity.rb')
-rw-r--r-- | app/lib/activitypub/activity.rb | 8 |
1 files changed, 5 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 |