X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-live.ts;h=d2788ef4f7d16d2fbd3b2aa933f9065309a47374;hb=26e3e98ff0e222a9fb9226938ac6902af77921bd;hp=96c0bf7f770d1ce40f262b03d31de12387afdbbe;hpb=4ec52d04dcc5d664612331f8e08d7d90da990415;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-live.ts b/server/models/video/video-live.ts index 96c0bf7f7..d2788ef4f 100644 --- a/server/models/video/video-live.ts +++ b/server/models/video/video-live.ts @@ -2,7 +2,7 @@ import { AllowNull, BelongsTo, Column, CreatedAt, DataType, DefaultScope, Foreig import { CONFIG } from '@server/initializers/config' import { WEBSERVER } from '@server/initializers/constants' import { MVideoLive, MVideoLiveVideo } from '@server/types/models' -import { LiveVideo, LiveVideoLatencyMode, VideoPrivacy, VideoState } from '@shared/models' +import { LiveVideo, LiveVideoLatencyMode, VideoState } from '@shared/models' import { AttributesOnly } from '@shared/typescript-utils' import { VideoModel } from './video' import { VideoBlacklistModel } from './video-blacklist' @@ -101,21 +101,28 @@ export class VideoLiveModel extends Model return VideoLiveModel.findOne(query) } - toFormattedJSON (): LiveVideo { - let rtmpUrl: string = null - let rtmpsUrl: string = null + toFormattedJSON (canSeePrivateInformation: boolean): LiveVideo { + let privateInformation: Pick | {} = {} // If we don't have a stream key, it means this is a remote live so we don't specify the rtmp URL - if (this.streamKey) { - if (CONFIG.LIVE.RTMP.ENABLED) rtmpUrl = WEBSERVER.RTMP_URL - if (CONFIG.LIVE.RTMPS.ENABLED) rtmpsUrl = WEBSERVER.RTMPS_URL + // We also display these private information only to the live owne/moderators + if (this.streamKey && canSeePrivateInformation === true) { + privateInformation = { + streamKey: this.streamKey, + + rtmpUrl: CONFIG.LIVE.RTMP.ENABLED + ? WEBSERVER.RTMP_URL + : null, + + rtmpsUrl: CONFIG.LIVE.RTMPS.ENABLED + ? WEBSERVER.RTMPS_URL + : null + } } return { - rtmpUrl, - rtmpsUrl, + ...privateInformation, - streamKey: this.streamKey, permanentLive: this.permanentLive, saveReplay: this.saveReplay, latencyMode: this.latencyMode