Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change actions in reports to require only one click (#17487)

Browse source
This commit is contained in:
Eugen Rochko 2022-02-11 21:51:57 +01:00 • committed by GitHub
parent a27729ee48
commit d0fcf07436
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 154 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/admin/status_batch_action.rb
View file

@ -8,6 +8,12 @@ class Admin::StatusBatchAction
attr_accessor :current_account, :type,
:status_ids, :report_id
attr_reader :send_email_notification
def send_email_notification=(value)
@send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
end
def save!
process_action!
end
@ -55,7 +61,7 @@ class Admin::StatusBatchAction
statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
end
UserMailer.warning(target_account.user, @warning).deliver_later! if target_account.local?
UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
end
@ -82,6 +88,10 @@ class Admin::StatusBatchAction
!report.nil?
end
def warnable?
send_email_notification && target_account.local?
end
def target_account
@target_account ||= statuses.first.account
end