ability to add domain moderation notes, edit existing domain policies in-place, and process asynchronously

2 files changed, 9 insertions, 3 deletions

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8210ef70d..c9a363ec4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -204,7 +204,7 @@ en:
         confirm_user: "%{name} confirmed e-mail address of creature %{target}"
         create_account_warning: "%{name} sent a warning to %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
-        create_domain_block: "%{name} changed policy for %{target}"
+        create_domain_block: "%{name} added or changed policy for %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
         demote_user: "%{name} demoted creature %{target}"
         destroy_custom_emoji: "%{name} destroyed emoji %{target}"
@@ -233,6 +233,7 @@ en:
         unsilence_account: "%{name} unsilenced %{target}'s account"
         unsuspend_account: "%{name} unsuspended %{target}'s account"
         update_custom_emoji: "%{name} updated emoji %{target}"
+        update_domain_block: "%{name} updated policy for %{target}"
         update_status: "%{name} updated roar by %{target}"
       deleted_status: "(deleted roar)"
       title: Audit log
@@ -288,6 +289,7 @@ en:
     domain_blocks:
       add_new: Add new domain policy
       created_msg: Domain policy is now being processed
+      updated_msg: Domain policy change is now being processed
       destroyed_msg: Domain policy has been undone
       domain: Domain
       existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">remove it</a> first.
@@ -303,6 +305,7 @@ en:
         title: New domain policy
       force_sensitive: Mark media sensitive
       force_sensitive_hint: Forces all media from this domain to be marked sensitive.
+      reason: Add notes here.
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
       reject_reports: Reject reports
@@ -321,9 +324,12 @@ en:
           silence: Unsilence existing affected accounts from this domain
           suspend: Unsuspend existing affected accounts from this domain
           force_unlisted: Allow public roars on all existing accounts from this domain
-        title: Undo domain policy for %{domain}
+        title: Edit domain policy for %{domain}
         undo: Undo
+        edit: Edit
       undo: Undo domain policy
+      edit: Edit domain policy
+      undo_hint: Removes the domain policy, allowing for normal federation
     email_domain_blocks:
       add_new: Add new
       created_msg: Successfully added e-mail domain to blacklist
diff --git a/config/routes.rb b/config/routes.rb
index 5f4e5e7f8..e716ab383 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -150,7 +150,7 @@ Rails.application.routes.draw do
     get '/dashboard', to: 'dashboard#index'
 
     resources :subscriptions, only: [:index]
-    resources :domain_blocks, only: [:new, :create, :show, :destroy]
+    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update]
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]
     resources :warning_presets, except: [:new]