Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream

Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.

db/migrate/20260311212130_create_email_subscriptions.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateEmailSubscriptions < ActiveRecord::Migration[8.1]
+  def change
+    create_table :email_subscriptions do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }
+      t.string :email, null: false
+      t.string :locale, null: false
+      t.string :confirmation_token, index: { unique: true, where: 'confirmation_token is not null' }
+      t.datetime :confirmed_at
+
+      t.timestamps
+    end
+
+    add_index :email_subscriptions, [:account_id, :email], unique: true
+  end
+end

db/migrate/20260323105645_create_keypairs.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateKeypairs < ActiveRecord::Migration[8.0]
+  def change
+    create_table :keypairs do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }
+
+      t.string :uri, null: false
+      t.integer :type, null: false
+      t.string :public_key, null: false
+      t.string :private_key
+      t.datetime :expires_at
+      t.boolean :revoked, default: false, null: false
+
+      t.timestamps
+    end
+
+    add_index :keypairs, :uri, unique: true
+  end
+end