about summary refs log tree commit diff
path: root/app/presenters/status_relationships_presenter.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-04-14 03:50:31 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-04-14 03:50:31 -0500
commitd66192f21c22dd79735a6c3ea6e2ed115b42e0d0 (patch)
treefec9f7eab346901c571c57023aa6231b0f855421 /app/presenters/status_relationships_presenter.rb
parent78aca92689cd896f4be34daeb1852f75abc57472 (diff)
parent95a892accdb6a081447117f49c66431dc7e032fb (diff)
Merge remote-tracking branch 'glitchsoc/master' into gs-master
  Conflicts:
 	db/schema.rb
Diffstat (limited to 'app/presenters/status_relationships_presenter.rb')
-rw-r--r--app/presenters/status_relationships_presenter.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
index b04e10e2f..64e688d87 100644
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -7,6 +7,7 @@ class StatusRelationshipsPresenter
     if current_account_id.nil?
       @reblogs_map    = {}
       @favourites_map = {}
+      @bookmarks_map  = {}
       @mutes_map      = {}
       @pins_map       = {}
     else
@@ -17,6 +18,7 @@ class StatusRelationshipsPresenter
 
       @reblogs_map     = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
       @favourites_map  = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
+      @bookmarks_map   = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {})
       @mutes_map       = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {})
       @pins_map        = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
     end