8 files changed, 120 insertions, 105 deletions

diff --git a/server/lib/activitypub/videos/shared/abstract-builder.ts b/server/lib/activitypub/videos/shared/abstract-builder.ts
index e50bf29dc..4f74316d3 100644
--- a/server/lib/activitypub/videos/shared/abstract-builder.ts
+++ b/server/lib/activitypub/videos/shared/abstract-builder.ts
@@ -1,7 +1,7 @@
 import { CreationAttributes, Transaction } from 'sequelize/types'
 import { deleteAllModels, filterNonExistingModels } from '@server/helpers/database-utils'
 import { logger, LoggerTagsFn } from '@server/helpers/logger'
-import { updateRemoteThumbnail, updateVideoMiniatureFromUrl } from '@server/lib/thumbnail'
+import { updateRemoteThumbnail } from '@server/lib/thumbnail'
 import { setVideoTags } from '@server/lib/video'
 import { StoryboardModel } from '@server/models/video/storyboard'
 import { VideoCaptionModel } from '@server/models/video/video-caption'
@@ -11,7 +11,6 @@ import { VideoStreamingPlaylistModel } from '@server/models/video/video-streamin
 import {
   MStreamingPlaylistFiles,
   MStreamingPlaylistFilesVideo,
-  MThumbnail,
   MVideoCaption,
   MVideoFile,
   MVideoFullLight,
@@ -42,16 +41,22 @@ export abstract class APVideoAbstractBuilder {
     return getOrCreateAPActor(channel.id, 'all')
   }
 
-  protected tryToGenerateThumbnail (video: MVideoThumbnail): Promise<MThumbnail> {
-    return updateVideoMiniatureFromUrl({
-      downloadUrl: getThumbnailFromIcons(this.videoObject).url,
-      video,
-      type: ThumbnailType.MINIATURE
-    }).catch(err => {
-      logger.warn('Cannot generate thumbnail of %s.', this.videoObject.id, { err, ...this.lTags() })
-
+  protected async setThumbnail (video: MVideoThumbnail, t?: Transaction) {
+    const miniatureIcon = getThumbnailFromIcons(this.videoObject)
+    if (!miniatureIcon) {
+      logger.warn('Cannot find thumbnail in video object', { object: this.videoObject })
       return undefined
+    }
+
+    const miniatureModel = updateRemoteThumbnail({
+      fileUrl: miniatureIcon.url,
+      video,
+      type: ThumbnailType.MINIATURE,
+      size: miniatureIcon,
+      onDisk: false // Lazy download remote thumbnails
     })
+
+    await video.addAndSaveThumbnail(miniatureModel, t)
   }
 
   protected async setPreview (video: MVideoFullLight, t?: Transaction) {
diff --git a/server/lib/activitypub/videos/shared/creator.ts b/server/lib/activitypub/videos/shared/creator.ts
index e6d7bc23c..3d646ef66 100644
--- a/server/lib/activitypub/videos/shared/creator.ts
+++ b/server/lib/activitypub/videos/shared/creator.ts
@@ -4,7 +4,7 @@ import { sequelizeTypescript } from '@server/initializers/database'
 import { Hooks } from '@server/lib/plugins/hooks'
 import { autoBlacklistVideoIfNeeded } from '@server/lib/video-blacklist'
 import { VideoModel } from '@server/models/video/video'
-import { MThumbnail, MVideoFullLight, MVideoThumbnail } from '@server/types/models'
+import { MVideoFullLight, MVideoThumbnail } from '@server/types/models'
 import { VideoObject } from '@shared/models'
 import { APVideoAbstractBuilder } from './abstract-builder'
 import { getVideoAttributesFromObject } from './object-to-model-attributes'
@@ -27,65 +27,38 @@ export class APVideoCreator extends APVideoAbstractBuilder {
     const videoData = getVideoAttributesFromObject(channel, this.videoObject, this.videoObject.to)
     const video = VideoModel.build({ ...videoData, likes: 0, dislikes: 0 }) as MVideoThumbnail
 
-    const promiseThumbnail = this.tryToGenerateThumbnail(video)
-
-    let thumbnailModel: MThumbnail
-    if (waitThumbnail === true) {
-      thumbnailModel = await promiseThumbnail
-    }
-
     const { autoBlacklisted, videoCreated } = await sequelizeTypescript.transaction(async t => {
-      try {
-        const videoCreated = await video.save({ transaction: t }) as MVideoFullLight
-        videoCreated.VideoChannel = channel
-
-        if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
-
-        await this.setPreview(videoCreated, t)
-        await this.setWebTorrentFiles(videoCreated, t)
-        await this.setStreamingPlaylists(videoCreated, t)
-        await this.setTags(videoCreated, t)
-        await this.setTrackers(videoCreated, t)
-        await this.insertOrReplaceCaptions(videoCreated, t)
-        await this.insertOrReplaceLive(videoCreated, t)
-        await this.insertOrReplaceStoryboard(videoCreated, t)
-
-        // We added a video in this channel, set it as updated
-        await channel.setAsUpdated(t)
-
-        const autoBlacklisted = await autoBlacklistVideoIfNeeded({
-          video: videoCreated,
-          user: undefined,
-          isRemote: true,
-          isNew: true,
-          transaction: t
-        })
-
-        logger.info('Remote video with uuid %s inserted.', this.videoObject.uuid, this.lTags())
+      const videoCreated = await video.save({ transaction: t }) as MVideoFullLight
+      videoCreated.VideoChannel = channel
+
+      await this.setThumbnail(videoCreated, t)
+      await this.setPreview(videoCreated, t)
+      await this.setWebTorrentFiles(videoCreated, t)
+      await this.setStreamingPlaylists(videoCreated, t)
+      await this.setTags(videoCreated, t)
+      await this.setTrackers(videoCreated, t)
+      await this.insertOrReplaceCaptions(videoCreated, t)
+      await this.insertOrReplaceLive(videoCreated, t)
+      await this.insertOrReplaceStoryboard(videoCreated, t)
+
+      // We added a video in this channel, set it as updated
+      await channel.setAsUpdated(t)
+
+      const autoBlacklisted = await autoBlacklistVideoIfNeeded({
+        video: videoCreated,
+        user: undefined,
+        isRemote: true,
+        isNew: true,
+        transaction: t
+      })
 
-        Hooks.runAction('action:activity-pub.remote-video.created', { video: videoCreated, videoAPObject: this.videoObject })
+      logger.info('Remote video with uuid %s inserted.', this.videoObject.uuid, this.lTags())
 
-        return { autoBlacklisted, videoCreated }
-      } catch (err) {
-        // FIXME: Use rollback hook when https://github.com/sequelize/sequelize/pull/13038 is released
-        if (thumbnailModel) await thumbnailModel.removeThumbnail()
+      Hooks.runAction('action:activity-pub.remote-video.created', { video: videoCreated, videoAPObject: this.videoObject })
 
-        throw err
-      }
+      return { autoBlacklisted, videoCreated }
     })
 
-    if (waitThumbnail === false) {
-      // Error is already caught above
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      promiseThumbnail.then(thumbnailModel => {
-        if (!thumbnailModel) return
-
-        thumbnailModel = videoCreated.id
-
-        return thumbnailModel.save()
-      })
-    }
-
     return { autoBlacklisted, videoCreated }
   }
 }
diff --git a/server/lib/activitypub/videos/updater.ts b/server/lib/activitypub/videos/updater.ts
index 3a0886523..c98bce662 100644
--- a/server/lib/activitypub/videos/updater.ts
+++ b/server/lib/activitypub/videos/updater.ts
@@ -41,7 +41,7 @@ export class APVideoUpdater extends APVideoAbstractBuilder {
     try {
       const channelActor = await this.getOrCreateVideoChannelFromVideoObject()
 
-      const thumbnailModel = await this.tryToGenerateThumbnail(this.video)
+      const thumbnailModel = await this.setThumbnail(this.video)
 
       this.checkChannelUpdateOrThrow(channelActor)
 
@@ -58,8 +58,13 @@ export class APVideoUpdater extends APVideoAbstractBuilder {
         runInReadCommittedTransaction(t => this.setTags(videoUpdated, t)),
         runInReadCommittedTransaction(t => this.setTrackers(videoUpdated, t)),
         runInReadCommittedTransaction(t => this.setStoryboard(videoUpdated, t)),
-        this.setOrDeleteLive(videoUpdated),
-        this.setPreview(videoUpdated)
+        runInReadCommittedTransaction(t => {
+          return Promise.all([
+            this.setPreview(videoUpdated, t),
+            this.setThumbnail(videoUpdated, t)
+          ])
+        }),
+        this.setOrDeleteLive(videoUpdated)
       ])
 
       await runInReadCommittedTransaction(t => this.setCaptions(videoUpdated, t))
diff --git a/server/lib/files-cache/avatar-permanent-file-cache.ts b/server/lib/files-cache/avatar-permanent-file-cache.ts
index 89228c5a5..1d77c5bc1 100644
--- a/server/lib/files-cache/avatar-permanent-file-cache.ts
+++ b/server/lib/files-cache/avatar-permanent-file-cache.ts
@@ -1,10 +1,10 @@
+import { CONFIG } from '@server/initializers/config'
 import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 import { ActorImageModel } from '@server/models/actor/actor-image'
 import { MActorImage } from '@server/types/models'
 import { AbstractPermanentFileCache } from './shared'
-import { CONFIG } from '@server/initializers/config'
 
-export class AvatarPermanentFileCache extends AbstractPermanentFileCache<ActorImageModel> {
+export class AvatarPermanentFileCache extends AbstractPermanentFileCache<MActorImage> {
 
   constructor () {
     super(CONFIG.STORAGE.ACTOR_IMAGES)
diff --git a/server/lib/files-cache/index.ts b/server/lib/files-cache/index.ts
index cc11d5385..5630a9b80 100644
--- a/server/lib/files-cache/index.ts
+++ b/server/lib/files-cache/index.ts
@@ -1,4 +1,5 @@
 export * from './avatar-permanent-file-cache'
+export * from './video-miniature-permanent-file-cache'
 export * from './video-captions-simple-file-cache'
 export * from './video-previews-simple-file-cache'
 export * from './video-storyboards-simple-file-cache'
diff --git a/server/lib/files-cache/video-miniature-permanent-file-cache.ts b/server/lib/files-cache/video-miniature-permanent-file-cache.ts
new file mode 100644
index 000000000..35d9466f7
--- /dev/null
+++ b/server/lib/files-cache/video-miniature-permanent-file-cache.ts
@@ -0,0 +1,28 @@
+import { CONFIG } from '@server/initializers/config'
+import { THUMBNAILS_SIZE } from '@server/initializers/constants'
+import { ThumbnailModel } from '@server/models/video/thumbnail'
+import { MThumbnail } from '@server/types/models'
+import { ThumbnailType } from '@shared/models'
+import { AbstractPermanentFileCache } from './shared'
+
+export class VideoMiniaturePermanentFileCache extends AbstractPermanentFileCache<MThumbnail> {
+
+  constructor () {
+    super(CONFIG.STORAGE.THUMBNAILS_DIR)
+  }
+
+  protected loadModel (filename: string) {
+    return ThumbnailModel.loadByFilename(filename, ThumbnailType.MINIATURE)
+  }
+
+  protected getImageSize (image: MThumbnail): { width: number, height: number } {
+    if (image.width && image.height) {
+      return {
+        height: image.height,
+        width: image.width
+      }
+    }
+
+    return THUMBNAILS_SIZE
+  }
+}
diff --git a/server/lib/thumbnail.ts b/server/lib/thumbnail.ts
index e792567ff..90f5dc2c8 100644
--- a/server/lib/thumbnail.ts
+++ b/server/lib/thumbnail.ts
@@ -60,38 +60,6 @@ function updatePlaylistMiniatureFromUrl (options: {
   return updateThumbnailFromFunction({ thumbnailCreator, filename, height, width, type, existingThumbnail, fileUrl, onDisk: true })
 }
 
-function updateVideoMiniatureFromUrl (options: {
-  downloadUrl: string
-  video: MVideoThumbnail
-  type: ThumbnailType
-  size?: ImageSize
-}) {
-  const { downloadUrl, video, type, size } = options
-  const { filename: updatedFilename, basePath, height, width, existingThumbnail } = buildMetadataFromVideo(video, type, size)
-
-  // Only save the file URL if it is a remote video
-  const fileUrl = video.isOwned()
-    ? null
-    : downloadUrl
-
-  const thumbnailUrlChanged = hasThumbnailUrlChanged(existingThumbnail, downloadUrl, video)
-
-  // Do not change the thumbnail filename if the file did not change
-  const filename = thumbnailUrlChanged
-    ? updatedFilename
-    : existingThumbnail.filename
-
-  const thumbnailCreator = () => {
-    if (thumbnailUrlChanged) {
-      return downloadImageFromWorker({ url: downloadUrl, destDir: basePath, destName: filename, size: { width, height } })
-    }
-
-    return Promise.resolve()
-  }
-
-  return updateThumbnailFromFunction({ thumbnailCreator, filename, height, width, type, existingThumbnail, fileUrl, onDisk: true })
-}
-
 function updateLocalVideoMiniatureFromExisting (options: {
   inputPath: string
   video: MVideoThumbnail
@@ -157,6 +125,40 @@ function generateLocalVideoMiniature (options: {
   })
 }
 
+// ---------------------------------------------------------------------------
+
+function updateVideoMiniatureFromUrl (options: {
+  downloadUrl: string
+  video: MVideoThumbnail
+  type: ThumbnailType
+  size?: ImageSize
+}) {
+  const { downloadUrl, video, type, size } = options
+  const { filename: updatedFilename, basePath, height, width, existingThumbnail } = buildMetadataFromVideo(video, type, size)
+
+  // Only save the file URL if it is a remote video
+  const fileUrl = video.isOwned()
+    ? null
+    : downloadUrl
+
+  const thumbnailUrlChanged = hasThumbnailUrlChanged(existingThumbnail, downloadUrl, video)
+
+  // Do not change the thumbnail filename if the file did not change
+  const filename = thumbnailUrlChanged
+    ? updatedFilename
+    : existingThumbnail.filename
+
+  const thumbnailCreator = () => {
+    if (thumbnailUrlChanged) {
+      return downloadImageFromWorker({ url: downloadUrl, destDir: basePath, destName: filename, size: { width, height } })
+    }
+
+    return Promise.resolve()
+  }
+
+  return updateThumbnailFromFunction({ thumbnailCreator, filename, height, width, type, existingThumbnail, fileUrl, onDisk: true })
+}
+
 function updateRemoteThumbnail (options: {
   fileUrl: string
   video: MVideoThumbnail
@@ -167,12 +169,10 @@ function updateRemoteThumbnail (options: {
   const { fileUrl, video, type, size, onDisk } = options
   const { filename: generatedFilename, height, width, existingThumbnail } = buildMetadataFromVideo(video, type, size)
 
-  const thumbnailUrlChanged = hasThumbnailUrlChanged(existingThumbnail, fileUrl, video)
-
   const thumbnail = existingThumbnail || new ThumbnailModel()
 
   // Do not change the thumbnail filename if the file did not change
-  if (thumbnailUrlChanged) {
+  if (hasThumbnailUrlChanged(existingThumbnail, fileUrl, video)) {
     thumbnail.filename = generatedFilename
   }
 
diff --git a/server/lib/video-pre-import.ts b/server/lib/video-pre-import.ts
index ef9c38731..1471d4091 100644
--- a/server/lib/video-pre-import.ts
+++ b/server/lib/video-pre-import.ts
@@ -262,13 +262,16 @@ async function forgeThumbnail ({ inputPath, video, downloadUrl, type }: {
       type,
       automaticallyGenerated: false
     })
-  } else if (downloadUrl) {
+  }
+
+  if (downloadUrl) {
     try {
       return await updateVideoMiniatureFromUrl({ downloadUrl, video, type })
     } catch (err) {
       logger.warn('Cannot process thumbnail %s from youtube-dl.', downloadUrl, { err })
     }
   }
+
   return null
 }