diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-09 19:06:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 19:06:13 +0100 |
| commit | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (patch) | |
| tree | dba9599f5416483c4a9fcad0002e5a2d6bcd4de1 /app/models/account.rb | |
| parent | 25f725d67a6d2542cd586ab7c56baca572eb4f88 (diff) | |
| parent | 7d0e45a3be167d95cbc4d5f80fa989a9371802ae (diff) | |
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 87b89df51..b70978d2b 100644 --- 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 |