Merge branch 'master' into glitch-soc/merge-upstream

2019-11-30 17:29:44 +01:00
parent 93b8aec7b7 b532ead798
commit 2b7158427f
22 changed files with 611 additions and 494 deletions
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@ -97,8 +97,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