Merge branch 'develop' into shorter-URLs-channels-accounts

[github/Chocobozzz/PeerTube.git] / server / middlewares / sort.ts

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 4f524b49a613ec7e74be428bee21365a32260e71..0600ccd15567fd74f37f8fb0049330fafcbdd2bf 100644 (file)
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,70 +1,22 @@
 import * as express from 'express'
-import 'express-validator'
-import { SortType } from '../helpers/utils'
+import { SortType } from '../models/utils'
 
-function setAccountsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setUsersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setJobsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setVideoAbusesSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setVideoChannelsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
+const setDefaultSort = setDefaultSortFactory('-createdAt')
+const setDefaultVideosSort = setDefaultSortFactory('-publishedAt')
 
-function setVideosSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setVideoCommentThreadsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setFollowersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
-function setFollowingSort (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')
 
 function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  let newSort: SortType = { sortModel: undefined, sortValue: undefined }
+  const newSort: SortType = { sortModel: undefined, sortValue: '' }
 
   if (!req.query.sort) req.query.sort = '-createdAt'
 
   // Set model we want to sort onto
   if (req.query.sort === '-createdAt' || req.query.sort === 'createdAt' ||
       req.query.sort === '-id' || req.query.sort === 'id') {
-    // If we want to sort onto the BlacklistedVideos relation, we won't specify it in the query parameter ...
+    // If we want to sort onto the BlacklistedVideos relation, we won't specify it in the query parameter...
     newSort.sortModel = undefined
   } else {
     newSort.sortModel = 'Video'
@@ -80,14 +32,19 @@ function setBlacklistSort (req: express.Request, res: express.Response, next: ex
 // ---------------------------------------------------------------------------
 
 export {
-  setUsersSort,
-  setVideoAbusesSort,
-  setVideoChannelsSort,
-  setVideosSort,
-  setBlacklistSort,
-  setFollowersSort,
-  setFollowingSort,
-  setJobsSort,
-  setVideoCommentThreadsSort,
-  setAccountsSort
+  setDefaultSort,
+  setDefaultSearchSort,
+  setDefaultVideosSort,
+  setDefaultVideoRedundanciesSort,
+  setBlacklistSort
+}
+
+// ---------------------------------------------------------------------------
+
+function setDefaultSortFactory (sort: string) {
+  return (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (!req.query.sort) req.query.sort = sort
+
+    return next()
+  }
 }