Commit 2c5676a2 authored by mgabdev's avatar mgabdev

Updated Explore,Group,GroupCollection timeline controllers unauth result limits

• Updated:
- Explore,Group,GroupCollection timeline controllers unauth result limits to be max 2 pages (group still empty for now)
- Max limit to be 25 (for everything, unless provided default) in BaseController
parent 409bb05a
......@@ -5,6 +5,8 @@ class Api::BaseController < ApplicationController
DEFAULT_ACCOUNTS_LIMIT = 20
DEFAULT_CHAT_CONVERSATION_LIMIT = 100
DEFAULT_CHAT_CONVERSATION_MESSAGE_LIMIT = 20
MAX_LIMIT_PARAM = 25
MIN_UNAUTHENTICATED_PAGES = 2
include RateLimitHeaders
......@@ -55,7 +57,7 @@ class Api::BaseController < ApplicationController
def limit_param(default_limit)
return default_limit unless params[:limit]
[params[:limit].to_i.abs, default_limit * 2].min
[params[:limit].to_i.abs, MAX_LIMIT_PARAM].min
end
def params_slice(*keys)
......
......@@ -48,7 +48,8 @@ class Api::V1::Timelines::ExploreController < Api::BaseController
FeedManager.instance.filter?(:home, status, current_account.id)
}
else
SortingQueryBuilder.new.call(@sort_type, nil, params[:page])
page = [params[:page].to_i.abs, MIN_UNAUTHENTICATED_PAGES].min
SortingQueryBuilder.new.call(@sort_type, nil, page)
end
end
......
......@@ -71,7 +71,8 @@ class Api::V1::Timelines::GroupCollectionController < Api::BaseController
FeedManager.instance.filter?(:home, status, current_account.id)
}
else
SortingQueryBuilder.new.call(@sort_type, @groupIds, params[:page])
page = [params[:page].to_i.abs, MIN_UNAUTHENTICATED_PAGES].min
SortingQueryBuilder.new.call(@sort_type, @groupIds, page)
end
end
......
......@@ -55,7 +55,8 @@ class Api::V1::Timelines::GroupController < Api::BaseController
}
else
return []
# SortingQueryBuilder.new.call(@sort_type, @group, params[:page])
# page = [params[:page].to_i.abs, MIN_UNAUTHENTICATED_PAGES].min
# SortingQueryBuilder.new.call(@sort_type, @group, page)
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment