Fix crash when marking statuses as sensitive while some statuses are …

…deleted Fixes mastodon#21910
ClearlyClaire · Dec 15, 2022 · 0aa4828 · 0aa4828
1 parent 62d03bb
commit 0aa4828
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
@@ -73,7 +73,7 @@ def handle_mark_as_sensitive!
     # Can't use a transaction here because UpdateStatusService queues
     # Sidekiq jobs
     statuses.includes(:media_attachments, :preview_cards).find_each do |status|
-      next unless status.with_media? || status.with_preview_card?
+      next if status.discarded? || !(status.with_media? || status.with_preview_card?)
 
       authorize([:admin, status], :update?)