aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/models/actors/actor.model.ts2
-rw-r--r--shared/models/users/user-notification.model.ts30
-rw-r--r--shared/models/videos/video.model.ts4
3 files changed, 16 insertions, 20 deletions
diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts
index 6b3b1b47c..a3953874d 100644
--- a/shared/models/actors/actor.model.ts
+++ b/shared/models/actors/actor.model.ts
@@ -10,5 +10,5 @@ export interface Actor {
10 followersCount: number 10 followersCount: number
11 createdAt: Date | string 11 createdAt: Date | string
12 updatedAt: Date | string 12 updatedAt: Date | string
13 avatar: Avatar 13 avatar?: Avatar
14} 14}
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index f41b6f534..eaeb422df 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -22,16 +22,22 @@ export interface VideoInfo {
22 name: string 22 name: string
23} 23}
24 24
25export interface ActorInfo {
26 id: number
27 displayName: string
28 name: string
29 avatar?: {
30 path: string
31 }
32}
33
25export interface UserNotification { 34export interface UserNotification {
26 id: number 35 id: number
27 type: UserNotificationType 36 type: UserNotificationType
28 read: boolean 37 read: boolean
29 38
30 video?: VideoInfo & { 39 video?: VideoInfo & {
31 channel: { 40 channel: ActorInfo
32 id: number
33 displayName: string
34 }
35 } 41 }
36 42
37 videoImport?: { 43 videoImport?: {
@@ -45,10 +51,7 @@ export interface UserNotification {
45 comment?: { 51 comment?: {
46 id: number 52 id: number
47 threadId: number 53 threadId: number
48 account: { 54 account: ActorInfo
49 id: number
50 displayName: string
51 }
52 video: VideoInfo 55 video: VideoInfo
53 } 56 }
54 57
@@ -62,18 +65,11 @@ export interface UserNotification {
62 video: VideoInfo 65 video: VideoInfo
63 } 66 }
64 67
65 account?: { 68 account?: ActorInfo
66 id: number
67 displayName: string
68 name: string
69 }
70 69
71 actorFollow?: { 70 actorFollow?: {
72 id: number 71 id: number
73 follower: { 72 follower: ActorInfo
74 name: string
75 displayName: string
76 }
77 following: { 73 following: {
78 type: 'account' | 'channel' 74 type: 'account' | 'channel'
79 name: string 75 name: string
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 4a9fa58b1..022876a0b 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -24,7 +24,7 @@ export interface VideoChannelAttribute {
24 displayName: string 24 displayName: string
25 url: string 25 url: string
26 host: string 26 host: string
27 avatar: Avatar 27 avatar?: Avatar
28} 28}
29 29
30export interface AccountAttribute { 30export interface AccountAttribute {
@@ -34,7 +34,7 @@ export interface AccountAttribute {
34 displayName: string 34 displayName: string
35 url: string 35 url: string
36 host: string 36 host: string
37 avatar: Avatar 37 avatar?: Avatar
38} 38}
39 39
40export interface Video { 40export interface Video {