aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-09-21 14:08:14 +0200
committerChocobozzz <me@florianbigard.com>2018-09-24 13:38:38 +0200
commitd1a63fc7ac58a1db00d8ca4f43aadba02eb9b084 (patch)
treebe1c7f15a3403d59749571dcd1206bdc8dab94c6 /client
parent6937f26a5e8b17c7a27f267bce2682ab01611f2f (diff)
downloadPeerTube-d1a63fc7ac58a1db00d8ca4f43aadba02eb9b084.tar.gz
PeerTube-d1a63fc7ac58a1db00d8ca4f43aadba02eb9b084.tar.zst
PeerTube-d1a63fc7ac58a1db00d8ca4f43aadba02eb9b084.zip
Fix videos list user NSFW policy
Diffstat (limited to 'client')
-rw-r--r--client/src/app/shared/video/video-miniature.component.ts8
-rw-r--r--client/webpack/webpack.video-embed.js2
2 files changed, 5 insertions, 5 deletions
diff --git a/client/src/app/shared/video/video-miniature.component.ts b/client/src/app/shared/video/video-miniature.component.ts
index 27098f4b4..7e8692b0b 100644
--- a/client/src/app/shared/video/video-miniature.component.ts
+++ b/client/src/app/shared/video/video-miniature.component.ts
@@ -16,12 +16,14 @@ export class VideoMiniatureComponent implements OnInit {
16 @Input() video: Video 16 @Input() video: Video
17 @Input() ownerDisplayType: OwnerDisplayType = 'account' 17 @Input() ownerDisplayType: OwnerDisplayType = 'account'
18 18
19 isVideoBlur: boolean
20
21 private ownerDisplayTypeChosen: 'account' | 'videoChannel' 19 private ownerDisplayTypeChosen: 'account' | 'videoChannel'
22 20
23 constructor (private serverService: ServerService) { } 21 constructor (private serverService: ServerService) { }
24 22
23 get isVideoBlur () {
24 return this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())
25 }
26
25 ngOnInit () { 27 ngOnInit () {
26 if (this.ownerDisplayType === 'account' || this.ownerDisplayType === 'videoChannel') { 28 if (this.ownerDisplayType === 'account' || this.ownerDisplayType === 'videoChannel') {
27 this.ownerDisplayTypeChosen = this.ownerDisplayType 29 this.ownerDisplayTypeChosen = this.ownerDisplayType
@@ -38,8 +40,6 @@ export class VideoMiniatureComponent implements OnInit {
38 } else { 40 } else {
39 this.ownerDisplayTypeChosen = 'videoChannel' 41 this.ownerDisplayTypeChosen = 'videoChannel'
40 } 42 }
41
42 this.isVideoBlur = this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())
43 } 43 }
44 44
45 displayOwnerAccount () { 45 displayOwnerAccount () {
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js
index 12ab6a639..909048cca 100644
--- a/client/webpack/webpack.video-embed.js
+++ b/client/webpack/webpack.video-embed.js
@@ -39,7 +39,7 @@ module.exports = function () {
39 publicPath: '/client/standalone/videos/' 39 publicPath: '/client/standalone/videos/'
40 }, 40 },
41 41
42 // devtool: 'source-map', 42 devtool: process.env.NODE_ENV === 'production' ? false : 'source-map',
43 43
44 module: { 44 module: {
45 45