about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-03 20:04:19 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-03 20:04:19 +0100
commitb14b5e3b448eafa1489d6fe4b702621e25dff1ae (patch)
treea4c7885fcede76232dbc476b3ebcf0c84859a87a /app/models/status.rb
parent5abf64d647b6f36a51f014b63f7b469b43378d3f (diff)
Improve notification model
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index f6d8fc9bb..1f5cf9b46 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -94,11 +94,11 @@ class Status < ApplicationRecord
 
   class << self
     def as_home_timeline(account)
-      where(account: [account] + account.following).with_includes
+      where(account: [account] + account.following)
     end
 
     def as_mentions_timeline(account)
-      where(id: Mention.where(account: account).pluck(:status_id)).with_includes
+      where(id: Mention.where(account: account).select(:status_id))
     end
 
     def as_public_timeline(account = nil)