]> cat aescling's git repositories - mastodon.git/commitdiff
Fix statuses not being referenced in strike when category is spam (#17786)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 15 Mar 2022 03:11:13 +0000 (04:11 +0100)
committerGitHub <noreply@github.com>
Tue, 15 Mar 2022 03:11:13 +0000 (04:11 +0100)
app/models/admin/account_action.rb

index d3be4be3fdae16ddee66f51c31ade0caf36428c4..850ea6d82342255f6ac0b0ce46965b7a20118f4b 100644 (file)
@@ -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