monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix statuses not being referenced in strike when category is spam (#17786)

This commit is contained in:
Eugen Rochko 2022-03-15 04:11:13 +01:00 committed by GitHub
parent eb9a7e3626
commit eebafe24a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/admin/account_action.rb
View File

@ -22,6 +22,16 @@ class Admin::AccountAction
attr_reader :warning, :send_email_notification, :include_statuses 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) def send_email_notification=(value)
@send_email_notification = ActiveModel::Type::Boolean.new.cast(value) @send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
end end
@ -141,11 +151,11 @@ class Admin::AccountAction
end end
def warnable? def warnable?
send_email_notification && target_account.local? send_email_notification? && target_account.local?
end end
def status_ids def status_ids
report.status_ids if with_report? && include_statuses report.status_ids if with_report? && include_statuses?
end end
def reports def reports