Merge remote-tracking branch 'parent/main' into upstream-20241101

db/migrate/20241022214312_add_untrusted_favourites_count_and_untrusted_reblogs_count_to_status_stat.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddUntrustedFavouritesCountAndUntrustedReblogsCountToStatusStat < ActiveRecord::Migration[7.1]
+  def change
+    add_column :status_stats, :untrusted_favourites_count, :bigint, null: true
+    add_column :status_stats, :untrusted_reblogs_count, :bigint, null: true
+  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[7.1].define(version: 2024_10_14_010506) do
+ActiveRecord::Schema[7.1].define(version: 2024_10_22_214312) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -1369,6 +1369,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_10_14_010506) do
     t.integer "emoji_reactions_count", default: 0, null: false
     t.integer "emoji_reaction_accounts_count", default: 0, null: false
     t.integer "status_referred_by_count", default: 0, null: false
+    t.bigint "untrusted_favourites_count"
+    t.bigint "untrusted_reblogs_count"
     t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true
   end