From a2014830c2a015432702edc0c7a8adef6aaa531c Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 10 Nov 2019 23:05:15 +0100
Subject: [PATCH] Fix broken admin audit log in whitelist mode (#12303)

---
 app/helpers/admin/action_logs_helper.rb | 6 ++++--
 config/locales/en.yml                   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 1daa607745..608a99dd5b 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -44,6 +44,8 @@ module Admin::ActionLogsHelper
       'flag'
     when 'DomainBlock'
       'lock'
+    when 'DomainAllow'
+      'plus-circle'
     when 'EmailDomainBlock'
       'envelope'
     when 'Status'
@@ -86,7 +88,7 @@ module Admin::ActionLogsHelper
       record.shortcode
     when 'Report'
       link_to "##{record.id}", admin_report_path(record)
-    when 'DomainBlock', 'EmailDomainBlock'
+    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock'
       link_to record.domain, "https://#{record.domain}"
     when 'Status'
       link_to record.account.acct, ActivityPub::TagManager.instance.url_for(record)
@@ -99,7 +101,7 @@ module Admin::ActionLogsHelper
     case type
     when 'CustomEmoji'
       attributes['shortcode']
-    when 'DomainBlock', 'EmailDomainBlock'
+    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock'
       link_to attributes['domain'], "https://#{attributes['domain']}"
     when 'Status'
       tmp_status = Status.new(attributes.except('reblogs_count', 'favourites_count'))
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 38fe1a3828..531036a63c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -203,10 +203,12 @@ en:
         confirm_user: "%{name} confirmed e-mail address of user %{target}"
         create_account_warning: "%{name} sent a warning to %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
+        create_domain_allow: "%{name} whitelisted domain %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
         demote_user: "%{name} demoted user %{target}"
         destroy_custom_emoji: "%{name} destroyed emoji %{target}"
+        destroy_domain_allow: "%{name} removed domain %{target} from whitelist"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
         destroy_status: "%{name} removed status by %{target}"