diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-14 10:57:56 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:51 +0100 |
commit | e34c85e527100c0b5c44567bd951e95be41b8d7e (patch) | |
tree | 39697c5a4dda2c2e07142a8522538db783fce2fd /server/models/account/user.ts | |
parent | 1e1265b36c09df1465aa2b4866815c957b6a532e (diff) | |
download | PeerTube-e34c85e527100c0b5c44567bd951e95be41b8d7e.tar.gz PeerTube-e34c85e527100c0b5c44567bd951e95be41b8d7e.tar.zst PeerTube-e34c85e527100c0b5c44567bd951e95be41b8d7e.zip |
Fix issues on server start
Diffstat (limited to 'server/models/account/user.ts')
-rw-r--r-- | server/models/account/user.ts | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 7390baf91..8f7c9b013 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts | |||
@@ -1,23 +1,16 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | 2 | import { hasUserRight, USER_ROLE_LABELS, UserRight } from '../../../shared' | |
3 | import { getSort, addMethodsToModel } from '../utils' | ||
4 | import { | 3 | import { |
5 | cryptPassword, | ||
6 | comparePassword, | 4 | comparePassword, |
5 | cryptPassword, | ||
6 | isUserDisplayNSFWValid, | ||
7 | isUserPasswordValid, | 7 | isUserPasswordValid, |
8 | isUserRoleValid, | ||
8 | isUserUsernameValid, | 9 | isUserUsernameValid, |
9 | isUserDisplayNSFWValid, | 10 | isUserVideoQuotaValid |
10 | isUserVideoQuotaValid, | ||
11 | isUserRoleValid | ||
12 | } from '../../helpers' | 11 | } from '../../helpers' |
13 | import { UserRight, USER_ROLE_LABELS, hasUserRight } from '../../../shared' | 12 | import { addMethodsToModel, getSort } from '../utils' |
14 | 13 | import { UserAttributes, UserInstance, UserMethods } from './user-interface' | |
15 | import { | ||
16 | UserInstance, | ||
17 | UserAttributes, | ||
18 | |||
19 | UserMethods | ||
20 | } from './user-interface' | ||
21 | 14 | ||
22 | let User: Sequelize.Model<UserInstance, UserAttributes> | 15 | let User: Sequelize.Model<UserInstance, UserAttributes> |
23 | let isPasswordMatch: UserMethods.IsPasswordMatch | 16 | let isPasswordMatch: UserMethods.IsPasswordMatch |