Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix search index thumbnails

Chocobozzz1a4f4e76fd5d
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 6332b404d3..7e61be97d3 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -155,6 +155,8 @@ export class Video implements VideoServerModel {
? hash.liveSchedules.map(schedule => ({ startAt: new Date(schedule.startAt.toString()) }))
: null
+ // Required for search index backward compatibility, as `thumbnails` was introduced in peertube 8.1
+ this.thumbnailUrl = hash.thumbnailUrl
this.thumbnails = hash.thumbnails
this.duration = hash.duration
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
index 6b2aa3fcd6..6de0ab725e 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
@@ -21,6 +21,7 @@ export type VideoThumbnailInput = Pick<
| 'userHistory'
| 'originallyPublishedAt'
| 'liveSchedules'
+ | 'thumbnailUrl'
>
@Component({
@@ -102,6 +103,9 @@ export class VideoThumbnailComponent implements OnChanges {
const video = this.video()
if (!video) return ''
+ // From search index, handle instances that do not have `thumbnails` introduced in peertube 8.1
+ if (!video.thumbnails) return video.thumbnailUrl
+
const computedStyle = window.getComputedStyle(this.el.nativeElement)
let width = this.widthPx()
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist.model.ts b/client/src/app/shared/shared-video-playlist/video-playlist.model.ts
index d5d468db90..383bcca515 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist.model.ts
+++ b/client/src/app/shared/shared-video-playlist/video-playlist.model.ts
@@ -74,6 +74,8 @@ export class VideoPlaylist implements ServerVideoPlaylist {
this.type = hash.type
+ // Required for search index backward compatibility, as `thumbnails` was introduced in peertube 8.1
+ this.thumbnailUrl = hash.thumbnailUrl
this.thumbnails = hash.thumbnails
this.createdAt = new Date(hash.createdAt)
@@ -99,6 +101,10 @@ export class VideoPlaylist implements ServerVideoPlaylist {
getThumbnailUrl (width: number) {
const defaultUrl = getAPIUrl() + '/client/assets/images/default-playlist.jpg'
+ if (!this.thumbnails) {
+ return this.thumbnailUrl || defaultUrl
+ }
+
return findAppropriateThumbnailFileUrl(this.thumbnails, width, '16:9') || defaultUrl
}
}