diff options
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/activitypub/activity.ts | 4 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 2 | ||||
-rw-r--r-- | shared/models/videos/live/live-video-event-payload.model.ts | 4 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index 548d8858e..d6284e283 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts | |||
@@ -6,7 +6,6 @@ import { DislikeObject } from './objects/dislike-object' | |||
6 | import { APObject } from './objects/object.model' | 6 | import { APObject } from './objects/object.model' |
7 | import { PlaylistObject } from './objects/playlist-object' | 7 | import { PlaylistObject } from './objects/playlist-object' |
8 | import { VideoCommentObject } from './objects/video-comment-object' | 8 | import { VideoCommentObject } from './objects/video-comment-object' |
9 | import { ViewObject } from './objects/view-object' | ||
10 | 9 | ||
11 | export type Activity = | 10 | export type Activity = |
12 | ActivityCreate | | 11 | ActivityCreate | |
@@ -53,7 +52,7 @@ export interface BaseActivity { | |||
53 | 52 | ||
54 | export interface ActivityCreate extends BaseActivity { | 53 | export interface ActivityCreate extends BaseActivity { |
55 | type: 'Create' | 54 | type: 'Create' |
56 | object: VideoObject | AbuseObject | ViewObject | DislikeObject | VideoCommentObject | CacheFileObject | PlaylistObject | 55 | object: VideoObject | AbuseObject | DislikeObject | VideoCommentObject | CacheFileObject | PlaylistObject |
57 | } | 56 | } |
58 | 57 | ||
59 | export interface ActivityUpdate extends BaseActivity { | 58 | export interface ActivityUpdate extends BaseActivity { |
@@ -100,6 +99,7 @@ export interface ActivityView extends BaseActivity { | |||
100 | type: 'View' | 99 | type: 'View' |
101 | actor: string | 100 | actor: string |
102 | object: APObject | 101 | object: APObject |
102 | expires: string | ||
103 | } | 103 | } |
104 | 104 | ||
105 | export interface ActivityDislike extends BaseActivity { | 105 | export interface ActivityDislike extends BaseActivity { |
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index 12e0fcf85..6da2753b3 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -14,7 +14,7 @@ export type JobType = | |||
14 | | 'video-transcoding' | 14 | | 'video-transcoding' |
15 | | 'email' | 15 | | 'email' |
16 | | 'video-import' | 16 | | 'video-import' |
17 | | 'videos-views' | 17 | | 'videos-views-stats' |
18 | | 'activitypub-refresher' | 18 | | 'activitypub-refresher' |
19 | | 'video-redundancy' | 19 | | 'video-redundancy' |
20 | | 'video-live-ending' | 20 | | 'video-live-ending' |
diff --git a/shared/models/videos/live/live-video-event-payload.model.ts b/shared/models/videos/live/live-video-event-payload.model.ts index 6cd7540e8..1a9ac512c 100644 --- a/shared/models/videos/live/live-video-event-payload.model.ts +++ b/shared/models/videos/live/live-video-event-payload.model.ts | |||
@@ -2,5 +2,9 @@ import { VideoState } from '../video-state.enum' | |||
2 | 2 | ||
3 | export interface LiveVideoEventPayload { | 3 | export interface LiveVideoEventPayload { |
4 | state?: VideoState | 4 | state?: VideoState |
5 | |||
6 | // FIXME: deprecated in 4.0 in favour of viewers | ||
5 | views?: number | 7 | views?: number |
8 | |||
9 | viewers?: number | ||
6 | } | 10 | } |
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 26cb595e7..8d223cded 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -39,6 +39,9 @@ export interface Video { | |||
39 | url: string | 39 | url: string |
40 | 40 | ||
41 | views: number | 41 | views: number |
42 | // If live | ||
43 | viewers?: number | ||
44 | |||
42 | likes: number | 45 | likes: number |
43 | dislikes: number | 46 | dislikes: number |
44 | nsfw: boolean | 47 | nsfw: boolean |