aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-07-22 15:22:21 +0200
committerChocobozzz <me@florianbigard.com>2022-07-22 15:22:21 +0200
commitc8fa571f32b10c083fab07f28d2ef55895ef40af (patch)
treefd50f90cc7643333984ed3b19f6a06f2e9f54feb /client/src/app/shared
parenta77c5ff3622ab75d0c22241d0ef72053deaa7926 (diff)
downloadPeerTube-c8fa571f32b10c083fab07f28d2ef55895ef40af.tar.gz
PeerTube-c8fa571f32b10c083fab07f28d2ef55895ef40af.tar.zst
PeerTube-c8fa571f32b10c083fab07f28d2ef55895ef40af.zip
Clearer live session
Get the save replay setting when the session started to prevent inconsistent behaviour when the setting changed before the session was processed by the live ending job Display more information about the potential session replay in live modal information
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/shared-video-live/live-stream-information.component.html1
-rw-r--r--client/src/app/shared/shared-video-live/live-stream-information.component.ts7
-rw-r--r--client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts2
3 files changed, 9 insertions, 1 deletions
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html
index 99c7dbd4c..cf30c1ce1 100644
--- a/client/src/app/shared/shared-video-live/live-stream-information.component.html
+++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html
@@ -42,6 +42,7 @@
42 <span i18n>Started on {{ session.startDate | date:'medium' }}</span> 42 <span i18n>Started on {{ session.startDate | date:'medium' }}</span>
43 <span i18n *ngIf="session.endDate">Ended on {{ session.endDate | date:'medium' }}</span> 43 <span i18n *ngIf="session.endDate">Ended on {{ session.endDate | date:'medium' }}</span>
44 <a i18n *ngIf="session.replayVideo" [routerLink]="getVideoUrl(session.replayVideo)" target="_blank">Go to replay</a> 44 <a i18n *ngIf="session.replayVideo" [routerLink]="getVideoUrl(session.replayVideo)" target="_blank">Go to replay</a>
45 <span i18n *ngIf="isReplayBeingProcessed(session)">Replay is being processed...</span>
45 </div> 46 </div>
46 </div> 47 </div>
47 </div> 48 </div>
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.ts b/client/src/app/shared/shared-video-live/live-stream-information.component.ts
index c60f7fe2f..3dd59bb57 100644
--- a/client/src/app/shared/shared-video-live/live-stream-information.component.ts
+++ b/client/src/app/shared/shared-video-live/live-stream-information.component.ts
@@ -49,6 +49,13 @@ export class LiveStreamInformationComponent {
49 return errors[session.error] 49 return errors[session.error]
50 } 50 }
51 51
52 isReplayBeingProcessed (session: LiveVideoSession) {
53 // Running live
54 if (!session.endDate) return false
55
56 return session.saveReplay && !session.endingProcessed
57 }
58
52 private loadLiveInfo (video: Video) { 59 private loadLiveInfo (video: Video) {
53 this.liveVideoService.getVideoLive(video.id) 60 this.liveVideoService.getVideoLive(video.id)
54 .subscribe(live => this.live = live) 61 .subscribe(live => this.live = live)
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index ed6a4afc0..56527ddfa 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -230,7 +230,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
230 230
231 let message = $localize`Do you really want to delete ${this.video.name}?` 231 let message = $localize`Do you really want to delete ${this.video.name}?`
232 if (this.video.isLive) { 232 if (this.video.isLive) {
233 message += ' ' + $localize`The live stream will be automatically terminated.` 233 message += ' ' + $localize`The live stream will be automatically terminated and replays won't be saved.`
234 } 234 }
235 235
236 const res = await this.confirmService.confirm(message, $localize`Delete ${this.video.name}`) 236 const res = await this.confirmService.confirm(message, $localize`Delete ${this.video.name}`)