X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fexpress-utils.ts;h=8a9cee8c57a72756f857f44d14bb6cd3edc7c0c7;hb=25378bc866a69002d7447e5edc254ec7e469a1ec;hp=b715fb7d0a379debeb5beb184b73e065f3441ef9;hpb=687d638c2bee0d223f206168173b1b95adbad983;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index b715fb7d0..8a9cee8c5 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -6,6 +6,7 @@ import { User } from '../../shared/models/users'
 import { deleteFileAsync, generateRandomString } from './utils'
 import { extname } from 'path'
 import { isArray } from './custom-validators/misc'
+import { UserModel } from '../models/account/user'
 
 function buildNSFWFilter (res: express.Response, paramNSFW?: string) {
   if (paramNSFW === 'true') return true
@@ -13,9 +14,13 @@ function buildNSFWFilter (res: express.Response, paramNSFW?: string) {
   if (paramNSFW === 'both') return undefined
 
   if (res.locals.oauth) {
-    const user: User = res.locals.oauth.token.User
+    const user: UserModel = res.locals.oauth.token.User
+
     // User does not want NSFW videos
-    if (user && user.nsfwPolicy === 'do_not_list') return false
+    if (user.nsfwPolicy === 'do_not_list') return false
+
+    // Both
+    return undefined
   }
 
   if (CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list') return false