From eb87f9a4a90ffbac43075567eb0ea90e7379c4b2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 4 Sep 2018 11:19:19 +0200
Subject: Fix nsfw filter

---
 server/helpers/express-utils.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'server/helpers')

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index b715fb7d0..9cf8fbeac 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -14,8 +14,12 @@ function buildNSFWFilter (res: express.Response, paramNSFW?: string) {
 
   if (res.locals.oauth) {
     const user: User = 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
-- 
cgit v1.2.3