Merge remote-tracking branch 'origin/pr/1785' into develop

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / accounts.ts

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index 00dea9039d53f0a3e9a26c8a8060f1ce58de363c..146c7708e2168967430cf9ffb6dd746985849a8c 100644 (file)
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -18,7 +18,7 @@ function isAccountDescriptionValid (value: string) {
   return isUserDescriptionValid(value)
 }
 
-function isAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
+function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
   let promise: Bluebird<AccountModel>
 
   if (validator.isInt('' + id)) {
@@ -27,26 +27,20 @@ function isAccountIdExist (id: number | string, res: Response, sendNotFound = tr
     promise = AccountModel.loadByUUID('' + id)
   }
 
-  return isAccountExist(promise, res, sendNotFound)
+  return doesAccountExist(promise, res, sendNotFound)
 }
 
-function isLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
+function doesLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
   const promise = AccountModel.loadLocalByName(name)
 
-  return isAccountExist(promise, res, sendNotFound)
+  return doesAccountExist(promise, res, sendNotFound)
 }
 
-function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
-  const [ accountName, host ] = nameWithDomain.split('@')
-
-  let promise: Bluebird<AccountModel>
-  if (!host) promise = AccountModel.loadLocalByName(accountName)
-  else promise = AccountModel.loadLocalByNameAndHost(accountName, host)
-
-  return isAccountExist(promise, res, sendNotFound)
+function doesAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
+  return doesAccountExist(AccountModel.loadByNameWithHost(nameWithDomain), res, sendNotFound)
 }
 
-async function isAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
+async function doesAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
   const account = await p
 
   if (!account) {
@@ -68,9 +62,9 @@ async function isAccountExist (p: Bluebird<AccountModel>, res: Response, sendNot
 
 export {
   isAccountIdValid,
-  isAccountIdExist,
-  isLocalAccountNameExist,
+  doesAccountIdExist,
+  doesLocalAccountNameExist,
   isAccountDescriptionValid,
-  isAccountNameWithHostExist,
+  doesAccountNameWithHostExist,
   isAccountNameValid
 }