Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)

Browse source 
Also, fix some n+1 queries

Resolve #10365
This commit is contained in:
Eugen Rochko 2019-03-28 04:44:59 +01:00 • committed by GitHub
parent f46f67d984
commit f1bc90ab50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/workers/activitypub/distribute_poll_update_worker.rb
View file

@ -9,7 +9,7 @@ class ActivityPub::DistributePollUpdateWorker
@status = Status.find(status_id)
@account = @status.account
return unless @status.poll
return unless @status.preloadable_poll
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
[payload, @account.id, inbox_url]
@ -29,7 +29,7 @@ class ActivityPub::DistributePollUpdateWorker
def inboxes
return @inboxes if defined?(@inboxes)
@inboxes = [@status.mentions, @status.reblogs, @status.poll.votes].flat_map do |relation|
@inboxes = [@status.mentions, @status.reblogs, @status.preloadable_poll.votes].flat_map do |relation|
relation.includes(:account).map do |record|
record.account.preferred_inbox_url if !record.account.local? && record.account.activitypub?
end