X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Flive.ts;h=04d2494cee50c45e55dfdc3f9f7202f80589c1bc;hb=9d6b9d10ef8cbef39e89bc709285abffb0d8caa1;hp=be46fb1c6e5c940c7dc50d3e91da4a2e2b32093d;hpb=b5b687550d8ef8beafdf706e45d6556fb5f4c876;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/videos/live.ts b/server/controllers/api/videos/live.ts
index be46fb1c6..04d2494ce 100644
--- a/server/controllers/api/videos/live.ts
+++ b/server/controllers/api/videos/live.ts
@@ -3,7 +3,9 @@ import { v4 as uuidv4 } from 'uuid'
 import { createReqFiles } from '@server/helpers/express-utils'
 import { CONFIG } from '@server/initializers/config'
 import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants'
-import { getVideoActivityPubUrl } from '@server/lib/activitypub/url'
+import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
+import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
+import { Hooks } from '@server/lib/plugins/hooks'
 import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
 import { videoLiveAddValidator, videoLiveGetValidator, videoLiveUpdateValidator } from '@server/middlewares/validators/videos/video-live'
 import { VideoLiveModel } from '@server/models/video/video-live'
@@ -14,6 +16,7 @@ import { sequelizeTypescript } from '../../../initializers/database'
 import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail'
 import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate } from '../../../middlewares'
 import { VideoModel } from '../../../models/video/video'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 const liveRouter = express.Router()
 
@@ -63,12 +66,17 @@ async function getLiveVideo (req: express.Request, res: express.Response) {
 async function updateLiveVideo (req: express.Request, res: express.Response) {
   const body: LiveVideoUpdate = req.body
 
+  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 videoLive.save()
+  await federateVideoIfNeeded(video, false)
 
-  return res.sendStatus(204)
+  return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
 }
 
 async function addLiveVideo (req: express.Request, res: express.Response) {
@@ -81,10 +89,11 @@ async function addLiveVideo (req: express.Request, res: express.Response) {
   videoData.duration = 0
 
   const video = new VideoModel(videoData) as MVideoDetails
-  video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
+  video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
 
   const videoLive = new VideoLiveModel()
   videoLive.saveReplay = videoInfo.saveReplay || false
+  videoLive.permanentLive = videoInfo.permanentLive || false
   videoLive.streamKey = uuidv4()
 
   const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
@@ -113,15 +122,19 @@ async function addLiveVideo (req: express.Request, res: express.Response) {
     videoCreated.VideoChannel = res.locals.videoChannel
 
     videoLive.videoId = videoCreated.id
-    await videoLive.save(sequelizeOptions)
+    videoCreated.VideoLive = await videoLive.save(sequelizeOptions)
 
     await setVideoTags({ video, tags: videoInfo.tags, transaction: t })
 
+    await federateVideoIfNeeded(videoCreated, true, t)
+
     logger.info('Video live %s with uuid %s created.', videoInfo.name, videoCreated.uuid)
 
     return { videoCreated }
   })
 
+  Hooks.runAction('action:api.live-video.created', { video: videoCreated })
+
   return res.json({
     video: {
       id: videoCreated.id,