3 files changed, 75 insertions, 18 deletions

diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index cbbf23be1..096884776 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -68,6 +68,7 @@ import { ActorFollowScoreCache } from '../files-cache'
 import { JobQueue } from '../job-queue'
 import { Notifier } from '../notifier'
 import { createPlaceholderThumbnail, createVideoMiniatureFromUrl } from '../thumbnail'
+import { setVideoTags } from '../video'
 import { autoBlacklistVideoIfNeeded } from '../video-blacklist'
 import { getOrCreateActorAndServerAndModel } from './actor'
 import { crawlCollectionPage } from './crawl'
@@ -409,8 +410,7 @@ async function updateVideoFromAP (options: {
         const tags = videoObject.tag
                                 .filter(isAPHashTagObject)
                                 .map(tag => tag.name)
-        const tagInstances = await TagModel.findOrCreateTags(tags, t)
-        await videoUpdated.$set('Tags', tagInstances, sequelizeOptions)
+        await setVideoTags({ video: videoUpdated, tags, transaction: t, defaultValue: videoUpdated.Tags })
       }
 
       {
@@ -594,8 +594,7 @@ async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAc
     const tags = videoObject.tag
                             .filter(isAPHashTagObject)
                             .map(t => t.name)
-    const tagInstances = await TagModel.findOrCreateTags(tags, t)
-    await videoCreated.$set('Tags', tagInstances, sequelizeOptions)
+    await setVideoTags({ video: videoCreated, tags, transaction: t })
 
     // Process captions
     const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => {
@@ -604,7 +603,6 @@ async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAc
     await Promise.all(videoCaptionsPromises)
 
     videoCreated.VideoFiles = videoFiles
-    videoCreated.Tags = tagInstances
 
     const autoBlacklisted = await autoBlacklistVideoIfNeeded({
       video: videoCreated,
diff --git a/server/lib/thumbnail.ts b/server/lib/thumbnail.ts
index 78d2f69e3..dc86423f8 100644
--- a/server/lib/thumbnail.ts
+++ b/server/lib/thumbnail.ts
@@ -42,15 +42,18 @@ function createVideoMiniatureFromUrl (fileUrl: string, video: MVideoThumbnail, t
   return createThumbnailFromFunction({ thumbnailCreator, filename, height, width, type, existingThumbnail, fileUrl })
 }
 
-function createVideoMiniatureFromExisting (
-  inputPath: string,
-  video: MVideoThumbnail,
-  type: ThumbnailType,
-  automaticallyGenerated: boolean,
+function createVideoMiniatureFromExisting (options: {
+  inputPath: string
+  video: MVideoThumbnail
+  type: ThumbnailType
+  automaticallyGenerated: boolean
   size?: ImageSize
-) {
+  keepOriginal?: boolean
+}) {
+  const { inputPath, video, type, automaticallyGenerated, size, keepOriginal } = options
+
   const { filename, outputPath, height, width, existingThumbnail } = buildMetadataFromVideo(video, type, size)
-  const thumbnailCreator = () => processImage(inputPath, outputPath, { width, height })
+  const thumbnailCreator = () => processImage(inputPath, outputPath, { width, height }, keepOriginal)
 
   return createThumbnailFromFunction({ thumbnailCreator, filename, height, width, type, automaticallyGenerated, existingThumbnail })
 }
diff --git a/server/lib/video.ts b/server/lib/video.ts
index a28f31529..6df41e6cd 100644
--- a/server/lib/video.ts
+++ b/server/lib/video.ts
@@ -1,9 +1,12 @@
-
+import { Transaction } from 'sequelize/types'
+import { TagModel } from '@server/models/video/tag'
 import { VideoModel } from '@server/models/video/video'
 import { FilteredModelAttributes } from '@server/types'
-import { VideoCreate, VideoPrivacy, VideoState } from '@shared/models'
+import { MTag, MThumbnail, MVideoTag, MVideoThumbnail } from '@server/types/models'
+import { ThumbnailType, VideoCreate, VideoPrivacy } from '@shared/models'
+import { createVideoMiniatureFromExisting } from './thumbnail'
 
-function buildLocalVideoFromCreate (videoInfo: VideoCreate, channelId: number): FilteredModelAttributes<VideoModel> {
+function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): FilteredModelAttributes<VideoModel> {
   return {
     name: videoInfo.name,
     remote: false,
@@ -13,19 +16,72 @@ function buildLocalVideoFromCreate (videoInfo: VideoCreate, channelId: number):
     commentsEnabled: videoInfo.commentsEnabled !== false, // If the value is not "false", the default is "true"
     downloadEnabled: videoInfo.downloadEnabled !== false,
     waitTranscoding: videoInfo.waitTranscoding || false,
-    state: VideoState.WAITING_FOR_LIVE,
     nsfw: videoInfo.nsfw || false,
     description: videoInfo.description,
     support: videoInfo.support,
     privacy: videoInfo.privacy || VideoPrivacy.PRIVATE,
-    duration: 0,
     channelId: channelId,
     originallyPublishedAt: videoInfo.originallyPublishedAt
   }
 }
 
+async function buildVideoThumbnailsFromReq (options: {
+  video: MVideoThumbnail
+  files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[]
+  fallback: (type: ThumbnailType) => Promise<MThumbnail>
+  automaticallyGenerated?: boolean
+}) {
+  const { video, files, fallback, automaticallyGenerated } = options
+
+  const promises = [
+    {
+      type: ThumbnailType.MINIATURE,
+      fieldName: 'thumbnailfile'
+    },
+    {
+      type: ThumbnailType.PREVIEW,
+      fieldName: 'previewfile'
+    }
+  ].map(p => {
+    const fields = files?.[p.fieldName]
+
+    if (fields) {
+      return createVideoMiniatureFromExisting({
+        inputPath: fields[0].path,
+        video,
+        type: p.type,
+        automaticallyGenerated: automaticallyGenerated || false
+      })
+    }
+
+    return fallback(p.type)
+  })
+
+  return Promise.all(promises)
+}
+
+async function setVideoTags (options: {
+  video: MVideoTag
+  tags: string[]
+  transaction?: Transaction
+  defaultValue?: MTag[]
+}) {
+  const { video, tags, transaction, defaultValue } = options
+  // Set tags to the video
+  if (tags) {
+    const tagInstances = await TagModel.findOrCreateTags(tags, transaction)
+
+    await video.$set('Tags', tagInstances, { transaction })
+    video.Tags = tagInstances
+  } else {
+    video.Tags = defaultValue || []
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  buildLocalVideoFromCreate
+  buildLocalVideoFromReq,
+  buildVideoThumbnailsFromReq,
+  setVideoTags
 }