From 72406a1cd178772b818609b8b0c30581c1f0fefd Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Tue, 24 Feb 2026 15:22:44 +0100
Subject: [PATCH] Refactor: Introduce admin base action class (#37960)

---
 app/models/admin/account_action.rb      | 56 ++++++-------------------
 app/models/admin/base_action.rb         | 42 +++++++++++++++++++
 app/models/admin/status_batch_action.rb | 30 ++++---------
 3 files changed, 63 insertions(+), 65 deletions(-)
 create mode 100644 app/models/admin/base_action.rb

diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 3cde3c7f8e..45c5987b8a 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::AccountAction
-  include ActiveModel::Model
-  include ActiveModel::Attributes
-  include AccountableConcern
-  include Authorization
-
+class Admin::AccountAction < Admin::BaseAction
   TYPES = %w(
     none
     disable
@@ -15,49 +10,13 @@ class Admin::AccountAction
   ).freeze
 
   attr_accessor :target_account,
-                :current_account,
-                :type,
-                :text,
-                :report_id,
                 :warning_preset_id
 
-  attr_reader :warning
-
   attribute :include_statuses, :boolean, default: true
-  attribute :send_email_notification, :boolean, default: true
 
-  alias send_email_notification? send_email_notification
   alias include_statuses? include_statuses
 
-  validates :type, :target_account, :current_account, presence: true
-  validates :type, inclusion: { in: TYPES }
-
-  def save
-    return false unless valid?
-
-    ApplicationRecord.transaction do
-      process_action!
-      process_strike!
-      process_reports!
-    end
-
-    process_notification!
-    process_queue!
-
-    true
-  end
-
-  def save!
-    raise ActiveRecord::RecordInvalid, self unless save
-  end
-
-  def report
-    @report ||= Report.find(report_id) if report_id.present?
-  end
-
-  def with_report?
-    !report.nil?
-  end
+  validates :target_account, presence: true
 
   class << self
     def types_for_account(account)
@@ -84,6 +43,17 @@ class Admin::AccountAction
   private
 
   def process_action!
+    ApplicationRecord.transaction do
+      handle_type!
+      process_strike!
+      process_reports!
+    end
+
+    process_notification!
+    process_queue!
+  end
+
+  def handle_type!
     case type
     when 'disable'
       handle_disable!
diff --git a/app/models/admin/base_action.rb b/app/models/admin/base_action.rb
new file mode 100644
index 0000000000..15c1acae42
--- /dev/null
+++ b/app/models/admin/base_action.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class Admin::BaseAction
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+  include AccountableConcern
+  include Authorization
+
+  attr_accessor :current_account,
+                :type,
+                :text,
+                :report_id
+
+  attr_reader :warning
+
+  attribute :send_email_notification, :boolean, default: true
+
+  alias send_email_notification? send_email_notification
+
+  validates :type, :current_account, presence: true
+  validates :type, inclusion: { in: ->(a) { a.class::TYPES } }
+
+  def save
+    return false unless valid?
+
+    process_action!
+
+    true
+  end
+
+  def save!
+    raise ActiveRecord::RecordInvalid, self unless save
+  end
+
+  def report
+    @report ||= Report.find(report_id) if report_id.present?
+  end
+
+  def with_report?
+    !report.nil?
+  end
+end
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 4d0ee13038..d6dea02ed0 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -1,20 +1,14 @@
 # frozen_string_literal: true
 
-class Admin::StatusBatchAction
-  include ActiveModel::Model
-  include ActiveModel::Attributes
-  include AccountableConcern
-  include Authorization
+class Admin::StatusBatchAction < Admin::BaseAction
+  TYPES = %w(
+    delete
+    mark_as_sensitive
+    report
+    remove_from_report
+  ).freeze
 
-  attr_accessor :current_account, :type,
-                :status_ids, :report_id,
-                :text
-
-  attribute :send_email_notification, :boolean
-
-  def save!
-    process_action!
-  end
+  attr_accessor :status_ids
 
   private
 
@@ -117,14 +111,6 @@ class Admin::StatusBatchAction
     report.save!
   end
 
-  def report
-    @report ||= Report.find(report_id) if report_id.present?
-  end
-
-  def with_report?
-    !report.nil?
-  end
-
   def process_notification!
     return unless warnable?