Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` (#26239)

shrike
Daniel M Brasil 2023-08-23 10:50:23 -03:00 committed by GitHub
parent b91724fb9d
commit f337008819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

@ -45,11 +45,11 @@ class PublicFeed
end
def local_only?
options[:local]
options[:local] && !options[:remote]
end
def remote_only?
options[:remote]
options[:remote] && !options[:local]
end
def account?

View File

@ -56,6 +56,13 @@ describe 'Public' do
it_behaves_like 'a successful request to the public timeline'
end
context 'with local and remote params' do
let(:params) { { local: true, remote: true } }
let(:expected_statuses) { [local_status, remote_status, media_status] }
it_behaves_like 'a successful request to the public timeline'
end
context 'with only_media param' do
let(:params) { { only_media: true } }
let(:expected_statuses) { [media_status] }