diff options
author | Chocobozzz <me@florianbigard.com> | 2020-06-16 11:00:35 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-06-16 11:26:46 +0200 |
commit | 5c20a45518c3afc40c9494cad4a78def92e5e288 (patch) | |
tree | d4f6894b37394f3a40e6c58d34012bc55c05f55e /client/src/app/videos/video-list | |
parent | 64e0f8cf12c804a7a2fa582fd954f686cea9a45b (diff) | |
download | PeerTube-5c20a45518c3afc40c9494cad4a78def92e5e288.tar.gz PeerTube-5c20a45518c3afc40c9494cad4a78def92e5e288.tar.zst PeerTube-5c20a45518c3afc40c9494cad4a78def92e5e288.zip |
Fix anonymous nsfw policy
Diffstat (limited to 'client/src/app/videos/video-list')
6 files changed, 25 insertions, 18 deletions
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/videos/video-list/video-local.component.ts index 757b0e498..960523cd7 100644 --- a/client/src/app/videos/video-list/video-local.component.ts +++ b/client/src/app/videos/video-list/video-local.component.ts | |||
@@ -24,7 +24,7 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On | |||
24 | sort = '-publishedAt' as VideoSortField | 24 | sort = '-publishedAt' as VideoSortField |
25 | filter: VideoFilter = 'local' | 25 | filter: VideoFilter = 'local' |
26 | 26 | ||
27 | useUserVideoLanguagePreferences = true | 27 | useUserVideoPreferences = true |
28 | 28 | ||
29 | constructor ( | 29 | constructor ( |
30 | protected i18n: I18n, | 30 | protected i18n: I18n, |
@@ -67,6 +67,7 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On | |||
67 | filter: this.filter, | 67 | filter: this.filter, |
68 | categoryOneOf: this.categoryOneOf, | 68 | categoryOneOf: this.categoryOneOf, |
69 | languageOneOf: this.languageOneOf, | 69 | languageOneOf: this.languageOneOf, |
70 | nsfwPolicy: this.nsfwPolicy, | ||
70 | skipCount: true | 71 | skipCount: true |
71 | } | 72 | } |
72 | 73 | ||
diff --git a/client/src/app/videos/video-list/video-most-liked.component.ts b/client/src/app/videos/video-list/video-most-liked.component.ts index b69fad05f..cc91a2330 100644 --- a/client/src/app/videos/video-list/video-most-liked.component.ts +++ b/client/src/app/videos/video-list/video-most-liked.component.ts | |||
@@ -21,7 +21,7 @@ export class VideoMostLikedComponent extends AbstractVideoList implements OnInit | |||
21 | titlePage: string | 21 | titlePage: string |
22 | defaultSort: VideoSortField = '-likes' | 22 | defaultSort: VideoSortField = '-likes' |
23 | 23 | ||
24 | useUserVideoLanguagePreferences = true | 24 | useUserVideoPreferences = true |
25 | 25 | ||
26 | constructor ( | 26 | constructor ( |
27 | protected i18n: I18n, | 27 | protected i18n: I18n, |
@@ -55,6 +55,7 @@ export class VideoMostLikedComponent extends AbstractVideoList implements OnInit | |||
55 | sort: this.sort, | 55 | sort: this.sort, |
56 | categoryOneOf: this.categoryOneOf, | 56 | categoryOneOf: this.categoryOneOf, |
57 | languageOneOf: this.languageOneOf, | 57 | languageOneOf: this.languageOneOf, |
58 | nsfwPolicy: this.nsfwPolicy, | ||
58 | skipCount: true | 59 | skipCount: true |
59 | } | 60 | } |
60 | 61 | ||
diff --git a/client/src/app/videos/video-list/video-overview.component.html b/client/src/app/videos/video-list/video-overview.component.html index 19d03b5c5..6de2fc292 100644 --- a/client/src/app/videos/video-list/video-overview.component.html +++ b/client/src/app/videos/video-list/video-overview.component.html | |||
@@ -14,7 +14,7 @@ | |||
14 | </h1> | 14 | </h1> |
15 | 15 | ||
16 | <div class="video-wrapper" *ngFor="let video of buildVideos(object.videos)"> | 16 | <div class="video-wrapper" *ngFor="let video of buildVideos(object.videos)"> |
17 | <my-video-miniature [video]="video" [fitWidth]="true" [user]="user" [displayVideoActions]="false"> | 17 | <my-video-miniature [video]="video" [fitWidth]="true" [user]="userMiniature" [displayVideoActions]="false"> |
18 | </my-video-miniature> | 18 | </my-video-miniature> |
19 | </div> | 19 | </div> |
20 | </div> | 20 | </div> |
@@ -25,7 +25,7 @@ | |||
25 | </h2> | 25 | </h2> |
26 | 26 | ||
27 | <div class="video-wrapper" *ngFor="let video of buildVideos(object.videos)"> | 27 | <div class="video-wrapper" *ngFor="let video of buildVideos(object.videos)"> |
28 | <my-video-miniature [video]="video" [fitWidth]="true" [user]="user" [displayVideoActions]="false"> | 28 | <my-video-miniature [video]="video" [fitWidth]="true" [user]="userMiniature" [displayVideoActions]="false"> |
29 | </my-video-miniature> | 29 | </my-video-miniature> |
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
@@ -40,7 +40,7 @@ | |||
40 | </div> | 40 | </div> |
41 | 41 | ||
42 | <div class="video-wrapper" *ngFor="let video of buildVideos(object.videos)"> | 42 | <div class="video-wrapper" *ngFor="let video of buildVideos(object.videos)"> |
43 | <my-video-miniature [video]="video" [fitWidth]="true" [user]="user" [displayVideoActions]="false"> | 43 | <my-video-miniature [video]="video" [fitWidth]="true" [user]="userMiniature" [displayVideoActions]="false"> |
44 | </my-video-miniature> | 44 | </my-video-miniature> |
45 | </div> | 45 | </div> |
46 | </div> | 46 | </div> |
diff --git a/client/src/app/videos/video-list/video-overview.component.ts b/client/src/app/videos/video-list/video-overview.component.ts index 101073949..8ff8400db 100644 --- a/client/src/app/videos/video-list/video-overview.component.ts +++ b/client/src/app/videos/video-list/video-overview.component.ts | |||
@@ -1,11 +1,11 @@ | |||
1 | import { Subject } from 'rxjs' | ||
1 | import { Component, OnInit } from '@angular/core' | 2 | import { Component, OnInit } from '@angular/core' |
2 | import { AuthService, Notifier } from '@app/core' | 3 | import { Notifier } from '@app/core' |
3 | import { I18n } from '@ngx-translate/i18n-polyfill' | 4 | import { User, UserService } from '@app/shared' |
4 | import { VideosOverview } from '@app/shared/overview/videos-overview.model' | 5 | import { ScreenService } from '@app/shared/misc/screen.service' |
5 | import { OverviewService } from '@app/shared/overview' | 6 | import { OverviewService } from '@app/shared/overview' |
7 | import { VideosOverview } from '@app/shared/overview/videos-overview.model' | ||
6 | import { Video } from '@app/shared/video/video.model' | 8 | import { Video } from '@app/shared/video/video.model' |
7 | import { ScreenService } from '@app/shared/misc/screen.service' | ||
8 | import { Subject } from 'rxjs' | ||
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-video-overview', | 11 | selector: 'my-video-overview', |
@@ -18,6 +18,8 @@ export class VideoOverviewComponent implements OnInit { | |||
18 | overviews: VideosOverview[] = [] | 18 | overviews: VideosOverview[] = [] |
19 | notResults = false | 19 | notResults = false |
20 | 20 | ||
21 | userMiniature: User | ||
22 | |||
21 | private loaded = false | 23 | private loaded = false |
22 | private currentPage = 1 | 24 | private currentPage = 1 |
23 | private maxPage = 20 | 25 | private maxPage = 20 |
@@ -25,19 +27,20 @@ export class VideoOverviewComponent implements OnInit { | |||
25 | private isLoading = false | 27 | private isLoading = false |
26 | 28 | ||
27 | constructor ( | 29 | constructor ( |
28 | private i18n: I18n, | ||
29 | private notifier: Notifier, | 30 | private notifier: Notifier, |
30 | private authService: AuthService, | 31 | private userService: UserService, |
31 | private overviewService: OverviewService, | 32 | private overviewService: OverviewService, |
32 | private screenService: ScreenService | 33 | private screenService: ScreenService |
33 | ) { } | 34 | ) { } |
34 | 35 | ||
35 | get user () { | ||
36 | return this.authService.getUser() | ||
37 | } | ||
38 | |||
39 | ngOnInit () { | 36 | ngOnInit () { |
40 | this.loadMoreResults() | 37 | this.loadMoreResults() |
38 | |||
39 | this.userService.getAnonymousOrLoggedUser() | ||
40 | .subscribe(user => this.userMiniature = user) | ||
41 | |||
42 | this.userService.listenAnonymousUpdate() | ||
43 | .subscribe(user => this.userMiniature = user) | ||
41 | } | 44 | } |
42 | 45 | ||
43 | buildVideoChannelBy (object: { videos: Video[] }) { | 46 | buildVideoChannelBy (object: { videos: Video[] }) { |
diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/videos/video-list/video-recently-added.component.ts index c1ddd4fd4..9f57a61e3 100644 --- a/client/src/app/videos/video-list/video-recently-added.component.ts +++ b/client/src/app/videos/video-list/video-recently-added.component.ts | |||
@@ -22,7 +22,7 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On | |||
22 | sort: VideoSortField = '-publishedAt' | 22 | sort: VideoSortField = '-publishedAt' |
23 | groupByDate = true | 23 | groupByDate = true |
24 | 24 | ||
25 | useUserVideoLanguagePreferences = true | 25 | useUserVideoPreferences = true |
26 | 26 | ||
27 | constructor ( | 27 | constructor ( |
28 | protected i18n: I18n, | 28 | protected i18n: I18n, |
@@ -59,6 +59,7 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On | |||
59 | sort: this.sort, | 59 | sort: this.sort, |
60 | categoryOneOf: this.categoryOneOf, | 60 | categoryOneOf: this.categoryOneOf, |
61 | languageOneOf: this.languageOneOf, | 61 | languageOneOf: this.languageOneOf, |
62 | nsfwPolicy: this.nsfwPolicy, | ||
62 | skipCount: true | 63 | skipCount: true |
63 | } | 64 | } |
64 | 65 | ||
diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index fbe052277..62e0f4e69 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts | |||
@@ -21,7 +21,7 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, | |||
21 | titlePage: string | 21 | titlePage: string |
22 | defaultSort: VideoSortField = '-trending' | 22 | defaultSort: VideoSortField = '-trending' |
23 | 23 | ||
24 | useUserVideoLanguagePreferences = true | 24 | useUserVideoPreferences = true |
25 | 25 | ||
26 | constructor ( | 26 | constructor ( |
27 | protected i18n: I18n, | 27 | protected i18n: I18n, |
@@ -72,6 +72,7 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, | |||
72 | sort: this.sort, | 72 | sort: this.sort, |
73 | categoryOneOf: this.categoryOneOf, | 73 | categoryOneOf: this.categoryOneOf, |
74 | languageOneOf: this.languageOneOf, | 74 | languageOneOf: this.languageOneOf, |
75 | nsfwPolicy: this.nsfwPolicy, | ||
75 | skipCount: true | 76 | skipCount: true |
76 | } | 77 | } |
77 | 78 | ||