1 files changed, 26 insertions, 1 deletions

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 632b2fae4..687ce097b 100644
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,6 +1,9 @@
 import 'express-validator'
 import * as express from 'express'
 
+import { SortType } from '../helpers'
+import { database } from '../initializers'
+
 function setUsersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
   if (!req.query.sort) req.query.sort = '-createdAt'
 
@@ -19,10 +22,32 @@ function setVideosSort (req: express.Request, res: express.Response, next: expre
   return next()
 }
 
+function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) {
+  let newSort: SortType = { sortModel: undefined, sortValue: undefined }
+
+  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 ...
+    newSort.sortModel = undefined
+  } else {
+    newSort.sortModel = database.Video
+  }
+
+  newSort.sortValue = req.query.sort
+
+  req.query.sort = newSort
+
+  return next()
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   setUsersSort,
   setVideoAbusesSort,
-  setVideosSort
+  setVideosSort,
+  setBlacklistSort
 }