chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 5 Wiki Activity

Fix inefficiencies in fan-out-on-write service (#14682)

Browse source
This commit is contained in:
Eugen Rochko 2020-08-30 12:33:59 +02:00 committed by GitHub
parent bf477cee9f
commit ce8f33dd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/services/fan_out_on_write_service.rb
View file

@ -6,8 +6,6 @@ class FanOutOnWriteService < BaseService
def call(status) def call(status)
raise Mastodon::RaceConditionError if status.visibility.nil? raise Mastodon::RaceConditionError if status.visibility.nil?
render_anonymous_payload(status)
if status.direct_visibility? if status.direct_visibility?
deliver_to_own_conversation(status) deliver_to_own_conversation(status)
elsif status.limited_visibility? elsif status.limited_visibility?
@ -20,6 +18,8 @@ class FanOutOnWriteService < BaseService
return if status.account.silenced? || !status.public_visibility? || status.reblog? return if status.account.silenced? || !status.public_visibility? || status.reblog?
render_anonymous_payload(status)
deliver_to_hashtags(status) deliver_to_hashtags(status)
return if status.reply? && status.in_reply_to_account_id != status.account_id return if status.reply? && status.in_reply_to_account_id != status.account_id
@ -58,10 +58,12 @@ class FanOutOnWriteService < BaseService
def deliver_to_mentioned_followers(status) def deliver_to_mentioned_followers(status)
Rails.logger.debug "Delivering status #{status.id} to limited followers" Rails.logger.debug "Delivering status #{status.id} to limited followers"
FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? && mentioned_account.following?(status.account) }) do |follower| status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id).reorder(nil).find_in_batches do |followers|
FeedInsertWorker.push_bulk(followers) do |follower|
[status.id, follower.id, :home] [status.id, follower.id, :home]
end end
end end
end
def render_anonymous_payload(status) def render_anonymous_payload(status)
@payload = InlineRenderer.render(status, nil, :status) @payload = InlineRenderer.render(status, nil, :status)