Redirect to uuid video route after upload

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

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 91aa3e5b6b4c2ac38d7f1a330dd8ca9f36aac8f3..5d2a43accc019a8d83d860944936d4a6c82a7632 100644 (file)
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,16 +1,14 @@
-import 'express-validator'
 import * as express from 'express'
-
+import 'express-validator'
 import { SortType } from '../helpers'
-import { database } from '../initializers'
 
-function setPodsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
+function setUsersSort (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) {
+function setJobsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
   if (!req.query.sort) req.query.sort = '-createdAt'
 
   return next()
@@ -34,6 +32,18 @@ function setVideosSort (req: express.Request, res: express.Response, next: expre
   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'
+
+  return next()
+}
+
 function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) {
   let newSort: SortType = { sortModel: undefined, sortValue: undefined }
 
@@ -45,7 +55,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
@@ -58,10 +68,12 @@ function setBlacklistSort (req: express.Request, res: express.Response, next: ex
 // ---------------------------------------------------------------------------
 
 export {
-  setPodsSort,
   setUsersSort,
   setVideoAbusesSort,
   setVideoChannelsSort,
   setVideosSort,
-  setBlacklistSort
+  setBlacklistSort,
+  setFollowersSort,
+  setFollowingSort,
+  setJobsSort
 }