Merge branch 'develop' into shorter-URLs-channels-accounts

[github/Chocobozzz/PeerTube.git] / server / helpers / middlewares / video-channels.ts

diff --git a/server/helpers/middlewares/video-channels.ts b/server/helpers/middlewares/video-channels.ts
index 1595ecd94626af0ac05150dae72e9f1aed721d65..e30ea90b3628d39427c25a8514d279020eb6d3a9 100644 (file)
--- a/server/helpers/middlewares/video-channels.ts
+++ b/server/helpers/middlewares/video-channels.ts
@@ -1,23 +1,24 @@
 import * as express from 'express'
+import { MChannelBannerAccountDefault } from '@server/types/models'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 import { VideoChannelModel } from '../../models/video/video-channel'
-import { MChannelAccountDefault } from '@server/typings/models'
 
-async function doesLocalVideoChannelNameExist (name: string, res: express.Response) {
+async function doesLocalVideoChannelNameExist (name: string, res: express.Response, sendNotFound = true) {
   const videoChannel = await VideoChannelModel.loadLocalByNameAndPopulateAccount(name)
 
-  return processVideoChannelExist(videoChannel, res)
+  return processVideoChannelExist(videoChannel, res, sendNotFound)
 }
 
-async function doesVideoChannelIdExist (id: number, res: express.Response) {
+async function doesVideoChannelIdExist (id: number, res: express.Response, sendNotFound = true) {
   const videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)
 
-  return processVideoChannelExist(videoChannel, res)
+  return processVideoChannelExist(videoChannel, res, sendNotFound)
 }
 
-async function doesVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response) {
+async function doesVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response, sendNotFound = true) {
   const videoChannel = await VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithDomain)
 
-  return processVideoChannelExist(videoChannel, res)
+  return processVideoChannelExist(videoChannel, res, sendNotFound)
 }
 
 // ---------------------------------------------------------------------------
@@ -28,11 +29,12 @@ export {
   doesVideoChannelNameWithHostExist
 }
 
-function processVideoChannelExist (videoChannel: MChannelAccountDefault, res: express.Response) {
+function processVideoChannelExist (videoChannel: MChannelBannerAccountDefault, res: express.Response, sendNotFound = true) {
   if (!videoChannel) {
-    res.status(404)
-       .json({ error: 'Video channel not found' })
-       .end()
+    if (sendNotFound) {
+      res.status(HttpStatusCode.NOT_FOUND_404)
+        .json({ error: 'Video channel not found' })
+    }
 
     return false
   }