diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-12 22:58:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-12 22:58:59 +0100 |
| commit | 9f5b55ad4f6788f2a2e70a0d11bf12bcc121653d (patch) | |
| tree | 6e0924de0082defc0a3af9bbd21f0bf320c8997e /app/workers | |
| parent | a41afef80c03df0aa64158a538920a2f68bea044 (diff) | |
Fix poll update handler calling method was that was not available (#10246)
* Fix poll update handler calling method was that was not available Fix regression from #10209 * Refactor VoteService * Refactor ActivityPub::DistributePollUpdateWorker and optimize it * Fix typo * Fix typo
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/activitypub/distribute_poll_update_worker.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/workers/activitypub/distribute_poll_update_worker.rb b/app/workers/activitypub/distribute_poll_update_worker.rb index 718279c1b..d60fde557 100644 --- a/app/workers/activitypub/distribute_poll_update_worker.rb +++ b/app/workers/activitypub/distribute_poll_update_worker.rb @@ -28,13 +28,16 @@ class ActivityPub::DistributePollUpdateWorker def inboxes return @inboxes if defined?(@inboxes) - target_accounts = @status.mentions.map(&:account).reject(&:local?) - target_accounts += @status.reblogs.map(&:account).reject(&:local?) - target_accounts += @status.poll.votes.map(&:account).reject(&:local?) - target_accounts.uniq!(&:id) - @inboxes = target_accounts.select(&:activitypub?).pluck(&:inbox_url) - @inboxes += @account.followers.inboxes unless @status.direct_visibility? + + @inboxes = [@status.mentions, @status.reblogs, @status.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 + end + + @inboxes.concat(@account.followers.inboxes) unless @status.direct_visibility? @inboxes.uniq! + @inboxes.compact! @inboxes end |