From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sun, 8 Aug 2021 13:31:02 +0000 (+0900)
Subject: Fix when MoveWorker cannot get locale from remote account (#16576)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=590e1578bf67fc4defa326b01590f5b817b8818e;p=mastodon.git

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

diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index 53a6b87f1..cc2c17d32 100644
--- 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)