Merge branch 'master' into glitch-soc/merge-upstream

2021-01-18 13:57:12 +01:00
parent a7a47834e5 e46b50e805
commit e202314a75
18 changed files with 48 additions and 43 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -354,7 +354,7 @@ class Status < ApplicationRecord

      return if account_ids.empty?

-      accounts = Account.where(id: account_ids).includes(:account_stat).each_with_object({}) { |a, h| h[a.id] = a }
+      accounts = Account.where(id: account_ids).includes(:account_stat).index_by(&:id)

      cached_items.each do |item|
        item.account = accounts[item.account_id]