diff options
| author | Starfall <us@starfall.systems> | 2021-02-08 15:01:01 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-02-08 15:01:01 -0600 |
| commit | 3693000bf6a94219e3cc4a29a6cb4ac51b78cf2a (patch) | |
| tree | 5e0a9757d315ca3aafe4db1ce10d3c4d84769408 /app/models/status.rb | |
| parent | ab4c09a7041050e4aa4b8333484e311f26a36b4a (diff) | |
| parent | 4ed9576cd28abc033a094fed6babe9825014f1af (diff) | |
Merge remote-tracking branch 'glitchsoc/main' into main
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 836d363ef..7bedbef07 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -120,7 +120,7 @@ class Status < ApplicationRecord :tags, :preview_cards, :preloadable_poll, - account: :account_stat, + account: [:account_stat, :user], active_mentions: { account: :account_stat }, reblog: [ :application, @@ -130,7 +130,7 @@ class Status < ApplicationRecord :conversation, :status_stat, :preloadable_poll, - account: :account_stat, + account: [:account_stat, :user], active_mentions: { account: :account_stat }, ], thread: { account: :account_stat } @@ -354,7 +354,7 @@ class Status < ApplicationRecord return if account_ids.empty? - accounts = Account.where(id: account_ids).includes(:account_stat).index_by(&:id) + accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id) cached_items.each do |item| item.account = accounts[item.account_id] |