-import * as express from 'express'
-import { v4 as uuidv4 } from 'uuid'
+import express from 'express'
import { createReqFiles } from '@server/helpers/express-utils'
+import { buildUUID, uuidToShort } from '@server/helpers/uuid'
import { CONFIG } from '@server/initializers/config'
import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants'
import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
import { VideoLiveModel } from '@server/models/video/video-live'
import { MVideoDetails, MVideoFullLight } from '@server/types/models'
import { LiveVideoCreate, LiveVideoUpdate, VideoState } from '../../../../shared'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
import { logger } from '../../../helpers/logger'
import { sequelizeTypescript } from '../../../initializers/database'
-import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail'
+import { updateVideoMiniatureFromExisting } from '../../../lib/thumbnail'
import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate } from '../../../middlewares'
import { VideoModel } from '../../../models/video/video'
liveRouter.get('/live/:videoId',
authenticate,
asyncMiddleware(videoLiveGetValidator),
- asyncRetryTransactionMiddleware(getLiveVideo)
+ getLiveVideo
)
liveRouter.put('/live/:videoId',
// ---------------------------------------------------------------------------
-async function getLiveVideo (req: express.Request, res: express.Response) {
+function getLiveVideo (req: express.Request, res: express.Response) {
const videoLive = res.locals.videoLive
return res.json(videoLive.toFormattedJSON())
const video = res.locals.videoAll
const videoLive = res.locals.videoLive
+
videoLive.saveReplay = body.saveReplay || false
+ videoLive.permanentLive = body.permanentLive || false
video.VideoLive = await videoLive.save()
await federateVideoIfNeeded(video, false)
- return res.sendStatus(204)
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
async function addLiveVideo (req: express.Request, res: express.Response) {
const videoLive = new VideoLiveModel()
videoLive.saveReplay = videoInfo.saveReplay || false
- videoLive.streamKey = uuidv4()
+ videoLive.permanentLive = videoInfo.permanentLive || false
+ videoLive.streamKey = buildUUID()
const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
video,
files: req.files,
fallback: type => {
- return createVideoMiniatureFromExisting({
+ return updateVideoMiniatureFromExisting({
inputPath: ASSETS_PATH.DEFAULT_LIVE_BACKGROUND,
video,
type,
return res.json({
video: {
id: videoCreated.id,
+ shortUUID: uuidToShort(videoCreated.uuid),
uuid: videoCreated.uuid
}
})