diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index fcb770dc0f..f9bc54c9a9 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -18,10 +18,13 @@ class Api::V1::Timelines::PublicController < Api::BaseController end def load_statuses - (cached_0_pinned_statuses + cached_public_statuses).uniq { |p| p.id } + (cached_0_pinned_statuses + cached_public_statuses).uniq(&:id) end def cached_0_pinned_statuses + if not params_slice(:max_id, :since_id, :min_id).empty? + return [] + end z_pinned = Account.find(1).pinned_statuses cache_collection z_pinned, Status end