Save replay of permanent live in client
This commit is contained in:
parent
98ebfa3950
commit
86c5229b4d
|
@ -30,9 +30,6 @@
|
||||||
inputName="liveAllowReplay" formControlName="allowReplay"
|
inputName="liveAllowReplay" formControlName="allowReplay"
|
||||||
i18n-labelText labelText="Allow your users to automatically publish a replay of their live"
|
i18n-labelText labelText="Allow your users to automatically publish a replay of their live"
|
||||||
>
|
>
|
||||||
<ng-container ngProjectAs="description" i18n>
|
|
||||||
If the user quota is reached, PeerTube will automatically terminate the live streaming
|
|
||||||
</ng-container>
|
|
||||||
</my-peertube-checkbox>
|
</my-peertube-checkbox>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -180,7 +180,6 @@ export class VideoEditComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
this.trackChannelChange()
|
this.trackChannelChange()
|
||||||
this.trackPrivacyChange()
|
this.trackPrivacyChange()
|
||||||
this.trackLivePermanentFieldChange()
|
|
||||||
|
|
||||||
this.formBuilt.emit()
|
this.formBuilt.emit()
|
||||||
}
|
}
|
||||||
|
@ -457,24 +456,6 @@ export class VideoEditComponent implements OnInit, OnDestroy {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private trackLivePermanentFieldChange () {
|
|
||||||
// We will update the "support" field depending on the channel
|
|
||||||
this.form.controls['permanentLive']
|
|
||||||
.valueChanges
|
|
||||||
.subscribe(
|
|
||||||
permanentLive => {
|
|
||||||
const saveReplayControl = this.form.controls['saveReplay']
|
|
||||||
|
|
||||||
if (permanentLive === true) {
|
|
||||||
saveReplayControl.setValue(false)
|
|
||||||
saveReplayControl.disable()
|
|
||||||
} else {
|
|
||||||
saveReplayControl.enable()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private updateSupportField (support: string) {
|
private updateSupportField (support: string) {
|
||||||
return this.form.patchValue({ support: support || '' })
|
return this.form.patchValue({ support: support || '' })
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
|
||||||
nsfw: this.serverConfig.instance.isNSFW,
|
nsfw: this.serverConfig.instance.isNSFW,
|
||||||
waitTranscoding: true,
|
waitTranscoding: true,
|
||||||
permanentLive: this.firstStepPermanentLive,
|
permanentLive: this.firstStepPermanentLive,
|
||||||
saveReplay: this.firstStepPermanentLive === false && this.isReplayAllowed(),
|
saveReplay: this.isReplayAllowed(),
|
||||||
channelId: this.firstStepChannelId
|
channelId: this.firstStepChannelId
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -170,10 +170,6 @@ const videoLiveUpdateValidator = [
|
||||||
|
|
||||||
const body: LiveVideoUpdate = req.body
|
const body: LiveVideoUpdate = req.body
|
||||||
|
|
||||||
if (body.permanentLive && body.saveReplay) {
|
|
||||||
return res.fail({ message: 'Cannot set this live as permanent while saving its replay' })
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasValidSaveReplay(body) !== true) {
|
if (hasValidSaveReplay(body) !== true) {
|
||||||
return res.fail({
|
return res.fail({
|
||||||
status: HttpStatusCode.FORBIDDEN_403,
|
status: HttpStatusCode.FORBIDDEN_403,
|
||||||
|
|
|
@ -414,12 +414,6 @@ describe('Test video lives API validator', function () {
|
||||||
await command.update({ videoId: videoIdNotLive, fields: {}, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
|
await command.update({ videoId: videoIdNotLive, fields: {}, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
|
||||||
})
|
})
|
||||||
|
|
||||||
it('Should fail with save replay and permanent live set to true', async function () {
|
|
||||||
const fields = { saveReplay: true, permanentLive: true }
|
|
||||||
|
|
||||||
await command.update({ videoId: video.id, fields, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
|
|
||||||
})
|
|
||||||
|
|
||||||
it('Should fail with bad latency setting', async function () {
|
it('Should fail with bad latency setting', async function () {
|
||||||
const fields = { latencyMode: 42 }
|
const fields = { latencyMode: 42 }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue