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

2020-12-09 14:42:33 +01:00
parent 25f725d67a 127c543a6e
commit a16175645d
23 changed files with 235 additions and 212 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -445,7 +445,7 @@ class Account < ApplicationRecord
    end

    def inboxes
-      urls = reorder(nil).where(protocol: :activitypub).pluck(Arel.sql("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)"))
+      urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
      DeliveryFailureTracker.without_unavailable(urls)
    end