From 3193ac2c3b0209b87c1347032f7bd21ea651d8e6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 28 Jul 2023 15:32:22 +0200 Subject: Refactor a little bit nsfwPolicyToParam --- .../recommendations/recent-videos-recommendation.service.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'client/src/app/+videos') diff --git a/client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts index 8f4594b25..ba0d30f3d 100644 --- a/client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts +++ b/client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts @@ -43,9 +43,14 @@ export class RecentVideosRecommendationService implements RecommendationService return this.userService.getAnonymousOrLoggedUser() .pipe( switchMap(user => { + const nsfw = user.nsfwPolicy + ? this.videos.nsfwPolicyToParam(user.nsfwPolicy) + : undefined + const defaultSubscription = this.videos.getVideos({ videoPagination: pagination, - sort: '-publishedAt' + sort: '-publishedAt', + nsfw }).pipe(map(v => v.data)) const searchIndexConfig = this.config.search.searchIndex @@ -60,9 +65,7 @@ export class RecentVideosRecommendationService implements RecommendationService tagsOneOf: recommendation.tags.join(','), sort: '-publishedAt', searchTarget: 'local', - nsfw: user.nsfwPolicy - ? this.videos.nsfwPolicyToParam(user.nsfwPolicy) - : undefined, + nsfw, excludeAlreadyWatched: user.id ? true : undefined -- cgit v1.2.3