Fix privacy concern for remote videos

[github/Chocobozzz/PeerTube.git] / scripts / regenerate-thumbnails.ts

diff --git a/scripts/regenerate-thumbnails.ts b/scripts/regenerate-thumbnails.ts
index 0213b8a22414ed1f4557852e9d003f838b4890f6..8075f90bab9f4bd01681e560dc28eaf1dbf2864f 100644 (file)
--- a/scripts/regenerate-thumbnails.ts
+++ b/scripts/regenerate-thumbnails.ts
@@ -1,15 +1,14 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as Bluebird from 'bluebird'
-import * as program from 'commander'
+import { map } from 'bluebird'
+import { program } from 'commander'
 import { pathExists, remove } from 'fs-extra'
-import { processImage } from '@server/helpers/image-utils'
+import { generateImageFilename, processImage } from '@server/helpers/image-utils'
 import { THUMBNAILS_SIZE } from '@server/initializers/constants'
 import { VideoModel } from '@server/models/video/video'
 import { MVideo } from '@server/types/models'
 import { initDatabaseModels } from '@server/initializers/database'
-import { ActorImageModel } from '@server/models/account/actor-image'
 
 program
   .description('Regenerate local thumbnails using preview files')
@@ -24,7 +23,7 @@ async function run () {
 
   const videos = await VideoModel.listLocal()
 
-  await Bluebird.map(videos, v => {
+  await map(videos, v => {
     return processVideo(v)
       .catch(err => console.error('Cannot process video %s.', v.url, err))
   }, { concurrency: 20 })
@@ -52,7 +51,7 @@ async function processVideo (videoArg: MVideo) {
   const oldPath = thumbnail.getPath()
 
   // Update thumbnail
-  thumbnail.filename = ActorImageModel.generateFilename()
+  thumbnail.filename = generateImageFilename()
   thumbnail.width = size.width
   thumbnail.height = size.height