X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fsort.ts;h=77a532276d26de286b44ccb7c8700d82a4270504;hb=77448fd31c140d87bd8fc60b83f94e5eba2ab682;hp=632b2fae4158fd2bbfa0ff18e4dbb23844f9d0ca;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 632b2fae4..77a532276 100644
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,28 +1,29 @@
-import 'express-validator'
-import * as express from 'express'
+import express from 'express'
 
-function setUsersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
+const setDefaultSort = setDefaultSortFactory('-createdAt')
+const setDefaultVideosSort = setDefaultSortFactory('-publishedAt')
 
-  return next()
-}
-
-function setVideoAbusesSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
+const setDefaultVideoRedundanciesSort = setDefaultSortFactory('name')
 
-  return next()
-}
+const setDefaultSearchSort = setDefaultSortFactory('-match')
+const setBlacklistSort = setDefaultSortFactory('-createdAt')
 
-function setVideosSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
+// ---------------------------------------------------------------------------
 
-  return next()
+export {
+  setDefaultSort,
+  setDefaultSearchSort,
+  setDefaultVideosSort,
+  setDefaultVideoRedundanciesSort,
+  setBlacklistSort
 }
 
 // ---------------------------------------------------------------------------
 
-export {
-  setUsersSort,
-  setVideoAbusesSort,
-  setVideosSort
+function setDefaultSortFactory (sort: string) {
+  return (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (!req.query.sort) req.query.sort = sort
+
+    return next()
+  }
 }