mirror of
https://github.com/mastodon/mastodon.git
synced 2025-05-07 20:26:15 +00:00
Merge 7cf767a978
into fbe9728f36
This commit is contained in:
commit
99518ed4e7
|
@ -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.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)
|
||||
unless AccountNote.exists?(account: account, target_account: @target_account)
|
||||
text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
|
||||
|
|
|
@ -1612,6 +1612,7 @@ en:
|
|||
title: Moderation
|
||||
move_handler:
|
||||
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.
|
||||
copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
|
||||
navigation:
|
||||
|
|
Loading…
Reference in New Issue
Block a user