X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fsort.ts;h=3ba6684600e0e8613fcfa65e1b3a2955d64eba82;hb=c4c0c31144b2cb8b6ade1cc39d676bc00c08cabf;hp=227f309ad567576005fbd7b2527d6a20886c5da0;hpb=8a02bd0433b7101c5ea36e87a4edb63204d2adec;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts
index 227f309ad..3ba668460 100644
--- a/server/middlewares/validators/sort.ts
+++ b/server/middlewares/validators/sort.ts
@@ -1,43 +1,23 @@
-import { query } from 'express-validator/check'
-import * as express from 'express'
-
-import { checkErrors } from './utils'
-import { logger } from '../../helpers'
-import { SORTABLE_COLUMNS } from '../../initializers'
-
-// Initialize constants here for better performances
-const SORTABLE_PODS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.PODS)
-const SORTABLE_USERS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.USERS)
-const SORTABLE_VIDEO_ABUSES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_ABUSES)
-const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS)
-const SORTABLE_BLACKLISTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.BLACKLISTS)
-
-const podsSortValidator = checkSort(SORTABLE_PODS_COLUMNS)
-const usersSortValidator = checkSort(SORTABLE_USERS_COLUMNS)
-const videoAbusesSortValidator = checkSort(SORTABLE_VIDEO_ABUSES_COLUMNS)
-const videosSortValidator = checkSort(SORTABLE_VIDEOS_COLUMNS)
-const blacklistSortValidator = checkSort(SORTABLE_BLACKLISTS_COLUMNS)
+import express from 'express'
+import { query } from 'express-validator'
+import { logger } from '@server/helpers/logger'
+import { SORTABLE_COLUMNS } from '../../initializers/constants'
+import { areValidationErrors } from './shared'
 
-// ---------------------------------------------------------------------------
-
-export {
-  podsSortValidator,
-  usersSortValidator,
-  videoAbusesSortValidator,
-  videosSortValidator,
-  blacklistSortValidator
+function checkSortFactory (columns: string[], tags: string[] = []) {
+  return checkSort(createSortableColumns(columns), tags)
 }
 
-// ---------------------------------------------------------------------------
-
-function checkSort (sortableColumns: string[]) {
+function checkSort (sortableColumns: string[], tags: string[] = []) {
   return [
     query('sort').optional().isIn(sortableColumns).withMessage('Should have correct sortable column'),
 
     (req: express.Request, res: express.Response, next: express.NextFunction) => {
-      logger.debug('Checking sort parameters', { parameters: req.query })
+      logger.debug('Checking sort parameters', { parameters: req.query, tags })
 
-      checkErrors(req, res, next)
+      if (areValidationErrors(req, res)) return
+
+      return next()
     }
   ]
 }
@@ -47,3 +27,62 @@ function createSortableColumns (sortableColumns: string[]) {
 
   return sortableColumns.concat(sortableColumnDesc)
 }
+
+const usersSortValidator = checkSortFactory(SORTABLE_COLUMNS.USERS)
+const accountsSortValidator = checkSortFactory(SORTABLE_COLUMNS.ACCOUNTS)
+const jobsSortValidator = checkSortFactory(SORTABLE_COLUMNS.JOBS, [ 'jobs' ])
+const abusesSortValidator = checkSortFactory(SORTABLE_COLUMNS.ABUSES)
+const videosSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEOS)
+const videoImportsSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_IMPORTS)
+const videosSearchSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEOS_SEARCH)
+const videoChannelsSearchSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_CHANNELS_SEARCH)
+const videoPlaylistsSearchSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_PLAYLISTS_SEARCH)
+const videoCommentsValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_COMMENTS)
+const videoCommentThreadsSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_COMMENT_THREADS)
+const videoRatesSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_RATES)
+const blacklistSortValidator = checkSortFactory(SORTABLE_COLUMNS.BLACKLISTS)
+const videoChannelsSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_CHANNELS)
+const instanceFollowersSortValidator = checkSortFactory(SORTABLE_COLUMNS.INSTANCE_FOLLOWERS)
+const instanceFollowingSortValidator = checkSortFactory(SORTABLE_COLUMNS.INSTANCE_FOLLOWING)
+const userSubscriptionsSortValidator = checkSortFactory(SORTABLE_COLUMNS.USER_SUBSCRIPTIONS)
+const accountsBlocklistSortValidator = checkSortFactory(SORTABLE_COLUMNS.ACCOUNTS_BLOCKLIST)
+const serversBlocklistSortValidator = checkSortFactory(SORTABLE_COLUMNS.SERVERS_BLOCKLIST)
+const userNotificationsSortValidator = checkSortFactory(SORTABLE_COLUMNS.USER_NOTIFICATIONS)
+const videoPlaylistsSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_PLAYLISTS)
+const pluginsSortValidator = checkSortFactory(SORTABLE_COLUMNS.PLUGINS)
+const availablePluginsSortValidator = checkSortFactory(SORTABLE_COLUMNS.AVAILABLE_PLUGINS)
+const videoRedundanciesSortValidator = checkSortFactory(SORTABLE_COLUMNS.VIDEO_REDUNDANCIES)
+
+const accountsFollowersSortValidator = checkSortFactory(SORTABLE_COLUMNS.ACCOUNT_FOLLOWERS)
+const videoChannelsFollowersSortValidator = checkSortFactory(SORTABLE_COLUMNS.CHANNEL_FOLLOWERS)
+
+// ---------------------------------------------------------------------------
+
+export {
+  usersSortValidator,
+  abusesSortValidator,
+  videoChannelsSortValidator,
+  videoImportsSortValidator,
+  videoCommentsValidator,
+  videosSearchSortValidator,
+  videosSortValidator,
+  blacklistSortValidator,
+  accountsSortValidator,
+  instanceFollowersSortValidator,
+  instanceFollowingSortValidator,
+  jobsSortValidator,
+  videoCommentThreadsSortValidator,
+  videoRatesSortValidator,
+  userSubscriptionsSortValidator,
+  availablePluginsSortValidator,
+  videoChannelsSearchSortValidator,
+  accountsBlocklistSortValidator,
+  serversBlocklistSortValidator,
+  userNotificationsSortValidator,
+  videoPlaylistsSortValidator,
+  videoRedundanciesSortValidator,
+  videoPlaylistsSearchSortValidator,
+  accountsFollowersSortValidator,
+  videoChannelsFollowersSortValidator,
+  pluginsSortValidator
+}