diff options
Diffstat (limited to 'shared/models/users')
-rw-r--r-- | shared/models/users/user-notification.model.ts | 31 | ||||
-rw-r--r-- | shared/models/users/user-update.model.ts | 1 |
2 files changed, 15 insertions, 17 deletions
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index f41b6f534..186b62612 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts | |||
@@ -22,16 +22,23 @@ export interface VideoInfo { | |||
22 | name: string | 22 | name: string |
23 | } | 23 | } |
24 | 24 | ||
25 | export interface ActorInfo { | ||
26 | id: number | ||
27 | displayName: string | ||
28 | name: string | ||
29 | host: string | ||
30 | avatar?: { | ||
31 | path: string | ||
32 | } | ||
33 | } | ||
34 | |||
25 | export interface UserNotification { | 35 | export interface UserNotification { |
26 | id: number | 36 | id: number |
27 | type: UserNotificationType | 37 | type: UserNotificationType |
28 | read: boolean | 38 | read: boolean |
29 | 39 | ||
30 | video?: VideoInfo & { | 40 | video?: VideoInfo & { |
31 | channel: { | 41 | channel: ActorInfo |
32 | id: number | ||
33 | displayName: string | ||
34 | } | ||
35 | } | 42 | } |
36 | 43 | ||
37 | videoImport?: { | 44 | videoImport?: { |
@@ -45,10 +52,7 @@ export interface UserNotification { | |||
45 | comment?: { | 52 | comment?: { |
46 | id: number | 53 | id: number |
47 | threadId: number | 54 | threadId: number |
48 | account: { | 55 | account: ActorInfo |
49 | id: number | ||
50 | displayName: string | ||
51 | } | ||
52 | video: VideoInfo | 56 | video: VideoInfo |
53 | } | 57 | } |
54 | 58 | ||
@@ -62,18 +66,11 @@ export interface UserNotification { | |||
62 | video: VideoInfo | 66 | video: VideoInfo |
63 | } | 67 | } |
64 | 68 | ||
65 | account?: { | 69 | account?: ActorInfo |
66 | id: number | ||
67 | displayName: string | ||
68 | name: string | ||
69 | } | ||
70 | 70 | ||
71 | actorFollow?: { | 71 | actorFollow?: { |
72 | id: number | 72 | id: number |
73 | follower: { | 73 | follower: ActorInfo |
74 | name: string | ||
75 | displayName: string | ||
76 | } | ||
77 | following: { | 74 | following: { |
78 | type: 'account' | 'channel' | 75 | type: 'account' | 'channel' |
79 | name: string | 76 | name: string |
diff --git a/shared/models/users/user-update.model.ts b/shared/models/users/user-update.model.ts index abde51321..cd215bab3 100644 --- a/shared/models/users/user-update.model.ts +++ b/shared/models/users/user-update.model.ts | |||
@@ -1,6 +1,7 @@ | |||
1 | import { UserRole } from './user-role' | 1 | import { UserRole } from './user-role' |
2 | 2 | ||
3 | export interface UserUpdate { | 3 | export interface UserUpdate { |
4 | password?: string | ||
4 | email?: string | 5 | email?: string |
5 | emailVerified?: boolean | 6 | emailVerified?: boolean |
6 | videoQuota?: number | 7 | videoQuota?: number |