Merge branch 'release/4.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / video-import.ts

diff --git a/server/lib/video-import.ts b/server/lib/video-import.ts
index fb9306967fcd3c707be73bee18a5da8119ba0d61..7960798758f9fbf5037588d964568d404a7c2c2b 100644 (file)
--- a/server/lib/video-import.ts
+++ b/server/lib/video-import.ts
@@ -115,7 +115,7 @@ async function buildVideoFromImport ({ channelId, importData, importDataOverride
     language: importDataOverride?.language || importData.language,
     commentsEnabled: importDataOverride?.commentsEnabled ?? CONFIG.DEFAULTS.PUBLISH.COMMENTS_ENABLED,
     downloadEnabled: importDataOverride?.downloadEnabled ?? CONFIG.DEFAULTS.PUBLISH.DOWNLOAD_ENABLED,
-    waitTranscoding: importDataOverride?.waitTranscoding || false,
+    waitTranscoding: importDataOverride?.waitTranscoding ?? true,
     state: VideoState.TO_IMPORT,
     nsfw: importDataOverride?.nsfw || importData.nsfw || false,
     description: importDataOverride?.description || importData.description,
@@ -125,7 +125,7 @@ async function buildVideoFromImport ({ channelId, importData, importDataOverride
     channelId,
     originallyPublishedAt: importDataOverride?.originallyPublishedAt
       ? new Date(importDataOverride?.originallyPublishedAt)
-      : importData.originallyPublishedAt
+      : importData.originallyPublishedAtWithoutTime
   }
 
   videoData = await Hooks.wrapObject(
@@ -206,7 +206,8 @@ async function buildYoutubeDLImport (options: {
     videoImportAttributes: {
       targetUrl,
       state: VideoImportState.PENDING,
-      userId: user.id
+      userId: user.id,
+      videoChannelSyncId: channelSync?.id
     }
   })