autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix N+1 at notification (#5752)

Browse Source
This commit is contained in:
abcang
2017-11-19 23:32:48 +09:00
committed by Eugen Rochko
parent 08deec4c84
commit 53e95c4efc
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/notification.rb
View File

@ -24,7 +24,7 @@ class Notification < ApplicationRecord
favourite: 'Favourite',
}.freeze
STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account]].freeze
STATUS_INCLUDES = [:account, :application, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :application, :media_attachments, :tags, mentions: :account]].freeze
belongs_to :account
belongs_to :from_account, class_name: 'Account'
@ -55,9 +55,11 @@ class Notification < ApplicationRecord
def target_status
case type
when :reblog
activity&.reblog
when :favourite, :mention
activity&.status
status&.reblog
when :favourite
favourite&.status
when :mention
mention&.status
end
end