about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-08 20:36:01 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-08 20:36:01 +0200
commit85d89b472dff2c3d06801dbd42f91c325d21a434 (patch)
treeb348297bf48c63f906cdcdbc1ff573203afb560a /app/models/status.rb
parenta4cc966476852542f445793b60c67ad3682976e5 (diff)
Optimized n+1 queries in accounts Atom and HTML views
Added stack trace for SQL queries in development
Removed badly thought out accounts/lookup API
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index df9eceaff..12c58733c 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -18,7 +18,7 @@ class Status < ApplicationRecord
   validates :text, presence: true, if: Proc.new { |s| s.local? && !s.reblog? }
 
   scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') }
-  scope :with_includes, -> { includes(:account, :mentions, :media_attachments, :stream_entry, reblog: [:account, :mentions], thread: :account) }
+  scope :with_includes, -> { includes(:account, :media_attachments, :stream_entry, mentions: :account, reblog: [:account, mentions: :account], thread: :account) }
 
   def local?
     self.uri.nil?