From 7ee43869e7af50fbcfce3849c7afd4caaacc60aa Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Tue, 17 Sep 2019 21:34:48 -0500 Subject: don't pre-cache media in tag bookmarks (we don't need to do this anymore) --- app/controllers/api/v1/timelines/tag_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/controllers/api/v1/timelines') 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), -- cgit