about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-09-17 21:34:48 -0500
committermultiple creatures <dev@multiple-creature.party>2019-09-17 21:34:48 -0500
commit7ee43869e7af50fbcfce3849c7afd4caaacc60aa (patch)
treeabe93aa93bddfcf2ea381660cfd226320157b31e /app/controllers
parent71bb4f01bc104ef32b14fd82a6ecc4b35d56fee2 (diff)
don't pre-cache media in tag bookmarks (we don't need to do this anymore)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/timelines/tag_controller.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 2494cfba7..126ffb5dc 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -29,9 +29,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
     if @tag.nil?
       []
     elsif @tag.name.in?(['self.bookmarks', '.self.bookmarks'])
-      bookmarks = Status.reorder(nil).joins(:bookmarks).merge(bookmark_results)
-      preload_media(bookmarks)
-      bookmarks
+      Status.reorder(nil).joins(:bookmarks).merge(bookmark_results)
     else
       statuses = tag_timeline_statuses.paginate_by_id(
         limit_param(DEFAULT_STATUSES_LIMIT),