diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
commit | fada8d75550dc7365f7e18ee1569b9406251d660 (patch) | |
tree | db9dc01c18693824f83fce5020f4c1f3ae7c0865 /shared/models/users | |
parent | 492fd28167f770d79a430fc57451b5a9e075d8e7 (diff) | |
parent | c2830fa8f84f61462098bf36add824f89436dfa9 (diff) | |
download | PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip |
Merge branch 'feature/design' into develop
Diffstat (limited to 'shared/models/users')
-rw-r--r-- | shared/models/users/user.model.ts | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts index a8012734c..4b17881e5 100644 --- a/shared/models/users/user.model.ts +++ b/shared/models/users/user.model.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { Account } from '../accounts' | ||
1 | import { VideoChannel } from '../videos/video-channel.model' | 2 | import { VideoChannel } from '../videos/video-channel.model' |
2 | import { UserRole } from './user-role' | 3 | import { UserRole } from './user-role' |
3 | 4 | ||
@@ -8,10 +9,7 @@ export interface User { | |||
8 | displayNSFW: boolean | 9 | displayNSFW: boolean |
9 | role: UserRole | 10 | role: UserRole |
10 | videoQuota: number | 11 | videoQuota: number |
11 | createdAt: Date, | 12 | createdAt: Date |
12 | account: { | 13 | account: Account |
13 | id: number | ||
14 | uuid: string | ||
15 | } | ||
16 | videoChannels?: VideoChannel[] | 14 | videoChannels?: VideoChannel[] |
17 | } | 15 | } |