X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-live.ts;h=cb4a9b8968e87954da0cadd6e91e8aef241d1ee5;hb=9a320a06b663a2e02c3156a07135f75f9e987b11;hp=345918cb9d6e0dad4b5b8848ecad9e46d54d7750;hpb=b5b687550d8ef8beafdf706e45d6556fb5f4c876;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-live.ts b/server/models/video/video-live.ts index 345918cb9..cb4a9b896 100644 --- a/server/models/video/video-live.ts +++ b/server/models/video/video-live.ts @@ -28,7 +28,7 @@ import { VideoBlacklistModel } from './video-blacklist' } ] }) -export class VideoLiveModel extends Model { +export class VideoLiveModel extends Model { @AllowNull(true) @Column(DataType.STRING) @@ -38,6 +38,10 @@ export class VideoLiveModel extends Model { @Column saveReplay: boolean + @AllowNull(false) + @Column + permanentLive: boolean + @CreatedAt createdAt: Date @@ -93,8 +97,13 @@ export class VideoLiveModel extends Model { toFormattedJSON (): LiveVideo { return { - rtmpUrl: WEBSERVER.RTMP_URL, + // If we don't have a stream key, it means this is a remote live so we don't specify the rtmp URL + rtmpUrl: this.streamKey + ? WEBSERVER.RTMP_URL + : null, + streamKey: this.streamKey, + permanentLive: this.permanentLive, saveReplay: this.saveReplay } }