From 41a25985c29ff0275f91e85ef73e78f9ea7b9865 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 3 Sep 2025 08:35:46 -0400 Subject: [PATCH] Pull out repeated tracker reset to callback --- app/models/relay.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/relay.rb b/app/models/relay.rb index 813a861c682..30064828d54 100644 --- a/app/models/relay.rb +++ b/app/models/relay.rb @@ -23,6 +23,8 @@ class Relay < ApplicationRecord before_destroy :ensure_disabled + after_save :reset_delivery_tracker, if: [:state_previously_changed?, :reset_failure_state?] + alias enabled? accepted? def to_log_human_identifier @@ -34,7 +36,6 @@ class Relay < ApplicationRecord payload = Oj.dump(follow_activity(activity_id)) update!(state: :pending, follow_activity_id: activity_id) - DeliveryFailureTracker.reset!(inbox_url) ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url) end @@ -43,12 +44,19 @@ class Relay < ApplicationRecord payload = Oj.dump(unfollow_activity(activity_id)) update!(state: :idle, follow_activity_id: nil) - DeliveryFailureTracker.reset!(inbox_url) ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url) end private + def reset_delivery_tracker + DeliveryFailureTracker.reset!(inbox_url) + end + + def reset_failure_state? + idle? || pending? + end + def follow_activity(activity_id) { '@context': ActivityPub::TagManager::CONTEXT,