X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideos.ts;h=dd02141eeac07f96eb0d5526e7cfbcadb6f44ad8;hb=156c50af3085468a47b8ae73fe8cfcae46b42398;hp=34685b6b1c4cce4c49225d2a8e6974aa8215bce5;hpb=d382f4e9175c1520835e41c3573471a84bcf1713;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 34685b6b1..dd02141ee 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -230,6 +230,7 @@ async function updateVideoFromAP (options: { options.video.set('support', videoData.support) options.video.set('nsfw', videoData.nsfw) options.video.set('commentsEnabled', videoData.commentsEnabled) + options.video.set('downloadingEnabled', videoData.downloadingEnabled) options.video.set('waitTranscoding', videoData.waitTranscoding) options.video.set('state', videoData.state) options.video.set('duration', videoData.duration) @@ -396,6 +397,8 @@ async function refreshVideoIfNeeded (options: { } await retryTransactionWrapper(updateVideoFromAP, updateOptions) await syncVideoExternalAttributes(video, videoObject, options.syncParam) + + return video } catch (err) { logger.warn('Cannot refresh video %s.', options.video.url, { err }) return video @@ -439,6 +442,7 @@ async function videoActivityObjectToDBAttributes ( support, nsfw: videoObject.sensitive, commentsEnabled: videoObject.commentsEnabled, + downloadingEnabled: videoObject.downloadingEnabled, waitTranscoding: videoObject.waitTranscoding, state: videoObject.state, channelId: videoChannel.id, @@ -455,11 +459,11 @@ async function videoActivityObjectToDBAttributes ( } } -function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObject: VideoTorrentObject) { +function videoFileActivityUrlToDBAttributes (video: VideoModel, videoObject: VideoTorrentObject) { const fileUrls = videoObject.url.filter(u => isActivityVideoUrlObject(u)) as ActivityVideoUrlObject[] if (fileUrls.length === 0) { - throw new Error('Cannot find video files for ' + videoCreated.url) + throw new Error('Cannot find video files for ' + video.url) } const attributes: VideoFileModel[] = [] @@ -481,7 +485,7 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObje infoHash: parsed.infoHash, resolution: fileUrl.height, size: fileUrl.size, - videoId: videoCreated.id, + videoId: video.id, fps: fileUrl.fps || -1 } as VideoFileModel attributes.push(attribute)