From: Eugen Rochko Date: Sat, 12 Mar 2022 07:23:03 +0000 (+0100) Subject: Fix moderator account leak in status edit history (#17746) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ee8d4dd056e883fdfb955e6305e68390a032ac0d;p=mastodon.git Fix moderator account leak in status edit history (#17746) --- 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