Browse Source

Fix when MoveWorker cannot get locale from remote account (#16576)

closed-social-v3
Takeshi Umeda 3 years ago
committed by Eugen Rochko
parent
commit
987f945930
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/workers/move_worker.rb

+ 2
- 2
app/workers/move_worker.rb View File

@ -47,7 +47,7 @@ class MoveWorker
def copy_account_notes!
AccountNote.where(target_account: @source_account).find_each do |note|
text = I18n.with_locale(note.account.user.locale || I18n.default_locale) do
text = I18n.with_locale(note.account.user&.locale || I18n.default_locale) do
I18n.t('move_handler.copy_account_note_text', acct: @source_account.acct)
end
@ -84,7 +84,7 @@ class MoveWorker
def add_account_note_if_needed!(account, id)
unless AccountNote.where(account: account, target_account: @target_account).exists?
text = I18n.with_locale(account.user.locale || I18n.default_locale) do
text = I18n.with_locale(account.user&.locale || I18n.default_locale) do
I18n.t(id, acct: @source_account.acct)
end
AccountNote.create!(account: account, target_account: @target_account, comment: text)

Loading…
Cancel
Save