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

2019-11-28 04:08:00 +01:00
parent d9793b2367
commit 07da35c17c
2 changed files with 4 additions and 3 deletions
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@ -95,8 +95,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
  end

  def bookmarked
-    if instance_options && instance_options[:bookmarks]
-      instance_options[:bookmarks].bookmarks_map[object.id] || false
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].bookmarks_map[object.id] || false
    else
      current_user.account.bookmarked?(object)
    end