diff options
author | Chocobozzz <me@florianbigard.com> | 2020-11-02 15:43:44 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-11-09 15:33:04 +0100 |
commit | af4ae64f6faf38f8179f2e07d3cd4ad60006be92 (patch) | |
tree | a2d39ddc138d49619f03f11e003c2302f824286c /server/controllers/api | |
parent | 77e9f859c6ad75ba179dec74e5410cc651eaa49b (diff) | |
download | PeerTube-af4ae64f6faf38f8179f2e07d3cd4ad60006be92.tar.gz PeerTube-af4ae64f6faf38f8179f2e07d3cd4ad60006be92.tar.zst PeerTube-af4ae64f6faf38f8179f2e07d3cd4ad60006be92.zip |
Begin live tests
Diffstat (limited to 'server/controllers/api')
-rw-r--r-- | server/controllers/api/videos/index.ts | 2 | ||||
-rw-r--r-- | server/controllers/api/videos/live.ts | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 6357062bc..50e769e77 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts | |||
@@ -189,7 +189,7 @@ async function addVideo (req: express.Request, res: express.Response) { | |||
189 | videoData.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED | 189 | videoData.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED |
190 | videoData.duration = videoPhysicalFile['duration'] // duration was added by a previous middleware | 190 | videoData.duration = videoPhysicalFile['duration'] // duration was added by a previous middleware |
191 | 191 | ||
192 | const video = new VideoModel(videoData) as MVideoDetails | 192 | const video = new VideoModel(videoData) as MVideoFullLight |
193 | video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object | 193 | video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object |
194 | 194 | ||
195 | const videoFile = new VideoFileModel({ | 195 | const videoFile = new VideoFileModel({ |
diff --git a/server/controllers/api/videos/live.ts b/server/controllers/api/videos/live.ts index be46fb1c6..f980c7730 100644 --- a/server/controllers/api/videos/live.ts +++ b/server/controllers/api/videos/live.ts | |||
@@ -4,6 +4,7 @@ import { createReqFiles } from '@server/helpers/express-utils' | |||
4 | import { CONFIG } from '@server/initializers/config' | 4 | import { CONFIG } from '@server/initializers/config' |
5 | import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants' | 5 | import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants' |
6 | import { getVideoActivityPubUrl } from '@server/lib/activitypub/url' | 6 | import { getVideoActivityPubUrl } from '@server/lib/activitypub/url' |
7 | import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' | ||
7 | import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' | 8 | import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' |
8 | import { videoLiveAddValidator, videoLiveGetValidator, videoLiveUpdateValidator } from '@server/middlewares/validators/videos/video-live' | 9 | import { videoLiveAddValidator, videoLiveGetValidator, videoLiveUpdateValidator } from '@server/middlewares/validators/videos/video-live' |
9 | import { VideoLiveModel } from '@server/models/video/video-live' | 10 | import { VideoLiveModel } from '@server/models/video/video-live' |
@@ -63,10 +64,13 @@ async function getLiveVideo (req: express.Request, res: express.Response) { | |||
63 | async function updateLiveVideo (req: express.Request, res: express.Response) { | 64 | async function updateLiveVideo (req: express.Request, res: express.Response) { |
64 | const body: LiveVideoUpdate = req.body | 65 | const body: LiveVideoUpdate = req.body |
65 | 66 | ||
67 | const video = res.locals.videoAll | ||
66 | const videoLive = res.locals.videoLive | 68 | const videoLive = res.locals.videoLive |
67 | videoLive.saveReplay = body.saveReplay || false | 69 | videoLive.saveReplay = body.saveReplay || false |
68 | 70 | ||
69 | await videoLive.save() | 71 | video.VideoLive = await videoLive.save() |
72 | |||
73 | await federateVideoIfNeeded(video, false) | ||
70 | 74 | ||
71 | return res.sendStatus(204) | 75 | return res.sendStatus(204) |
72 | } | 76 | } |
@@ -113,10 +117,12 @@ async function addLiveVideo (req: express.Request, res: express.Response) { | |||
113 | videoCreated.VideoChannel = res.locals.videoChannel | 117 | videoCreated.VideoChannel = res.locals.videoChannel |
114 | 118 | ||
115 | videoLive.videoId = videoCreated.id | 119 | videoLive.videoId = videoCreated.id |
116 | await videoLive.save(sequelizeOptions) | 120 | videoCreated.VideoLive = await videoLive.save(sequelizeOptions) |
117 | 121 | ||
118 | await setVideoTags({ video, tags: videoInfo.tags, transaction: t }) | 122 | await setVideoTags({ video, tags: videoInfo.tags, transaction: t }) |
119 | 123 | ||
124 | await federateVideoIfNeeded(videoCreated, true, t) | ||
125 | |||
120 | logger.info('Video live %s with uuid %s created.', videoInfo.name, videoCreated.uuid) | 126 | logger.info('Video live %s with uuid %s created.', videoInfo.name, videoCreated.uuid) |
121 | 127 | ||
122 | return { videoCreated } | 128 | return { videoCreated } |