1 files changed, 11 insertions, 0 deletions

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index a46ffc162..cc8641d6b 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -31,6 +31,16 @@ function isLocalAccountNameExist (name: string, res: Response) {
   return isAccountExist(promise, res)
 }
 
+function isAccountNameWithHostExist (nameWithDomain: string, res: Response) {
+  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)
+}
+
 async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
   const account = await p
 
@@ -53,5 +63,6 @@ export {
   isAccountIdExist,
   isLocalAccountNameExist,
   isAccountDescriptionValid,
+  isAccountNameWithHostExist,
   isAccountNameValid
 }