-import * as express from 'express'
import { Model } from 'sequelize-typescript'
import { ResultList } from '../../shared'
import { VideoResolution } from '../../shared/models/videos'
import { CONFIG } from '../initializers'
-import { AccountModel } from '../models/account/account'
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) {
- return res.type('json').status(400).end()
-}
-
async function generateRandomString (size: number) {
const raw = await pseudoRandomBytesPromise(size)
]
for (const resolution of resolutions) {
- if (configResolutions[resolution.toString()] === true && videoFileHeight > resolution) {
+ if (configResolutions[resolution + 'p'] === true && videoFileHeight > resolution) {
resolutionsEnabled.push(resolution)
}
}
})
}
-let serverAccount: AccountModel
-async function getServerAccount () {
- if (serverAccount === undefined) {
- serverAccount = await AccountModel.loadApplication()
+let serverActor: ActorModel
+async function getServerActor () {
+ if (serverActor === undefined) {
+ const application = await ApplicationModel.load()
+ serverActor = application.Account.Actor
}
- if (!serverAccount) {
- logger.error('Cannot load server account.')
+ if (!serverActor) {
+ logger.error('Cannot load server actor.')
process.exit(0)
}
- return Promise.resolve(serverAccount)
+ return Promise.resolve(serverActor)
}
type SortType = { sortModel: any, sortValue: string }
// ---------------------------------------------------------------------------
export {
- badRequest,
generateRandomString,
getFormattedObjects,
isSignupAllowed,
computeResolutionsToTranscode,
resetSequelizeInstance,
- getServerAccount,
+ getServerActor,
SortType
}