Cleanup

We must not expose private actor objects to clients
Just make 2 GET requests on channel/accounts instead

2 files changed, 9 insertions, 21 deletions

diff --git a/server/helpers/custom-validators/actor.ts b/server/helpers/custom-validators/actor.ts
deleted file mode 100644
index ad129e080..000000000
--- a/server/helpers/custom-validators/actor.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { isAccountNameValid } from './accounts'
-import { isVideoChannelNameValid } from './video-channels'
-
-function isActorNameValid (value: string) {
-  return isAccountNameValid(value) || isVideoChannelNameValid(value)
-}
-
-export {
-  isActorNameValid
-}
diff --git a/server/helpers/middlewares/video-channels.ts b/server/helpers/middlewares/video-channels.ts
index e30ea90b3..602555921 100644
--- a/server/helpers/middlewares/video-channels.ts
+++ b/server/helpers/middlewares/video-channels.ts
@@ -3,22 +3,22 @@ import { MChannelBannerAccountDefault } from '@server/types/models'
 import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 import { VideoChannelModel } from '../../models/video/video-channel'
 
-async function doesLocalVideoChannelNameExist (name: string, res: express.Response, sendNotFound = true) {
+async function doesLocalVideoChannelNameExist (name: string, res: express.Response) {
   const videoChannel = await VideoChannelModel.loadLocalByNameAndPopulateAccount(name)
 
-  return processVideoChannelExist(videoChannel, res, sendNotFound)
+  return processVideoChannelExist(videoChannel, res)
 }
 
-async function doesVideoChannelIdExist (id: number, res: express.Response, sendNotFound = true) {
+async function doesVideoChannelIdExist (id: number, res: express.Response) {
   const videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)
 
-  return processVideoChannelExist(videoChannel, res, sendNotFound)
+  return processVideoChannelExist(videoChannel, res)
 }
 
-async function doesVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response, sendNotFound = true) {
+async function doesVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response) {
   const videoChannel = await VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithDomain)
 
-  return processVideoChannelExist(videoChannel, res, sendNotFound)
+  return processVideoChannelExist(videoChannel, res)
 }
 
 // ---------------------------------------------------------------------------
@@ -29,12 +29,10 @@ export {
   doesVideoChannelNameWithHostExist
 }
 
-function processVideoChannelExist (videoChannel: MChannelBannerAccountDefault, res: express.Response, sendNotFound = true) {
+function processVideoChannelExist (videoChannel: MChannelBannerAccountDefault, res: express.Response) {
   if (!videoChannel) {
-    if (sendNotFound) {
-      res.status(HttpStatusCode.NOT_FOUND_404)
-        .json({ error: 'Video channel not found' })
-    }
+    res.status(HttpStatusCode.NOT_FOUND_404)
+      .json({ error: 'Video channel not found' })
 
     return false
   }