tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
This commit is contained in:
Thibaut Girka
2019-03-28 13:01:33 +01:00
parent 0418bdd71f 24d5b6f9e3
commit 050efbc126
141 changed files with 887 additions and 1808 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 if @status.poll.nil? || @status.local_only?
return if @status.preloadable_poll.nil? || @status.local_only?
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