diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-08 20:36:01 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-08 20:36:01 +0200 |
| commit | 85d89b472dff2c3d06801dbd42f91c325d21a434 (patch) | |
| tree | b348297bf48c63f906cdcdbc1ff573203afb560a /app/models | |
| parent | a4cc966476852542f445793b60c67ad3682976e5 (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')
| -rw-r--r-- | app/models/status.rb | 2 | ||||
| -rw-r--r-- | app/models/stream_entry.rb | 12 |
2 files changed, 12 insertions, 2 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? diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb index 165f62f20..f33295796 100644 --- a/app/models/stream_entry.rb +++ b/app/models/stream_entry.rb @@ -4,9 +4,15 @@ class StreamEntry < ApplicationRecord belongs_to :account, inverse_of: :stream_entries belongs_to :activity, polymorphic: true + belongs_to :status, foreign_type: 'Status', foreign_key: 'activity_id' + belongs_to :follow, foreign_type: 'Follow', foreign_key: 'activity_id' + belongs_to :favourite, foreign_type: 'Favourite', foreign_key: 'activity_id' + validates :account, :activity, presence: true - scope :with_includes, -> { includes(:activity) } + STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, mentions: :account, reblog: [:stream_entry, :account, mentions: :account], thread: [:stream_entry, :account]] + + scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES, favourite: [:account, :stream_entry, status: STATUS_INCLUDES], follow: [:target_account, :stream_entry]) } def object_type orphaned? ? :activity : (targeted? ? :activity : self.activity.object_type) @@ -44,6 +50,10 @@ class StreamEntry < ApplicationRecord self.activity.respond_to?(:mentions) ? self.activity.mentions.map { |x| x.account } : [] end + def activity + self.send(self.activity_type.downcase.to_sym) + end + private def orphaned? |