Merge branch 'release/beta-10' into develop

[github/Chocobozzz/PeerTube.git] / server / helpers / express-utils.ts

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index d023117a8616c8ae942a5853e74b2cd838ab962b..b3cc4084892402dcb2883177092a000f55c1e57d 100644 (file)
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -4,14 +4,23 @@ import { CONFIG, REMOTE_SCHEME } from '../initializers'
 import { logger } from './logger'
 import { User } from '../../shared/models/users'
 import { generateRandomString } from './utils'
+import { extname } from 'path'
+
+function buildNSFWFilter (res: express.Response, paramNSFW?: string) {
+  if (paramNSFW === 'true') return true
+  if (paramNSFW === 'false') return false
+  if (paramNSFW === 'both') return undefined
 
-function isNSFWHidden (res: express.Response) {
   if (res.locals.oauth) {
     const user: User = res.locals.oauth.token.User
-    if (user) return user.nsfwPolicy === 'do_not_list'
+    // User does not want NSFW videos
+    if (user && user.nsfwPolicy === 'do_not_list') return false
   }
 
-  return CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list'
+  if (CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list') return false
+
+  // Display all
+  return null
 }
 
 function getHostWithPort (host: string) {
@@ -42,7 +51,7 @@ function createReqFiles (
     },
 
     filename: async (req, file, cb) => {
-      const extension = mimeTypes[ file.mimetype ]
+      const extension = mimeTypes[ file.mimetype ] || extname(file.originalname)
       let randomString = ''
 
       try {
@@ -56,7 +65,7 @@ function createReqFiles (
     }
   })
 
-  const fields = []
+  let fields: { name: string, maxCount: number }[] = []
   for (const fieldName of fieldNames) {
     fields.push({
       name: fieldName,
@@ -70,7 +79,7 @@ function createReqFiles (
 // ---------------------------------------------------------------------------
 
 export {
-  isNSFWHidden,
+  buildNSFWFilter,
   getHostWithPort,
   badRequest,
   createReqFiles