Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream

Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.

db/migrate/20160826155805_add_superapp_to_oauth_applications.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddSuperappToOauthApplications < ActiveRecord::Migration[5.0]
+class AddSuperappToOAuthApplications < ActiveRecord::Migration[5.0]
   def change
     add_column :oauth_applications, :superapp, :boolean, default: false, null: false
   end

db/migrate/20170114203041_add_website_to_oauth_application.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddWebsiteToOauthApplication < ActiveRecord::Migration[5.0]
+class AddWebsiteToOAuthApplication < ActiveRecord::Migration[5.0]
   def change
     add_column :oauth_applications, :website, :string
   end

db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddLastUsedAtToOauthAccessTokens < ActiveRecord::Migration[6.1]
+class AddLastUsedAtToOAuthAccessTokens < ActiveRecord::Migration[6.1]
   def change
     safety_assured do
       change_table(:oauth_access_tokens, bulk: true) do |t|

db/migrate/20250328153843_create_instance_moderation_notes.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateInstanceModerationNotes < ActiveRecord::Migration[8.0]
+  def change
+    create_table :instance_moderation_notes do |t|
+      t.string :domain, null: false
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }, index: false, null: false
+      t.text :content
+
+      t.timestamps
+
+      t.index ['domain'], name: 'index_instance_moderation_notes_on_domain'
+    end
+  end
+end

db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb

@@ -2,7 +2,7 @@
 
 require Rails.root.join('lib', 'mastodon', 'migration_helpers')
 
-class OptimizeNullIndexOauthAccessTokensRefreshToken < ActiveRecord::Migration[5.2]
+class OptimizeNullIndexOAuthAccessTokensRefreshToken < ActiveRecord::Migration[5.2]
   include Mastodon::MigrationHelpers
 
   disable_ddl_transaction!

db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb

@@ -2,7 +2,7 @@
 
 require Rails.root.join('lib', 'mastodon', 'migration_helpers')
 
-class OptimizeNullIndexOauthAccessTokensResourceOwnerId < ActiveRecord::Migration[5.2]
+class OptimizeNullIndexOAuthAccessTokensResourceOwnerId < ActiveRecord::Migration[5.2]
   include Mastodon::MigrationHelpers
 
   disable_ddl_transaction!

db/schema.rb

@@ -191,8 +191,8 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_05_110215) do
     t.boolean "hide_collections"
     t.integer "avatar_storage_schema_version"
     t.integer "header_storage_schema_version"
-    t.datetime "sensitized_at", precision: nil
     t.integer "suspension_origin"
+    t.datetime "sensitized_at", precision: nil
     t.boolean "trendable"
     t.datetime "reviewed_at", precision: nil
     t.datetime "requested_review_at", precision: nil
@@ -580,6 +580,15 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_05_110215) do
     t.index ["user_id"], name: "index_identities_on_user_id"
   end
 
+  create_table "instance_moderation_notes", force: :cascade do |t|
+    t.string "domain", null: false
+    t.bigint "account_id", null: false
+    t.text "content"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["domain"], name: "index_instance_moderation_notes_on_domain"
+  end
+
   create_table "invites", force: :cascade do |t|
     t.bigint "user_id", null: false
     t.string "code", default: "", null: false
@@ -595,12 +604,12 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_05_110215) do
   end
 
   create_table "ip_blocks", force: :cascade do |t|
-    t.inet "ip", default: "0.0.0.0", null: false
-    t.integer "severity", default: 0, null: false
-    t.datetime "expires_at", precision: nil
-    t.text "comment", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.datetime "expires_at", precision: nil
+    t.inet "ip", default: "0.0.0.0", null: false
+    t.integer "severity", default: 0, null: false
+    t.text "comment", default: "", null: false
     t.index ["ip"], name: "index_ip_blocks_on_ip", unique: true
   end
 
@@ -1375,6 +1384,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_05_110215) do
   add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
   add_foreign_key "generated_annual_reports", "accounts"
   add_foreign_key "identities", "users", name: "fk_bea040f377", on_delete: :cascade
+  add_foreign_key "instance_moderation_notes", "accounts", on_delete: :cascade
   add_foreign_key "invites", "users", on_delete: :cascade
   add_foreign_key "list_accounts", "accounts", on_delete: :cascade
   add_foreign_key "list_accounts", "follow_requests", on_delete: :cascade