From eebafe24a8000ac77bb54660170f5b47bfc5b3a3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 15 Mar 2022 04:11:13 +0100
Subject: [PATCH] Fix statuses not being referenced in strike when category is
spam (#17786)
---
app/models/admin/account_action.rb | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index d3be4be3fd..850ea6d823 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -22,6 +22,16 @@ class Admin::AccountAction
attr_reader :warning, :send_email_notification, :include_statuses
+ alias send_email_notification? send_email_notification
+ alias include_statuses? include_statuses
+
+ def initialize(attributes = {})
+ @send_email_notification = true
+ @include_statuses = true
+
+ super
+ end
+
def send_email_notification=(value)
@send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
end
@@ -141,11 +151,11 @@ class Admin::AccountAction
end
def warnable?
- send_email_notification && target_account.local?
+ send_email_notification? && target_account.local?
end
def status_ids
- report.status_ids if with_report? && include_statuses
+ report.status_ids if with_report? && include_statuses?
end
def reports
--
GitLab