feature/ability to disable video history by default (#5728)

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / user-subscriptions.ts

diff --git a/server/middlewares/validators/user-subscriptions.ts b/server/middlewares/validators/user-subscriptions.ts
index d9e6aa66724236efe1277b4790f8f6f245bca231..d8d3fc28b8fb9e6756ab9bbb76071d414e44b5b4 100644 (file)
--- a/server/middlewares/validators/user-subscriptions.ts
+++ b/server/middlewares/validators/user-subscriptions.ts
@@ -1,9 +1,8 @@
 import express from 'express'
 import { body, param, query } from 'express-validator'
+import { arrayify } from '@shared/core-utils'
 import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
 import { areValidActorHandles, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
-import { toArray } from '../../helpers/custom-validators/misc'
-import { logger } from '../../helpers/logger'
 import { WEBSERVER } from '../../initializers/constants'
 import { ActorFollowModel } from '../../models/actor/actor-follow'
 import { areValidationErrors } from './shared'
@@ -14,8 +13,6 @@ const userSubscriptionListValidator = [
     .not().isEmpty(),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking userSubscriptionListValidator parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     return next()
@@ -27,8 +24,6 @@ const userSubscriptionAddValidator = [
     .custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking userSubscriptionAddValidator parameters', { parameters: req.body })
-
     if (areValidationErrors(req, res)) return
 
     return next()
@@ -37,12 +32,10 @@ const userSubscriptionAddValidator = [
 
 const areSubscriptionsExistValidator = [
   query('uris')
-    .customSanitizer(toArray)
+    .customSanitizer(arrayify)
     .custom(areValidActorHandles).withMessage('Should have a valid array of URIs'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking areSubscriptionsExistValidator parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     return next()
@@ -54,8 +47,6 @@ const userSubscriptionGetValidator = [
     .custom(isValidActorHandle),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking userSubscriptionGetValidator parameters', { parameters: req.params })
-
     if (areValidationErrors(req, res)) return
 
     let [ name, host ] = req.params.uri.split('@')
@@ -69,7 +60,7 @@ const userSubscriptionGetValidator = [
       state: 'accepted'
     })
 
-    if (!subscription || !subscription.ActorFollowing.VideoChannel) {
+    if (!subscription?.ActorFollowing.VideoChannel) {
       return res.fail({
         status: HttpStatusCode.NOT_FOUND_404,
         message: `Subscription ${req.params.uri} not found.`