Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Upgrade Rails to version 5.2.0 (#5898)

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2018-04-12 21:45:17 +09:00 • committed by Eugen Rochko
parent 8e88a18316
commit 50529cbceb
22 changed files with 330 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/account.rb
View file

@ -244,11 +244,11 @@ class Account < ApplicationRecord
end
def domains
reorder(nil).pluck('distinct accounts.domain')
reorder(nil).pluck(Arel.sql('distinct accounts.domain'))
end
def inboxes
urls = reorder(nil).where(protocol: :activitypub).pluck("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)")
urls = reorder(nil).where(protocol: :activitypub).pluck(Arel.sql("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)"))
DeliveryFailureTracker.filter(urls)
end