From ee8d4dd056e883fdfb955e6305e68390a032ac0d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 12 Mar 2022 08:23:03 +0100 Subject: Fix moderator account leak in status edit history (#17746) --- app/models/admin/status_batch_action.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/admin') diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb index 4d91b9805..631af183c 100644 --- a/app/models/admin/status_batch_action.rb +++ b/app/models/admin/status_batch_action.rb @@ -68,6 +68,8 @@ class Admin::StatusBatchAction end def handle_mark_as_sensitive! + representative_account = Account.representative + # Can't use a transaction here because UpdateStatusService queues # Sidekiq jobs statuses.includes(:media_attachments, :preview_cards).find_each do |status| @@ -76,7 +78,7 @@ class Admin::StatusBatchAction authorize(status, :update?) if target_account.local? - UpdateStatusService.new.call(status, current_account.id, sensitive: true) + UpdateStatusService.new.call(status, representative_account.id, sensitive: true) else status.update(sensitive: true) end -- cgit From eebafe24a8000ac77bb54660170f5b47bfc5b3a3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 15 Mar 2022 04:11:13 +0100 Subject: 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(-) (limited to 'app/models/admin') diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb index d3be4be3f..850ea6d82 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 -- cgit