X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Faccounts.ts;h=8dc5d1f0d778fa7f2623d85a9861beeb3f4842d5;hb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;hp=e3c4774149970c2525da1b50c5ab009d7abe9bff;hpb=c893d4514e6ecbf282c7985fe5f82b8acd8a1137;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index e3c477414..8dc5d1f0d 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -2,8 +2,7 @@ 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 { AccountModel } from '../../models/account/account'
 import { isUserUsernameValid } from './users'
 
 function isAccountNameValid (value: string) {
@@ -11,24 +10,24 @@ function isAccountNameValid (value: string) {
 }
 
 function isAccountIdExist (id: number | string, res: Response) {
-  let promise: Bluebird<AccountInstance>
+  let promise: Bluebird<AccountModel>
 
   if (validator.isInt('' + id)) {
-    promise = db.Account.load(+id)
+    promise = AccountModel.load(+id)
   } else { // UUID
-    promise = db.Account.loadByUUID('' + id)
+    promise = AccountModel.loadByUUID('' + id)
   }
 
   return isAccountExist(promise, res)
 }
 
 function isLocalAccountNameExist (name: string, res: Response) {
-  const promise = db.Account.loadLocalByName(name)
+  const promise = AccountModel.loadLocalByName(name)
 
   return isAccountExist(promise, res)
 }
 
-async function isAccountExist (p: Bluebird<AccountInstance>, res: Response) {
+async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
   const account = await p
 
   if (!account) {