aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
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 /server
parent6937f26a5e8b17c7a27f267bce2682ab01611f2f (diff)
downloadPeerTube-d1a63fc7ac58a1db00d8ca4f43aadba02eb9b084.tar.gz
PeerTube-d1a63fc7ac58a1db00d8ca4f43aadba02eb9b084.tar.zst
PeerTube-d1a63fc7ac58a1db00d8ca4f43aadba02eb9b084.zip
Fix videos list user NSFW policy
Diffstat (limited to 'server')
-rw-r--r--server/helpers/express-utils.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index 9cf8fbeac..8a9cee8c5 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -6,6 +6,7 @@ import { User } from '../../shared/models/users'
6import { deleteFileAsync, generateRandomString } from './utils' 6import { deleteFileAsync, generateRandomString } from './utils'
7import { extname } from 'path' 7import { extname } from 'path'
8import { isArray } from './custom-validators/misc' 8import { isArray } from './custom-validators/misc'
9import { UserModel } from '../models/account/user'
9 10
10function buildNSFWFilter (res: express.Response, paramNSFW?: string) { 11function buildNSFWFilter (res: express.Response, paramNSFW?: string) {
11 if (paramNSFW === 'true') return true 12 if (paramNSFW === 'true') return true
@@ -13,7 +14,7 @@ function buildNSFWFilter (res: express.Response, paramNSFW?: string) {
13 if (paramNSFW === 'both') return undefined 14 if (paramNSFW === 'both') return undefined
14 15
15 if (res.locals.oauth) { 16 if (res.locals.oauth) {
16 const user: User = res.locals.oauth.token.User 17 const user: UserModel = res.locals.oauth.token.User
17 18
18 // User does not want NSFW videos 19 // User does not want NSFW videos
19 if (user.nsfwPolicy === 'do_not_list') return false 20 if (user.nsfwPolicy === 'do_not_list') return false