Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream

2023-08-22 18:50:14 +02:00
parent 245fe855be 1cb978bcc3
commit 10404aece8
22 changed files with 237 additions and 27 deletions
@@ -410,13 +410,25 @@ class Status < ApplicationRecord

      account_ids.uniq!

+      status_ids = cached_items.map { |item| item.reblog? ? item.reblog_of_id : item.id }.uniq
+
      return if account_ids.empty?

      accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)

+      status_stats = StatusStat.where(status_id: status_ids).index_by(&:status_id)
+
      cached_items.each do |item|
        item.account = accounts[item.account_id]
        item.reblog.account = accounts[item.reblog.account_id] if item.reblog?
+
+        if item.reblog?
+          status_stat = status_stats[item.reblog.id]
+          item.reblog.status_stat = status_stat if status_stat.present?
+        else
+          status_stat = status_stats[item.id]
+          item.status_stat = status_stat if status_stat.present?
+        end
      end
    end