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

4 years ago · 590e1578bf
parent 763ab0c7eb
commit 590e1578bf
1 changed files with 2 additions and 2 deletions
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@ -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)