From 0bf50cbbbe84c8123daa8790c0e6c373860a4c2c Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Thu, 19 Jan 2023 11:19:11 +0900 Subject: [PATCH 1/4] Add moved note for newly followed via migration --- app/workers/move_worker.rb | 9 +++++++++ config/locales/en.yml | 1 + 2 files changed, 10 insertions(+) diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb index a18f38556b..b5756993cd 100644 --- a/app/workers/move_worker.rb +++ b/app/workers/move_worker.rb @@ -20,6 +20,7 @@ class MoveWorker copy_account_notes! carry_blocks_over! carry_mutes_over! + carry_follows_over! raise @deferred_error unless @deferred_error.nil? rescue ActiveRecord::RecordNotFound @@ -122,6 +123,14 @@ class MoveWorker end end + def carry_follows_over! + @source_account.followers.local.find_each do |follower| + add_account_note_if_needed!(follower.account, 'move_handler.carry_follows_over_text') + rescue => e + @deferred_error = e + end + end + def add_account_note_if_needed!(account, id) unless AccountNote.exists?(account: account, target_account: @target_account) text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do diff --git a/config/locales/en.yml b/config/locales/en.yml index 43aa8481c6..30bdffaa62 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1459,6 +1459,7 @@ en: move_handler: carry_blocks_over_text: This user moved from %{acct}, which you had blocked. carry_mutes_over_text: This user moved from %{acct}, which you had muted. + carry_follows_over_text: This user moved from %{acct}, which you had followed. copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:' navigation: toggle_menu: Toggle menu From 967c8f9d257a7ed329ac78eca463683784eea275 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Tue, 13 Jun 2023 23:14:58 +0900 Subject: [PATCH 2/4] Fix follows note carry over --- app/workers/move_worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb index b5756993cd..bc3ec51693 100644 --- a/app/workers/move_worker.rb +++ b/app/workers/move_worker.rb @@ -125,7 +125,7 @@ class MoveWorker def carry_follows_over! @source_account.followers.local.find_each do |follower| - add_account_note_if_needed!(follower.account, 'move_handler.carry_follows_over_text') + add_account_note_if_needed!(follower, 'move_handler.carry_follows_over_text') rescue => e @deferred_error = e end From 11a2c7381493f8bab8e4105b45ae1ca119999557 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 27 May 2024 22:51:16 +0900 Subject: [PATCH 3/4] Fix ruby test error --- app/workers/move_worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb index bc3ec51693..f8f18ad7d2 100644 --- a/app/workers/move_worker.rb +++ b/app/workers/move_worker.rb @@ -124,7 +124,7 @@ class MoveWorker end def carry_follows_over! - @source_account.followers.local.find_each do |follower| + @source_account.followers.local.reorder(nil).find_each do |follower| add_account_note_if_needed!(follower, 'move_handler.carry_follows_over_text') rescue => e @deferred_error = e From 7cf767a9789b7b336710ec133fd0865fd7b8c01f Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 27 May 2024 22:59:37 +0900 Subject: [PATCH 4/4] Fix i18n lint --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 30bdffaa62..3709ce3ede 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1458,8 +1458,8 @@ en: title: Moderation move_handler: carry_blocks_over_text: This user moved from %{acct}, which you had blocked. - carry_mutes_over_text: This user moved from %{acct}, which you had muted. carry_follows_over_text: This user moved from %{acct}, which you had followed. + carry_mutes_over_text: This user moved from %{acct}, which you had muted. copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:' navigation: toggle_menu: Toggle menu