From 010382b6037cff5d0ed16fa8b158691439fac9b7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Jun 2022 14:04:52 +0200 Subject: Completely remove best default trending algorithm --- .../src/app/+videos/video-list/videos-list-common-page.component.ts | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'client/src') diff --git a/client/src/app/+videos/video-list/videos-list-common-page.component.ts b/client/src/app/+videos/video-list/videos-list-common-page.component.ts index 72c7e1ef6..d2782036b 100644 --- a/client/src/app/+videos/video-list/videos-list-common-page.component.ts +++ b/client/src/app/+videos/video-list/videos-list-common-page.component.ts @@ -173,6 +173,10 @@ export class VideosListCommonPageComponent implements OnInit, OnDestroy, Disable case 'most-liked': return '-likes' + // We'll automatically apply "best" sort if using "hot" sort with a logged user + case 'best': + return '-hot' + default: return '-' + algorithm as VideoSortField } -- cgit v1.2.3 From 5a2f775a212bcb708f1756e3780c764cc232a910 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Jun 2022 14:18:28 +0200 Subject: Handle playlist without videos available --- .../+video-watch/shared/information/video-alert.component.html | 4 ++++ .../+video-watch/shared/information/video-alert.component.ts | 1 + .../shared/playlist/video-watch-playlist.component.html | 2 +- .../+video-watch/shared/playlist/video-watch-playlist.component.ts | 5 ++++- client/src/app/+videos/+video-watch/video-watch.component.html | 7 +++++-- client/src/app/+videos/+video-watch/video-watch.component.ts | 7 +++++++ 6 files changed, 22 insertions(+), 4 deletions(-) (limited to 'client/src') diff --git a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html index c6ffb1abd..be726c990 100644 --- a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html +++ b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html @@ -34,6 +34,10 @@ This live has ended. +
+ There are no videos available in this playlist. +
+
This video is blocked.
{{ video.blacklistedReason }} diff --git a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts index 79b56705f..ba79fabc8 100644 --- a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts +++ b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.ts @@ -9,6 +9,7 @@ import { VideoState } from '@shared/models' }) export class VideoAlertComponent { @Input() video: VideoDetails + @Input() noPlaylistVideoFound: boolean isVideoToTranscode () { return this.video && this.video.state.id === VideoState.TO_TRANSCODE diff --git a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html index da81d76d1..f5dd352a3 100644 --- a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html +++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html @@ -1,5 +1,5 @@
diff --git a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts index 879d296a7..ec85db0ff 100644 --- a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts +++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts @@ -18,6 +18,7 @@ export class VideoWatchPlaylistComponent { @Input() playlist: VideoPlaylist @Output() videoFound = new EventEmitter() + @Output() noVideoFound = new EventEmitter() playlistElements: VideoPlaylistElement[] = [] playlistPagination: ComponentPagination = { @@ -28,10 +29,11 @@ export class VideoWatchPlaylistComponent { autoPlayNextVideoPlaylist: boolean autoPlayNextVideoPlaylistSwitchText = '' + loopPlaylist: boolean loopPlaylistSwitchText = '' - noPlaylistVideos = false + noPlaylistVideos = false currentPlaylistPosition: number constructor ( @@ -100,6 +102,7 @@ export class VideoWatchPlaylistComponent { const firstAvailableVideo = this.playlistElements.find(e => !!e.video) if (!firstAvailableVideo) { this.noPlaylistVideos = true + this.noVideoFound.emit() return } diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 4c15ae3d7..1ea0cf6b8 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html @@ -11,12 +11,15 @@ Placeholder image
- +
- +
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 5fa31ec63..d05f08a5f 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts @@ -72,6 +72,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { playlist: VideoPlaylist = null remoteServerDown = false + noPlaylistVideoFound = false private nextVideoUUID = '' private nextVideoTitle = '' @@ -178,6 +179,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.loadVideo(videoId) } + onPlaylistNoVideoFound () { + this.noPlaylistVideoFound = true + } + isUserLoggedIn () { return this.authService.isLoggedIn() } @@ -286,6 +291,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private loadPlaylist (playlistId: string) { if (this.isSameElement(this.playlist, playlistId)) return + this.noPlaylistVideoFound = false + this.playlistService.getVideoPlaylist(playlistId) .subscribe({ next: playlist => { -- cgit v1.2.3