X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fsearch%2Fvideos.ts;h=da806e692082f2269a6ef94b3c18b076847325f8;hb=51b34a11b298b466faef9c8d24beec4442d7add3;hp=ba46270175f45edc395deb80a450b38c9f83897a;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/extra-utils/search/videos.ts b/shared/extra-utils/search/videos.ts index ba4627017..da806e692 100644 --- a/shared/extra-utils/search/videos.ts +++ b/shared/extra-utils/search/videos.ts @@ -6,9 +6,11 @@ import { immutableAssign } from '../miscs/miscs' function searchVideo (url: string, search: string) { const path = '/api/v1/search/videos' + + const query = { sort: '-publishedAt', search: search } const req = request(url) .get(path) - .query({ sort: '-publishedAt', search }) + .query(query) .set('Accept', 'application/json') return req.expect(200) @@ -27,29 +29,14 @@ function searchVideoWithToken (url: string, search: string, token: string, query .expect('Content-Type', /json/) } -function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) { - const path = '/api/v1/search/videos' - - const req = request(url) - .get(path) - .query({ start }) - .query({ search }) - .query({ count }) - - if (sort) req.query({ sort }) - - return req.set('Accept', 'application/json') - .expect(200) - .expect('Content-Type', /json/) -} - function searchVideoWithSort (url: string, search: string, sort: string) { const path = '/api/v1/search/videos' + const query = { search, sort } + return request(url) .get(path) - .query({ search }) - .query({ sort }) + .query(query) .set('Accept', 'application/json') .expect(200) .expect('Content-Type', /json/) @@ -72,6 +59,5 @@ export { searchVideo, advancedVideosSearch, searchVideoWithToken, - searchVideoWithPagination, searchVideoWithSort }