aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/videos/index.ts2
-rw-r--r--server/controllers/api/videos/live.ts3
2 files changed, 4 insertions, 1 deletions
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 0dcd38ad2..71a0f97e2 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -174,7 +174,7 @@ function listVideoPrivacies (req: express.Request, res: express.Response) {
174} 174}
175 175
176async function addVideo (req: express.Request, res: express.Response) { 176async function addVideo (req: express.Request, res: express.Response) {
177 // Transferring the video could be long 177 // Uploading the video could be long
178 // Set timeout to 10 minutes, as Express's default is 2 minutes 178 // Set timeout to 10 minutes, as Express's default is 2 minutes
179 req.setTimeout(1000 * 60 * 10, () => { 179 req.setTimeout(1000 * 60 * 10, () => {
180 logger.error('Upload video has timed out.') 180 logger.error('Upload video has timed out.')
diff --git a/server/controllers/api/videos/live.ts b/server/controllers/api/videos/live.ts
index a6f00c1bd..e67d89612 100644
--- a/server/controllers/api/videos/live.ts
+++ b/server/controllers/api/videos/live.ts
@@ -67,7 +67,9 @@ async function updateLiveVideo (req: express.Request, res: express.Response) {
67 67
68 const video = res.locals.videoAll 68 const video = res.locals.videoAll
69 const videoLive = res.locals.videoLive 69 const videoLive = res.locals.videoLive
70
70 videoLive.saveReplay = body.saveReplay || false 71 videoLive.saveReplay = body.saveReplay || false
72 videoLive.permanentLive = body.permanentLive || false
71 73
72 video.VideoLive = await videoLive.save() 74 video.VideoLive = await videoLive.save()
73 75
@@ -90,6 +92,7 @@ async function addLiveVideo (req: express.Request, res: express.Response) {
90 92
91 const videoLive = new VideoLiveModel() 93 const videoLive = new VideoLiveModel()
92 videoLive.saveReplay = videoInfo.saveReplay || false 94 videoLive.saveReplay = videoInfo.saveReplay || false
95 videoLive.permanentLive = videoInfo.permanentLive || false
93 videoLive.streamKey = uuidv4() 96 videoLive.streamKey = uuidv4()
94 97
95 const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ 98 const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({