diff options
| author | Starfall <us@starfall.systems> | 2020-12-07 10:11:37 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-07 10:11:37 -0600 |
| commit | e68391fbaaf409cc01f74c8cf7076520a43ae06e (patch) | |
| tree | 212b6e373f91dec2dce0b2c33b0cb38b4c6087f0 /app/models/account.rb | |
| parent | 0f6d41052652c4fee87a19900795c8588d9a2174 (diff) | |
| parent | 48bef17cc990afda95c4de657f7643c321e62650 (diff) | |
Merge remote-tracking branch 'vanilla/master' into main
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 |