Revert "Support min_id-based pagination in REST API (mastodon#8736)"

This reverts commit f0fff3e.

app/controllers/api/base_controller.rb

@@ -53,10 +53,6 @@ def limit_param(default_limit)
     [params[:limit].to_i.abs, default_limit * 2].min
   end
 
-  def params_slice(*keys)
-    params.slice(*keys).permit(*keys)
-  end
-
   def current_resource_owner
     @current_user ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
   end

app/controllers/api/v1/accounts/statuses_controller.rb

@@ -28,9 +28,10 @@ def cached_account_statuses
 
   def account_statuses
     statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses
-    statuses = statuses.paginate_by_id(
+    statuses = statuses.paginate_by_max_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
+      params[:since_id]
     )
 
     statuses.merge!(only_media_scope) if truthy_param?(:only_media)
@@ -81,7 +82,7 @@ def next_path
 
   def prev_path
     unless @statuses.empty?
-      api_v1_account_statuses_url pagination_params(min_id: pagination_since_id)
+      api_v1_account_statuses_url pagination_params(since_id: pagination_since_id)
     end
   end
 

app/controllers/api/v1/favourites_controller.rb

@@ -26,9 +26,10 @@ def cached_favourites
   end
 
   def results
-    @_results ||= account_favourites.paginate_by_id(
+    @_results ||= account_favourites.paginate_by_max_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
+      params[:since_id]
     )
   end
 
@@ -48,7 +49,7 @@ def next_path
 
   def prev_path
     unless results.empty?
-      api_v1_favourites_url pagination_params(min_id: pagination_since_id)
+      api_v1_favourites_url pagination_params(since_id: pagination_since_id)
     end
   end
 

app/controllers/api/v1/notifications_controller.rb

@@ -37,9 +37,10 @@ def load_notifications
   end
 
   def paginated_notifications
