From 86ef4d48840e439af9a0ae3ebf0e7b9b8868f75d Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 28 Jul 2025 04:50:19 -0400 Subject: [PATCH] Add `skip_*` methods to check move worker process (#35538) --- app/workers/move_worker.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb index 9b9c6879e5c..667efd69161 100644 --- a/app/workers/move_worker.rb +++ b/app/workers/move_worker.rb @@ -104,7 +104,7 @@ class MoveWorker def carry_blocks_over! @source_account.blocked_by_relationships.where(account: Account.local).find_each do |block| - unless block.account.blocking?(@target_account) || block.account.following?(@target_account) + unless skip_block_move?(block) BlockService.new.call(block.account, @target_account) add_account_note_if_needed!(block.account, 'move_handler.carry_blocks_over_text') end @@ -115,7 +115,7 @@ class MoveWorker def carry_mutes_over! @source_account.muted_by_relationships.where(account: Account.local).find_each do |mute| - MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications) unless mute.account.muting?(@target_account) || mute.account.following?(@target_account) + MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications) unless skip_mute_move?(mute) add_account_note_if_needed!(mute.account, 'move_handler.carry_mutes_over_text') rescue => e @deferred_error = e @@ -130,4 +130,12 @@ class MoveWorker AccountNote.create!(account: account, target_account: @target_account, comment: text) end end + + def skip_mute_move?(mute) + mute.account.muting?(@target_account) || mute.account.following?(@target_account) + end + + def skip_block_move?(block) + block.account.blocking?(@target_account) || block.account.following?(@target_account) + end end