-import * as express from 'express'
-import * as Promise from 'bluebird'
-
-import { pseudoRandomBytesPromise } from './core-utils'
-import { CONFIG, database as db } from '../initializers'
+import { Model } from 'sequelize-typescript'
import { ResultList } from '../../shared'
-import { VideoResolution } from '../../shared/models/videos/video-resolution.enum'
+import { VideoResolution } from '../../shared/models/videos'
+import { CONFIG } from '../initializers'
+import { UserModel } from '../models/account/user'
+import { ActorModel } from '../models/activitypub/actor'
+import { ApplicationModel } from '../models/application/application'
+import { pseudoRandomBytesPromise } from './core-utils'
+import { logger } from './logger'
-function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
- res.type('json').status(400).end()
-}
+async function generateRandomString (size: number) {
+ const raw = await pseudoRandomBytesPromise(size)
-function generateRandomString (size: number) {
- return pseudoRandomBytesPromise(size).then(raw => raw.toString('hex'))
+ return raw.toString('hex')
}
interface FormattableToJSON {
return res
}
-function isSignupAllowed () {
+async function isSignupAllowed () {
if (CONFIG.SIGNUP.ENABLED === false) {
- return Promise.resolve(false)
+ return false
}
// No limit and signup is enabled
if (CONFIG.SIGNUP.LIMIT === -1) {
- return Promise.resolve(true)
+ return true
}
- return db.User.countTotal().then(totalUsers => {
- return totalUsers < CONFIG.SIGNUP.LIMIT
- })
+ const totalUsers = await UserModel.countTotal()
+
+ return totalUsers < CONFIG.SIGNUP.LIMIT
}
function computeResolutionsToTranscode (videoFileHeight: number) {
]
for (const resolution of resolutions) {
- if (configResolutions[resolution.toString()] === true && videoFileHeight > resolution) {
+ if (configResolutions[resolution + 'p'] === true && videoFileHeight > resolution) {
resolutionsEnabled.push(resolution)
}
}
return resolutionsEnabled
}
+function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
+ Object.keys(savedFields).forEach(key => {
+ const value = savedFields[key]
+ instance.set(key, value)
+ })
+}
+
+let serverActor: ActorModel
+async function getServerActor () {
+ if (serverActor === undefined) {
+ const application = await ApplicationModel.load()
+ serverActor = application.Account.Actor
+ }
+
+ if (!serverActor) {
+ logger.error('Cannot load server actor.')
+ process.exit(0)
+ }
+
+ return Promise.resolve(serverActor)
+}
+
type SortType = { sortModel: any, sortValue: string }
// ---------------------------------------------------------------------------
export {
- badRequest,
generateRandomString,
getFormattedObjects,
isSignupAllowed,
computeResolutionsToTranscode,
+ resetSequelizeInstance,
+ getServerActor,
SortType
}