From 92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 21 Feb 2019 14:06:10 +0100 Subject: Improve channel and account SEO --- server/helpers/custom-validators/accounts.ts | 8 +------- server/helpers/custom-validators/video-channels.ts | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'server/helpers') diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts index 191de1496..aad04fe93 100644 --- a/server/helpers/custom-validators/accounts.ts +++ b/server/helpers/custom-validators/accounts.ts @@ -38,13 +38,7 @@ function isLocalAccountNameExist (name: string, res: Response, sendNotFound = tr } function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) { - const [ accountName, host ] = nameWithDomain.split('@') - - let promise: Bluebird - if (!host || host === CONFIG.WEBSERVER.HOST) promise = AccountModel.loadLocalByName(accountName) - else promise = AccountModel.loadByNameAndHost(accountName, host) - - return isAccountExist(promise, res, sendNotFound) + return isAccountExist(AccountModel.loadByNameWithHost(nameWithDomain), res, sendNotFound) } async function isAccountExist (p: Bluebird, res: Response, sendNotFound: boolean) { diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts index f13519c1d..cbf150e53 100644 --- a/server/helpers/custom-validators/video-channels.ts +++ b/server/helpers/custom-validators/video-channels.ts @@ -38,11 +38,7 @@ async function isVideoChannelIdExist (id: string, res: express.Response) { } async function isVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response) { - const [ name, host ] = nameWithDomain.split('@') - let videoChannel: VideoChannelModel - - if (!host || host === CONFIG.WEBSERVER.HOST) videoChannel = await VideoChannelModel.loadLocalByNameAndPopulateAccount(name) - else videoChannel = await VideoChannelModel.loadByNameAndHostAndPopulateAccount(name, host) + const videoChannel = await VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithDomain) return processVideoChannelExist(videoChannel, res) } -- cgit v1.2.3