cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix n+1 query for bookmarks on statuses (#12494)

This commit is contained in:
Eugen Rochko 2019-11-28 04:08:00 +01:00 committed by GitHub
parent d9793b2367
commit 07da35c17c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/presenters/status_relationships_presenter.rb
View File

@ -1,7 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class StatusRelationshipsPresenter class StatusRelationshipsPresenter
attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map,
:bookmarks_map
def initialize(statuses, current_account_id = nil, **options) def initialize(statuses, current_account_id = nil, **options)
if current_account_id.nil? if current_account_id.nil?

4
app/serializers/rest/status_serializer.rb
View File

@ -95,8 +95,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
end end
def bookmarked def bookmarked
if instance_options && instance_options[:bookmarks] if instance_options && instance_options[:relationships]
instance_options[:bookmarks].bookmarks_map[object.id] || false instance_options[:relationships].bookmarks_map[object.id] || false
else else
current_user.account.bookmarked?(object) current_user.account.bookmarked?(object)
end end