diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-29 21:47:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 21:47:18 +0100 |
| commit | b65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (patch) | |
| tree | 4ec696e3bfd7406b0fbe54f71aed649241663ecf /app/workers | |
| parent | 6a264c9379a50cb94afc8dd369bfc5b626a9c4d1 (diff) | |
| parent | ad7a3974cc48946b5cb8182da4f9e236aa5e39a1 (diff) | |
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/activitypub/delivery_worker.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb index adbb496d9..f9c385ea3 100644 --- a/app/workers/activitypub/delivery_worker.rb +++ b/app/workers/activitypub/delivery_worker.rb @@ -11,6 +11,8 @@ class ActivityPub::DeliveryWorker HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze def perform(json, source_account_id, inbox_url, options = {}) + return if DeliveryFailureTracker.unavailable?(inbox_url) + @options = options.with_indifferent_access @json = json @source_account = Account.find(source_account_id) |