aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+videos/+video-watch
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-28 17:30:59 +0200
committerChocobozzz <chocobozzz@cpy.re>2021-06-29 14:56:35 +0200
commitd4a8e7a65f97bb3257facc13e1ae8ffdbad61ddb (patch)
treea4cb07318100031951c3dffc61f4f2cb95d2cbd0 /client/src/app/+videos/+video-watch
parent62ddc31a9e4b92d7d27898ccfc363f68ab044139 (diff)
downloadPeerTube-d4a8e7a65f97bb3257facc13e1ae8ffdbad61ddb.tar.gz
PeerTube-d4a8e7a65f97bb3257facc13e1ae8ffdbad61ddb.tar.zst
PeerTube-d4a8e7a65f97bb3257facc13e1ae8ffdbad61ddb.zip
Support short uuid for GET video/playlist
Diffstat (limited to 'client/src/app/+videos/+video-watch')
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.html4
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comments.component.ts2
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts26
3 files changed, 19 insertions, 13 deletions
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index 06548edc8..d8b944b35 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
@@ -20,7 +20,7 @@
20 </a> 20 </a>
21 </div> 21 </div>
22 22
23 <a [routerLink]="['/w', video.uuid, { 'threadId': comment.threadId }]" class="comment-date" [title]="comment.createdAt"> 23 <a [routerLink]="['/w', video.shortUUID, { 'threadId': comment.threadId }]" class="comment-date" [title]="comment.createdAt">
24 {{ comment.createdAt | myFromNow }} 24 {{ comment.createdAt | myFromNow }}
25 </a> 25 </a>
26 </div> 26 </div>
@@ -45,7 +45,7 @@
45 <ng-container *ngIf="comment.isDeleted"> 45 <ng-container *ngIf="comment.isDeleted">
46 <div class="comment-account-date"> 46 <div class="comment-account-date">
47 <span class="comment-account" i18n>Deleted</span> 47 <span class="comment-account" i18n>Deleted</span>
48 <a [routerLink]="['/w', video.uuid, { 'threadId': comment.threadId }]" 48 <a [routerLink]="['/w', video.shortUUID, { 'threadId': comment.threadId }]"
49 class="comment-date">{{ comment.createdAt | myFromNow }}</a> 49 class="comment-date">{{ comment.createdAt | myFromNow }}</a>
50 </div> 50 </div>
51 51
diff --git a/client/src/app/+videos/+video-watch/comment/video-comments.component.ts b/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
index 210236b61..2c39e63fb 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
@@ -247,7 +247,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
247 this.componentPagination.totalItems = null 247 this.componentPagination.totalItems = null
248 this.totalNotDeletedComments = null 248 this.totalNotDeletedComments = null
249 249
250 this.syndicationItems = this.videoCommentService.getVideoCommentsFeeds(this.video.uuid) 250 this.syndicationItems = this.videoCommentService.getVideoCommentsFeeds(this.video)
251 this.loadMoreThreads() 251 this.loadMoreThreads()
252 } 252 }
253 } 253 }
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index a444dc51f..12b0baebe 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -312,7 +312,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
312 312
313 getVideoUrl () { 313 getVideoUrl () {
314 if (!this.video.url) { 314 if (!this.video.url) {
315 return this.video.originInstanceUrl + VideoDetails.buildClientUrl(this.video.uuid) 315 return this.video.originInstanceUrl + VideoDetails.buildWatchUrl(this.video)
316 } 316 }
317 return this.video.url 317 return this.video.url
318 } 318 }
@@ -415,7 +415,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
415 415
416 private loadVideo (videoId: string) { 416 private loadVideo (videoId: string) {
417 // Video did not change 417 // Video did not change
418 if (this.video && this.video.uuid === videoId) return 418 if (
419 this.video &&
420 (this.video.uuid === videoId || this.video.shortUUID === videoId)
421 ) return
419 422
420 if (this.player) this.player.pause() 423 if (this.player) this.player.pause()
421 424
@@ -489,7 +492,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
489 492
490 private loadPlaylist (playlistId: string) { 493 private loadPlaylist (playlistId: string) {
491 // Playlist did not change 494 // Playlist did not change
492 if (this.playlist && this.playlist.uuid === playlistId) return 495 if (
496 this.playlist &&
497 (this.playlist.uuid === playlistId || this.playlist.shortUUID === playlistId)
498 ) return
493 499
494 this.playlistService.getVideoPlaylist(playlistId) 500 this.playlistService.getVideoPlaylist(playlistId)
495 .pipe( 501 .pipe(
@@ -772,13 +778,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
772 778
773 private flushPlayer () { 779 private flushPlayer () {
774 // Remove player if it exists 780 // Remove player if it exists
775 if (this.player) { 781 if (!this.player) return
776 try { 782
777 this.player.dispose() 783 try {
778 this.player = undefined 784 this.player.dispose()
779 } catch (err) { 785 this.player = undefined
780 console.error('Cannot dispose player.', err) 786 } catch (err) {
781 } 787 console.error('Cannot dispose player.', err)
782 } 788 }
783 } 789 }
784 790