mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 13:35:07 +01:00
Code Issues Projects Releases Wiki Activity

Push discovered status through streaming API within a time window (#6484)

Browse Source 
Time window of 6 hours
This commit is contained in:
Eugen Rochko 2018-02-17 14:28:48 +01:00 committed by GitHub
parent a7c50c7aba
commit a71af98401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity.rb
View File

@ -74,7 +74,7 @@ class ActivityPub::Activity
# 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
return unless @options[:override_timestamps] return unless @options[:override_timestamps] || status.within_realtime_window?
distribute_to_followers(status) distribute_to_followers(status)
end end

2
app/lib/ostatus/activity/creation.rb
View File

@ -61,7 +61,7 @@ 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 @options[:override_timestamps] DistributionWorker.perform_async(status.id) if @options[:override_timestamps] || status.within_realtime_window?
status status
end end

6
app/models/status.rb
View File

@ -80,6 +80,8 @@ class Status < ApplicationRecord
delegate :domain, to: :account, prefix: true delegate :domain, to: :account, prefix: true
REAL_TIME_WINDOW = 6.hours
def searchable_by(preloaded = nil) def searchable_by(preloaded = nil)
ids = [account_id] ids = [account_id]
@ -108,6 +110,10 @@ class Status < ApplicationRecord
!reblog_of_id.nil? !reblog_of_id.nil?
end end
def within_realtime_window?
created_at >= REAL_TIME_WINDOW.ago
end
def verb def verb
if destroyed? if destroyed?
:delete :delete