Skip to content

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

Fix subscription leak

Chocobozzz9d30c8c03285
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
index 3ccdfade35..fa21b692cf 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
@@ -3,6 +3,7 @@ import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
+ DestroyRef,
OnInit,
booleanAttribute,
inject,
@@ -26,6 +27,7 @@ import { VideoThumbnailComponent } from '../shared-thumbnail/video-thumbnail.com
import { VideoPlaylistService } from '../shared-video-playlist/video-playlist.service'
import { VideoViewsCounterComponent } from '../shared-video/video-views-counter.component'
import { VideoActionsDisplayType, VideoActionsDropdownComponent } from './video-actions-dropdown.component'
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
export type MiniatureDisplayOptions = {
date?: boolean
@@ -57,6 +59,7 @@ export type MiniatureDisplayOptions = {
]
})
export class VideoMiniatureComponent implements OnInit {
+ private destroyRef = inject(DestroyRef)
private screenService = inject(ScreenService)
private serverService = inject(ServerService)
private authService = inject(AuthService)
@@ -333,8 +336,11 @@ export class VideoMiniatureComponent implements OnInit {
if (this.screenService.isInTouchScreen() || !this.displayVideoActions() || !this.isUserLoggedIn()) return
this.authService.userInformationLoaded
- .pipe(first(), switchMap(() => this.videoPlaylistService.listenToVideoPlaylistChange(this.video().id)))
- .subscribe(existResult => {
+ .pipe(
+ first(),
+ switchMap(() => this.videoPlaylistService.listenToVideoPlaylistChange(this.video().id)),
+ takeUntilDestroyed(this.destroyRef)
+ ).subscribe(existResult => {
const watchLaterPlaylist = this.authService.getUser().specialPlaylists.find(p => p.type === VideoPlaylistType.WATCH_LATER)
const existsInWatchLater = existResult.find(r => r.playlistId === watchLaterPlaylist.id)
this.inWatchLaterPlaylist = false