From 8b6d97fb7cc80321834f95bdee56e31676e1cff6 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Tue, 9 Jun 2020 07:18:47 +0900
Subject: [PATCH] Add limit parameter to rss (#13743)
---
app/controllers/accounts_controller.rb | 6 ++++--
app/controllers/tags_controller.rb | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index db9f45b4e..62c862d36 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,7 +1,8 @@
# frozen_string_literal: true
class AccountsController < ApplicationController
- PAGE_SIZE = 20
+ PAGE_SIZE = 20
+ PAGE_SIZE_MAX = 200
include AccountControllerConcern
include SignatureAuthentication
@@ -40,7 +41,8 @@ class AccountsController < ApplicationController
format.rss do
expires_in 1.minute, public: true
- @statuses = filtered_statuses.without_reblogs.limit(PAGE_SIZE)
+ limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
+ @statuses = filtered_statuses.without_reblogs.limit(limit)
@statuses = cache_collection(@statuses, Status)
render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag])
end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index da0add71a..7e86d4f1a 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -3,7 +3,8 @@
class TagsController < ApplicationController
include SignatureVerification
- PAGE_SIZE = 20
+ PAGE_SIZE = 20
+ PAGE_SIZE_MAX = 200
layout 'public'
@@ -25,6 +26,7 @@ class TagsController < ApplicationController
format.rss do
expires_in 0, public: true
+ limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
@statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(PAGE_SIZE)
@statuses = cache_collection(@statuses, Status)
--
GitLab