Refactor and spec coverage for api/v1/timelines actions (#3482)

1 files changed, 48 insertions, 29 deletions

diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 644c7a6f1..cd3663d5f 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -1,41 +1,60 @@
 # frozen_string_literal: true
 
-module Api::V1::Timelines
-  class PublicController < BaseController
-    def show
-      @statuses = load_statuses
-    end
+class Api::V1::Timelines::PublicController < ApiController
+  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-    private
+  respond_to :json
 
-    def load_statuses
-      cached_public_statuses.tap do |statuses|
-        set_maps(statuses)
-      end
-    end
+  def show
+    @statuses = load_statuses
+    render 'api/v1/timelines/show'
+  end
 
-    def cached_public_statuses
-      cache_collection public_statuses
-    end
+  private
 
-    def public_statuses
-      public_timeline_statuses.paginate_by_max_id(
-        limit_param(DEFAULT_STATUSES_LIMIT),
-        params[:max_id],
-        params[:since_id]
-      )
+  def load_statuses
+    cached_public_statuses.tap do |statuses|
+      set_maps(statuses)
     end
+  end
 
-    def public_timeline_statuses
-      Status.as_public_timeline(current_account, params[:local])
-    end
+  def cached_public_statuses
+    cache_collection public_statuses, Status
+  end
 
-    def next_path
-      api_v1_timelines_public_url pagination_params(max_id: @statuses.last.id)
-    end
+  def public_statuses
+    public_timeline_statuses.paginate_by_max_id(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
 
-    def prev_path
-      api_v1_timelines_public_url pagination_params(since_id: @statuses.first.id)
-    end
+  def public_timeline_statuses
+    Status.as_public_timeline(current_account, params[:local])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_params(core_params)
+    params.permit(:local, :limit).merge(core_params)
+  end
+
+  def next_path
+    api_v1_timelines_public_url pagination_params(max_id: pagination_max_id)
+  end
+
+  def prev_path
+    api_v1_timelines_public_url pagination_params(since_id: pagination_since_id)
+  end
+
+  def pagination_max_id
+    @statuses.last.id
+  end
+
+  def pagination_since_id
+    @statuses.first.id
   end
 end