-    browserable_account_notifications.paginate_by_id(
+    browserable_account_notifications.paginate_by_max_id(
       limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
+      params[:since_id]
     )
   end
 
@@ -63,7 +64,7 @@ def next_path
 
   def prev_path
     unless @notifications.empty?
-      api_v1_notifications_url pagination_params(min_id: pagination_since_id)
+      api_v1_notifications_url pagination_params(since_id: pagination_since_id)
     end
   end
 

app/controllers/api/v1/reports_controller.rb

@@ -7,6 +7,11 @@ class Api::V1::ReportsController < Api::BaseController
 
   respond_to :json
 
+  def index
+    @reports = current_account.reports
+    render json: @reports, each_serializer: REST::ReportSerializer
+  end
+
   def create
     @report = ReportService.new.call(
       current_account,

app/controllers/api/v1/timelines/home_controller.rb

@@ -30,8 +30,7 @@ def home_statuses
     account_home_feed.get(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params[:max_id],
-      params[:since_id],
-      params[:min_id]
+      params[:since_id]
     )
   end
 
@@ -52,7 +51,7 @@ def next_path
   end
 
   def prev_path
-    api_v1_timelines_home_url pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_home_url pagination_params(since_id: pagination_since_id)
   end
 
   def pagination_max_id

app/controllers/api/v1/timelines/list_controller.rb

@@ -32,8 +32,7 @@ def list_statuses
     list_feed.get(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params[:max_id],
-      params[:since_id],
-      params[:min_id]
+      params[:since_id]
     )
   end
 
@@ -54,7 +53,7 @@ def next_path
   end
 
   def prev_path
-    api_v1_timelines_list_url params[:id], pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_list_url params[:id], pagination_params(since_id: pagination_since_id)
   end
 
   def pagination_max_id

app/controllers/api/v1/timelines/public_controller.rb

@@ -21,9 +21,10 @@ def cached_public_statuses
   end
 
   def public_statuses
-    statuses = public_timeline_statuses.paginate_by_id(
+    statuses = public_timeline_statuses.paginate_by_max_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
+      params[:since_id]
     )
 
     if truthy_param?(:only_media)
@@ -52,7 +53,7 @@ def next_path
   end
 
   def prev_path
-    api_v1_timelines_public_url pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_public_url pagination_params(since_id: pagination_since_id)
   end
 
   def pagination_max_id

app/controllers/api/v1/timelines/tag_controller.rb

@@ -29,9 +29,10 @@ def tagged_statuses
     if @tag.nil?
       []
     else
-      statuses = tag_timeline_statuses.paginate_by_id(
+      statuses = tag_timeline_statuses.paginate_by_max_id(
         limit_param(DEFAULT_STATUSES_LIMIT),
-        params_slice(:max_id, :since_id, :min_id)
+        params[:max_id],
+        params[:since_id]
       )
 
       if truthy_param?(:only_media)
@@ -61,7 +62,7 @@ def next_path
   end
 
   def prev_path
-    api_v1_timelines_tag_url params[:id], pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_tag_url params[:id], pagination_params(since_id: pagination_since_id)
   end
 
   def pagination_max_id

app/models/concerns/paginable.rb

@@ -19,13 +19,5 @@ module Paginable
       query = query.where(arel_table[:id].gt(min_id)) if min_id.present?
       query
     }
-
-    scope :paginate_by_id, ->(limit, **options) {
-      if options[:min_id].present?
-        paginate_by_min_id(limit, options[:min_id]).reverse
-      else
-        paginate_by_max_id(limit, options[:max_id], options[:since_id])
-      end
-    }
   end
 end

app/models/feed.rb

@@ -6,20 +6,16 @@ def initialize(type, id)
     @id   = id
   end
 
-  def get(limit, max_id = nil, since_id = nil, min_id = nil)
-    from_redis(limit, max_id, since_id, min_id)
+  def get(limit, max_id = nil, since_id = nil)
+    from_redis(limit, max_id, since_id)
   end
 
   protected
 
-  def from_redis(limit, max_id, since_id, min_id)
-    if min_id.blank?
-      max_id     = '+inf' if max_id.blank?
-      since_id   = '-inf' if since_id.blank?
-      unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
-    else
-      unhydrated = redis.zrangebyscore(key, "(#{min_id}", '+inf', limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
-    end
+  def from_redis(limit, max_id, since_id)
+    max_id     = '+inf' if max_id.blank?
+    since_id   = '-inf' if since_id.blank?
+    unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
 
     Status.where(id: unhydrated).cache_ids
   end

app/models/home_feed.rb

@@ -7,19 +7,19 @@ def initialize(account)
     @account = account
   end
 
-  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+  def get(limit, max_id = nil, since_id = nil)
     if redis.exists("account:#{@account.id}:regeneration")
-      from_database(limit, max_id, since_id, min_id)
+      from_database(limit, max_id, since_id)
     else
       super
     end
   end
 
   private
 
-  def from_database(limit, max_id, since_id, min_id)
+  def from_database(limit, max_id, since_id)
     Status.as_home_timeline(@account)
-          .paginate_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+          .paginate_by_max_id(limit, max_id, since_id)
           .reject { |status| FeedManager.instance.filter?(:home, status, @account.id) }
   end
 end

config/routes.rb

@@ -268,7 +268,7 @@
       resources :blocks,       only: [:index]
       resources :mutes,        only: [:index]
       resources :favourites,   only: [:index]
-      resources :reports,      only: [:create]
+      resources :reports,      only: [:index, :create]
       resources :filters,      only: [:index, :create, :show, :update, :destroy]
       resources :endorsements, only: [:index]
 

spec/controllers/api/v1/favourites_controller_spec.rb

@@ -64,7 +64,7 @@
           get :index, params: { limit: 1 }
 
           expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq "http://test.host/api/v1/favourites?limit=1&max_id=#{favourite.id}"
-          expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/favourites?limit=1&min_id=#{favourite.id}"
+          expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/favourites?limit=1&since_id=#{favourite.id}"
         end
 
         it 'does not add pagination headers if not necessary' do

spec/controllers/api/v1/reports_controller_spec.rb

@@ -12,6 +12,16 @@
     allow(controller).to receive(:doorkeeper_token) { token }
   end
 
+  describe 'GET #index' do
+    let(:scopes) { 'read:reports' }
+
+    it 'returns http success' do
+      get :index
+
+      expect(response).to have_http_status(200)
+    end
+  end
+
   describe 'POST #create' do
     let(:scopes)  { 'write:reports' }
     let!(:status) { Fabricate(:status) }