Add warnings to report action logs (mastodon#27425)

glitch-soc · Oct 23, 2023 · 8b770ce · 8b770ce
1 parent 44edf3a
commit 8b770ce
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app/models/report.rb b/app/models/report.rb
@@ -142,6 +142,11 @@ def history
         target_type: 'Status',
         target_id: status_ids
       ).unscope(:order).arel,
+
+      Admin::ActionLog.where(
+        target_type: 'AccountWarning',
+        target_id: AccountWarning.where(report_id: id).select(:id)
+      ).unscope(:order).arel,
     ].reduce { |union, query| Arel::Nodes::UnionAll.new(union, query) }
 
     Admin::ActionLog.from(Arel::Nodes::As.new(subquery, Admin::ActionLog.arel_table))