Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream

db/migrate/20260212131934_create_collection_reports.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateCollectionReports < ActiveRecord::Migration[8.0]
+  def change
+    create_table :collection_reports do |t|
+      t.references :collection, null: false, foreign_key: { on_delete: :cascade }
+      t.references :report, null: false, foreign_key: { on_delete: :cascade }
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_02_12_113020) do
+ActiveRecord::Schema[8.0].define(version: 2026_02_12_131934) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -372,6 +372,15 @@ ActiveRecord::Schema[8.0].define(version: 2026_02_12_113020) do
     t.index ["object_uri"], name: "index_collection_items_on_object_uri", unique: true, where: "(activity_uri IS NOT NULL)"
   end
 
+  create_table "collection_reports", force: :cascade do |t|
+    t.bigint "collection_id", null: false
+    t.bigint "report_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["collection_id"], name: "index_collection_reports_on_collection_id"
+    t.index ["report_id"], name: "index_collection_reports_on_report_id"
+  end
+
   create_table "collections", id: :bigint, default: -> { "timestamp_id('collections'::text)" }, force: :cascade do |t|
     t.bigint "account_id", null: false
     t.string "name", null: false
@@ -1434,6 +1443,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_02_12_113020) do
   add_foreign_key "canonical_email_blocks", "accounts", column: "reference_account_id", on_delete: :cascade
   add_foreign_key "collection_items", "accounts"
   add_foreign_key "collection_items", "collections", on_delete: :cascade
+  add_foreign_key "collection_reports", "collections", on_delete: :cascade
+  add_foreign_key "collection_reports", "reports", on_delete: :cascade
   add_foreign_key "collections", "accounts"
   add_foreign_key "collections", "tags"
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade