revamped README.md

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

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 2c70ff5f0b2e5ecbb0eb940710ba13babc1c1a3e..6507aa5b8b54a7396cb0d59dc149757f26d7ae62 100644 (file)
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,35 +1,21 @@
-import 'express-validator'
 import * as express from 'express'
+import 'express-validator'
+import { SortType } from '../models/utils'
 
-import { SortType } from '../helpers'
-import { database } from '../initializers'
-
-function setPodsSort (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 setVideoAbusesSort (req: express.Request, res: express.Response, next: express.NextFunction) {
+function setDefaultSort (req: express.Request, res: express.Response, next: express.NextFunction) {
   if (!req.query.sort) req.query.sort = '-createdAt'
 
   return next()
 }
 
-function setVideosSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
+function setDefaultSearchSort (req: express.Request, res: express.Response, next: express.NextFunction) {
+  if (!req.query.sort) req.query.sort = '-match'
 
   return next()
 }
 
 function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  let newSort: SortType = { sortModel: undefined, sortValue: undefined }
+  let newSort: SortType = { sortModel: undefined, sortValue: '' }
 
   if (!req.query.sort) req.query.sort = '-createdAt'
 
@@ -39,7 +25,7 @@ function setBlacklistSort (req: express.Request, res: express.Response, next: ex
     // If we want to sort onto the BlacklistedVideos relation, we won't specify it in the query parameter ...
     newSort.sortModel = undefined
   } else {
-    newSort.sortModel = database.Video
+    newSort.sortModel = 'Video'
   }
 
   newSort.sortValue = req.query.sort
@@ -52,9 +38,7 @@ function setBlacklistSort (req: express.Request, res: express.Response, next: ex
 // ---------------------------------------------------------------------------
 
 export {
-  setPodsSort,
-  setUsersSort,
-  setVideoAbusesSort,
-  setVideosSort,
+  setDefaultSort,
+  setDefaultSearchSort,
   setBlacklistSort
 }