From a5cf76afa378aae81af2a9b0ce548e5d2582f832 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 25 Sep 2020 10:04:21 +0200 Subject: Add watch messages if live has not started --- shared/models/server/job.model.ts | 5 +++++ shared/models/videos/index.ts | 3 ++- shared/models/videos/live/index.ts | 3 +++ shared/models/videos/live/live-video-event-payload.model.ts | 5 +++++ shared/models/videos/live/live-video-event.type.ts | 1 + shared/models/videos/live/live-video.model.ts | 4 ++++ shared/models/videos/video-live.model.ts | 4 ---- 7 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 shared/models/videos/live/index.ts create mode 100644 shared/models/videos/live/live-video-event-payload.model.ts create mode 100644 shared/models/videos/live/live-video-event.type.ts create mode 100644 shared/models/videos/live/live-video.model.ts delete mode 100644 shared/models/videos/video-live.model.ts (limited to 'shared') diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index c643e6017..346b25607 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts @@ -16,6 +16,7 @@ export type JobType = | 'videos-views' | 'activitypub-refresher' | 'video-redundancy' + | 'video-live-ending' export interface Job { id: number @@ -126,3 +127,7 @@ export type VideoTranscodingPayload = | NewResolutionTranscodingPayload | OptimizeTranscodingPayload | MergeAudioTranscodingPayload + +export interface VideoLiveEndingPayload { + videoId: number +} diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 2a032a456..abf144f23 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts @@ -1,6 +1,7 @@ export * from './blacklist' export * from './caption' export * from './channel' +export * from './live' export * from './import' export * from './playlist' export * from './rate' @@ -19,7 +20,7 @@ export * from './video-create.model' export * from './video-file-metadata' export * from './video-file.model' -export * from './video-live.model' +export * from './live/live-video.model' export * from './video-privacy.enum' export * from './video-query.type' diff --git a/shared/models/videos/live/index.ts b/shared/models/videos/live/index.ts new file mode 100644 index 000000000..4f331738b --- /dev/null +++ b/shared/models/videos/live/index.ts @@ -0,0 +1,3 @@ +export * from './live-video-event-payload.model' +export * from './live-video-event.type' +export * from './live-video.model' diff --git a/shared/models/videos/live/live-video-event-payload.model.ts b/shared/models/videos/live/live-video-event-payload.model.ts new file mode 100644 index 000000000..f9038f4de --- /dev/null +++ b/shared/models/videos/live/live-video-event-payload.model.ts @@ -0,0 +1,5 @@ +import { VideoState } from '../video-state.enum' + +export interface LiveVideoEventPayload { + state: VideoState +} diff --git a/shared/models/videos/live/live-video-event.type.ts b/shared/models/videos/live/live-video-event.type.ts new file mode 100644 index 000000000..4d15899da --- /dev/null +++ b/shared/models/videos/live/live-video-event.type.ts @@ -0,0 +1 @@ +export type LiveVideoEventType = 'state-change' diff --git a/shared/models/videos/live/live-video.model.ts b/shared/models/videos/live/live-video.model.ts new file mode 100644 index 000000000..74abee96e --- /dev/null +++ b/shared/models/videos/live/live-video.model.ts @@ -0,0 +1,4 @@ +export interface LiveVideo { + rtmpUrl: string + streamKey: string +} diff --git a/shared/models/videos/video-live.model.ts b/shared/models/videos/video-live.model.ts deleted file mode 100644 index 2a834dc91..000000000 --- a/shared/models/videos/video-live.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface VideoLive { - rtmpUrl: string - streamKey: string -} -- cgit v1.2.3