diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-29 03:16:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 03:16:20 +0200 |
| commit | f4ca116ea8f86057e91c99a1cd8e64e116c86746 (patch) | |
| tree | c00b43d66305d5eac1e6f886d0aaab8fe94e2ec0 /app/models/account.rb | |
| parent | 5b45c1646aa324d2eb4a3ecb8c12ed4df3cdf129 (diff) | |
After 7 days of repeated delivery failures, give up on inbox (#5131)
- A successful delivery cancels it out - An incoming delivery from account of the inbox cancels it out
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index ce7773b4b..54035d94a 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -190,7 +190,8 @@ class Account < ApplicationRecord end def inboxes - reorder(nil).where(protocol: :activitypub).pluck("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)") + urls = reorder(nil).where(protocol: :activitypub).pluck("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)") + DeliveryFailureTracker.filter(urls) end def triadic_closures(account, limit: 5, offset: 0) |