diff options
author | Chocobozzz <me@florianbigard.com> | 2019-01-11 16:58:33 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-01-14 09:07:08 +0100 |
commit | 033bc0efc2ab2c517b4d7d53d09930b85f092b50 (patch) | |
tree | 7bc44c9a4af27e52d24a72a158a5f530bd5ae56b /client | |
parent | c32bf839c11557cac527ca5f181d1ce39fc80974 (diff) | |
download | PeerTube-033bc0efc2ab2c517b4d7d53d09930b85f092b50.tar.gz PeerTube-033bc0efc2ab2c517b4d7d53d09930b85f092b50.tar.zst PeerTube-033bc0efc2ab2c517b4d7d53d09930b85f092b50.zip |
Fix NSFW blur on search
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/search/search.component.html | 2 | ||||
-rw-r--r-- | client/src/app/search/search.component.ts | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 3a87ea1de..82a5f0f26 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html | |||
@@ -48,7 +48,7 @@ | |||
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div *ngIf="isVideo(result)" class="entry video"> | 50 | <div *ngIf="isVideo(result)" class="entry video"> |
51 | <my-video-thumbnail [video]="result"></my-video-thumbnail> | 51 | <my-video-thumbnail [video]="result" [nsfw]="isVideoBlur(result)"></my-video-thumbnail> |
52 | 52 | ||
53 | <div class="video-info"> | 53 | <div class="video-info"> |
54 | <a tabindex="-1" class="video-info-name" [routerLink]="['/videos/watch', result.uuid]" [attr.title]="result.name">{{ result.name }}</a> | 54 | <a tabindex="-1" class="video-info-name" [routerLink]="['/videos/watch', result.uuid]" [attr.title]="result.name">{{ result.name }}</a> |
diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index 474b72824..c4a4b1fde 100644 --- a/client/src/app/search/search.component.ts +++ b/client/src/app/search/search.component.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, OnDestroy, OnInit } from '@angular/core' | 1 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { ActivatedRoute, Router } from '@angular/router' | 2 | import { ActivatedRoute, Router } from '@angular/router' |
3 | import { AuthService, Notifier } from '@app/core' | 3 | import { AuthService, Notifier, ServerService } from '@app/core' |
4 | import { forkJoin, Subscription } from 'rxjs' | 4 | import { forkJoin, Subscription } from 'rxjs' |
5 | import { SearchService } from '@app/search/search.service' | 5 | import { SearchService } from '@app/search/search.service' |
6 | import { ComponentPagination } from '@app/shared/rest/component-pagination.model' | 6 | import { ComponentPagination } from '@app/shared/rest/component-pagination.model' |
@@ -41,7 +41,8 @@ export class SearchComponent implements OnInit, OnDestroy { | |||
41 | private metaService: MetaService, | 41 | private metaService: MetaService, |
42 | private notifier: Notifier, | 42 | private notifier: Notifier, |
43 | private searchService: SearchService, | 43 | private searchService: SearchService, |
44 | private authService: AuthService | 44 | private authService: AuthService, |
45 | private serverService: ServerService | ||
45 | ) { } | 46 | ) { } |
46 | 47 | ||
47 | ngOnInit () { | 48 | ngOnInit () { |
@@ -75,6 +76,10 @@ export class SearchComponent implements OnInit, OnDestroy { | |||
75 | if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe() | 76 | if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe() |
76 | } | 77 | } |
77 | 78 | ||
79 | isVideoBlur (video: Video) { | ||
80 | return video.isVideoNSFWForUser(this.authService.getUser(), this.serverService.getConfig()) | ||
81 | } | ||
82 | |||
78 | isVideoChannel (d: VideoChannel | Video): d is VideoChannel { | 83 | isVideoChannel (d: VideoChannel | Video): d is VideoChannel { |
79 | return d instanceof VideoChannel | 84 | return d instanceof VideoChannel |
80 | } | 85 | } |