3 files changed, 37 insertions, 18 deletions

diff --git a/shared/extra-utils/search/videos.ts b/shared/extra-utils/search/videos.ts
index ba4627017..5cf8d8cf0 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)
@@ -30,11 +32,15 @@ function searchVideoWithToken (url: string, search: string, token: string, query
 function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) {
   const path = '/api/v1/search/videos'
 
+  const query = {
+    start,
+    search,
+    count
+  }
+
   const req = request(url)
     .get(path)
-    .query({ start })
-    .query({ search })
-    .query({ count })
+    .query(query)
 
   if (sort) req.query({ sort })
 
@@ -46,10 +52,11 @@ function searchVideoWithPagination (url: string, search: string, start: number,
 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/)
diff --git a/shared/extra-utils/server/follows.ts b/shared/extra-utils/server/follows.ts
index 68c5a2e2b..0379bb109 100644
--- a/shared/extra-utils/server/follows.ts
+++ b/shared/extra-utils/server/follows.ts
@@ -6,12 +6,16 @@ import { makePostBodyRequest } from '../requests/requests'
 function getFollowersListPaginationAndSort (url: string, start: number, count: number, sort: string, search?: string) {
   const path = '/api/v1/server/followers'
 
+  const query = {
+    start,
+    count,
+    sort,
+    search
+  }
+
   return request(url)
     .get(path)
-    .query({ start })
-    .query({ count })
-    .query({ sort })
-    .query({ search })
+    .query(query)
     .set('Accept', 'application/json')
     .expect(200)
     .expect('Content-Type', /json/)
@@ -42,12 +46,16 @@ function rejectFollower (url: string, token: string, follower: string, statusCod
 function getFollowingListPaginationAndSort (url: string, start: number, count: number, sort: string, search?: string) {
   const path = '/api/v1/server/following'
 
+  const query = {
+    start,
+    count,
+    sort,
+    search
+  }
+
   return request(url)
     .get(path)
-    .query({ start })
-    .query({ count })
-    .query({ sort })
-    .query({ search })
+    .query(query)
     .set('Accept', 'application/json')
     .expect(200)
     .expect('Content-Type', /json/)
diff --git a/shared/extra-utils/users/users.ts b/shared/extra-utils/users/users.ts
index c00da19e0..0f2f0ae15 100644
--- a/shared/extra-utils/users/users.ts
+++ b/shared/extra-utils/users/users.ts
@@ -160,12 +160,16 @@ function getUsersList (url: string, accessToken: string) {
 function getUsersListPaginationAndSort (url: string, accessToken: string, start: number, count: number, sort: string, search?: string) {
   const path = '/api/v1/users'
 
+  const query = {
+    start,
+    count,
+    sort,
+    search
+  }
+
   return request(url)
           .get(path)
-          .query({ start })
-          .query({ count })
-          .query({ sort })
-          .query({ search })
+          .query(query)
           .set('Accept', 'application/json')
           .set('Authorization', 'Bearer ' + accessToken)
           .expect(200)