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

2020-04-17 20:16:24 +02:00
parent 5fdd5eef5a 89077fb657
commit 81e49ba5c6
20 changed files with 139 additions and 54 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -415,7 +415,7 @@ class Account < ApplicationRecord

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

    def search_for(terms, limit = 10, offset = 0)