gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge 7cf767a978 into 002632c3bb

Browse Source
This commit is contained in:
Jeong Arm 2025-11-26 17:03:11 +00:00 committed by GitHub
commit f22edac35a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/workers/move_worker.rb
View File

@ -20,6 +20,7 @@ class MoveWorker
copy_account_notes! copy_account_notes!
carry_blocks_over! carry_blocks_over!
carry_mutes_over! carry_mutes_over!
carry_follows_over!
raise @deferred_error unless @deferred_error.nil? raise @deferred_error unless @deferred_error.nil?
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
@ -124,6 +125,14 @@ class MoveWorker
end end
end end
def carry_follows_over!
@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
end
end
def add_account_note_if_needed!(account, id) def add_account_note_if_needed!(account, id)
return if AccountNote.exists?(account: account, target_account: @target_account) return if AccountNote.exists?(account: account, target_account: @target_account)

1
config/locales/en.yml
View File

@ -1678,6 +1678,7 @@ en:
title: Moderation title: Moderation
move_handler: move_handler:
carry_blocks_over_text: This user moved from %{acct}, which you had blocked. carry_blocks_over_text: This user moved from %{acct}, which you had blocked.
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. 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:' copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
navigation: navigation: