diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-30 18:13:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 18:13:53 +0100 |
| commit | 7f6315841c98a1eee6cb57171a91a88f5c5343df (patch) | |
| tree | 02bc3eae22390ba267410c3e134067669ad3c805 /app/serializers | |
| parent | 93b8aec7b7cd6af1b6ef6385cfe138fb32dee6e9 (diff) | |
| parent | b509b8812a8f08f59f3b0303f7d8e98de86e3590 (diff) | |
Merge pull request #1249 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index e73992899..023913028 100644 --- 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 |