Merge branch 'release/3.1.0' 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 e3c4774149970c2525da1b50c5ab009d7abe9bff..f676669ea6c557d232af78997371a147490a39d8 100644 (file)
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -1,53 +1,22 @@
-import * as Bluebird from 'bluebird'
-import { Response } from 'express'
-import 'express-validator'
-import * as validator from 'validator'
-import { database as db } from '../../initializers'
-import { AccountInstance } from '../../models'
-import { isUserUsernameValid } from './users'
+import { isUserDescriptionValid, isUserUsernameValid } from './users'
+import { exists } from './misc'
 
 function isAccountNameValid (value: string) {
   return isUserUsernameValid(value)
 }
 
-function isAccountIdExist (id: number | string, res: Response) {
-  let promise: Bluebird<AccountInstance>
-
-  if (validator.isInt('' + id)) {
-    promise = db.Account.load(+id)
-  } else { // UUID
-    promise = db.Account.loadByUUID('' + id)
-  }
-
-  return isAccountExist(promise, res)
-}
-
-function isLocalAccountNameExist (name: string, res: Response) {
-  const promise = db.Account.loadLocalByName(name)
-
-  return isAccountExist(promise, res)
+function isAccountIdValid (value: string) {
+  return exists(value)
 }
 
-async function isAccountExist (p: Bluebird<AccountInstance>, res: Response) {
-  const account = await p
-
-  if (!account) {
-    res.status(404)
-      .send({ error: 'Account not found' })
-      .end()
-
-    return false
-  }
-
-  res.locals.account = account
-
-  return true
+function isAccountDescriptionValid (value: string) {
+  return isUserDescriptionValid(value)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  isAccountIdExist,
-  isLocalAccountNameExist,
+  isAccountIdValid,
+  isAccountDescriptionValid,
   isAccountNameValid
 }