import * as express from 'express'
import * as multer from 'multer'
-import { CONFIG, REMOTE_SCHEME } from '../initializers'
+import { REMOTE_SCHEME } from '../initializers/constants'
import { logger } from './logger'
import { deleteFileAsync, generateRandomString } from './utils'
import { extname } from 'path'
import { isArray } from './custom-validators/misc'
+import { CONFIG } from '../initializers/config'
function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
if (paramNSFW === 'true') return true
if (paramNSFW === 'false') return false
if (paramNSFW === 'both') return undefined
- if (res && res.locals.oauth) {
+ if (res?.locals.oauth) {
const user = res.locals.oauth.token.User
// User does not want NSFW videos
return null
}
-function cleanUpReqFiles (req: { files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[] }) {
+function cleanUpReqFiles (req: { files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[] }) {
const files = req.files
if (!files) return
}
for (const key of Object.keys(files)) {
- const file = files[ key ]
+ const file = files[key]
if (isArray(file)) file.forEach(f => deleteFileAsync(f.path))
else deleteFileAsync(file.path)
return host
}
-function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
+function badRequest (req: express.Request, res: express.Response) {
return res.type('json').status(400).end()
}
function createReqFiles (
fieldNames: string[],
- mimeTypes: { [ id: string ]: string },
- destinations: { [ fieldName: string ]: string }
+ mimeTypes: { [id: string]: string },
+ destinations: { [fieldName: string]: string }
) {
const storage = multer.diskStorage({
destination: (req, file, cb) => {
- cb(null, destinations[ file.fieldname ])
+ cb(null, destinations[file.fieldname])
},
filename: async (req, file, cb) => {
- const extension = mimeTypes[ file.mimetype ] || extname(file.originalname)
+ let extension: string
+ const fileExtension = extname(file.originalname)
+ const extensionFromMimetype = mimeTypes[file.mimetype]
+
+ // Take the file extension if we don't understand the mime type
+ // We have the OGG/OGV exception too because firefox sends a bad mime type when sending an OGG file
+ if (fileExtension === '.ogg' || fileExtension === '.ogv' || !extensionFromMimetype) {
+ extension = fileExtension
+ } else {
+ extension = extensionFromMimetype
+ }
+
let randomString = ''
try {
}
})
- let fields: { name: string, maxCount: number }[] = []
+ const fields: { name: string, maxCount: number }[] = []
for (const fieldName of fieldNames) {
fields.push({
name: fieldName,
(CONFIG.SEARCH.REMOTE_URI.USERS === true && user !== undefined)
}
+function getCountVideos (req: express.Request) {
+ return req.query.skipCount !== true
+}
+
// ---------------------------------------------------------------------------
export {
isUserAbleToSearchRemoteURI,
badRequest,
createReqFiles,
- cleanUpReqFiles
+ cleanUpReqFiles,
+ getCountVideos
}