about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-22 23:18:54 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-22 23:18:54 +0100
commit5c78547198de20e7f367adb142acc82cd80b4899 (patch)
tree18df6af1dc5042e44c67156586822bd8798f6c84 /app/models
parentfc90d38893ae81b83884c3f5c85d05d564f1de33 (diff)
More query optimizations
Diffstat (limited to 'app/models')
-rw-r--r--app/models/feed.rb2
-rw-r--r--app/models/status.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/feed.rb b/app/models/feed.rb
index e7f2ab3a5..6337726be 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -16,7 +16,7 @@ class Feed
       RegenerationWorker.perform_async(@account.id, @type)
       @statuses = Status.send("as_#{@type}_timeline", @account).paginate_by_max_id(limit, nil, nil)
     else
-      status_map = Status.where(id: unhydrated).with_includes.with_counters.map { |status| [status.id, status] }.to_h
+      status_map = Status.where(id: unhydrated).with_includes.map { |status| [status.id, status] }.to_h
       @statuses = unhydrated.map { |id| status_map[id] }.compact
     end
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 53987c3ec..708fef17f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -4,7 +4,7 @@ class Status < ApplicationRecord
   include Paginable
   include Streamable
 
-  belongs_to :account, -> { with_counters }, inverse_of: :statuses
+  belongs_to :account, inverse_of: :statuses
 
   belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
   belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, touch: true
@@ -27,7 +27,7 @@ class Status < ApplicationRecord
   default_scope { order('id desc') }
 
   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, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, mentions: :account], thread: :account) }
+  scope :with_includes, -> { includes(:account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :stream_entry, :tags, mentions: :account], thread: :account) }
 
   def local?
     uri.nil?