diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-17 22:36:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 22:36:48 +0200 |
| commit | 62e65dca11e1c39630db2958c514c45407dcdfa7 (patch) | |
| tree | 92b5f9a2f93a2355dd94bac7e63e8fd9c552dafb /app/controllers | |
| parent | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (diff) | |
| parent | 81ef26b67d01aaa693edbdcf7a8f2a6cdfd56920 (diff) | |
Merge pull request #1318 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/instances_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index 291eec19a..0a561e7f0 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -49,7 +49,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController ResolveAccountWorker.perform_async(signed_request_account.acct) end - DeliveryFailureTracker.track_inverse_success!(signed_request_account) + DeliveryFailureTracker.reset!(signed_request_account.inbox_url) end def process_payload diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb index 2fc041207..1790becbf 100644 --- a/app/controllers/admin/instances_controller.rb +++ b/app/controllers/admin/instances_controller.rb @@ -19,7 +19,7 @@ module Admin @followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count @reports_count = Report.where(target_account: Account.where(domain: params[:id])).count @blocks_count = Block.where(target_account: Account.where(domain: params[:id])).count - @available = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url) + @available = DeliveryFailureTracker.available?(params[:id]) @media_storage = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size) @private_comment = @domain_block&.private_comment @public_comment = @domain_block&.public_comment |