From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 14 Oct 2021 18:53:11 +0000 (+0200)
Subject: Fix 404 error when filtering admin action logs by non-existent target account (#16643)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9b978872cc1a86c7d82afda4060c909dc7ca2536;p=mastodon.git

Fix 404 error when filtering admin action logs by non-existent target account (#16643)

Currently, there is no way for an admin to delete an account record. However,
should that happen in the future, or should an admin mistype an account id,
`/admin/action_logs?target_account_id=<non-existent-account-id>` currently
returns a 404 instead of an empty list.

With this commit, the aforementioned page returns a correct list instead
(potentially non-empty if the account has been manually deleted)
---

diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index a1c156a8b..6e19dcf70 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -76,7 +76,7 @@ class Admin::ActionLogFilter
     when 'account_id'
       Admin::ActionLog.where(account_id: value)
     when 'target_account_id'
-      account = Account.find(value)
+      account = Account.find_or_initialize_by(id: value)
       Admin::ActionLog.where(target: [account, account.user].compact)
     else
       raise "Unknown filter: #{key}"