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

2019-02-15 18:02:45 +01:00
parent 2769b54466 8ef50706a1
commit 06cc04fd23
30 changed files with 408 additions and 148 deletions
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -29,6 +29,7 @@ class Relay < ApplicationRecord
    payload     = Oj.dump(follow_activity(activity_id))

    update!(state: :pending, follow_activity_id: activity_id)
+    DeliveryFailureTracker.new(inbox_url).track_success!
    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
  end

@@ -37,6 +38,7 @@ class Relay < ApplicationRecord
    payload     = Oj.dump(unfollow_activity(activity_id))

    update!(state: :idle, follow_activity_id: nil)
+    DeliveryFailureTracker.new(inbox_url).track_success!
    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
  end