7 files changed, 151 insertions, 7 deletions

diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 3c3c666a1..c9486eb37 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -1,4 +1,5 @@
 import autocannon, { printResult } from 'autocannon'
+import { program } from 'commander'
 import { writeJson } from 'fs-extra'
 import { Video, VideoPrivacy } from '@shared/models'
 import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
@@ -7,7 +8,15 @@ let server: PeerTubeServer
 let video: Video
 let threadId: number
 
-const outfile = process.argv[2]
+program
+  .option('-o, --outfile [outfile]', 'Outfile')
+  .option('--grep [string]', 'Filter tests you want to execute')
+  .description('Run API REST benchmark')
+  .parse(process.argv)
+
+const options = program.opts()
+
+const outfile = options.outfile
 
 run()
   .catch(err => console.error(err))
@@ -135,7 +144,11 @@ async function run () {
         return status === 200 && body.startsWith('{"client":')
       }
     }
-  ]
+  ].filter(t => {
+    if (!options.grep) return true
+
+    return t.title.includes(options.grep)
+  })
 
   const finalResult: any[] = []
 
diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index bae91a2b6..f4f9b1352 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -8,6 +8,7 @@ defaultLanguage="en-US"
 # Supported languages
 languages=(
     ["ar"]="ar"
+    ["fa"]="fa-IR"
     ["en"]="en-US"
     ["vi"]="vi-VN"
     ["hu"]="hu-HU"
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 2bacf2a2e..5f1230d33 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -94,6 +94,12 @@ elif [ "$1" = "api-4" ]; then
     activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
 
     MOCHA_PARALLEL=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles
+elif [ "$1" = "api-5" ]; then
+    npm run build:server
+
+    transcodingFiles=$(findTestFiles ./dist/server/tests/api/transcoding)
+
+    MOCHA_PARALLEL=true runTest "$1" 2 $transcodingFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server
 
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index c4b376431..59fc84ad5 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,6 +1,6 @@
 import { program } from 'commander'
 import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
-import { computeLowerResolutionsToTranscode } from '@server/helpers/ffprobe-utils'
+import { computeLowerResolutionsToTranscode } from '@server/helpers/ffmpeg'
 import { CONFIG } from '@server/initializers/config'
 import { addTranscodingJob } from '@server/lib/video'
 import { VideoState, VideoTranscodingPayload } from '@shared/models'
diff --git a/scripts/migrations/peertube-4.2.ts b/scripts/migrations/peertube-4.2.ts
new file mode 100644
index 000000000..22f9ff9f0
--- /dev/null
+++ b/scripts/migrations/peertube-4.2.ts
@@ -0,0 +1,123 @@
+import { minBy } from 'lodash'
+import { join } from 'path'
+import { getImageSize, processImage } from '@server/helpers/image-utils'
+import { CONFIG } from '@server/initializers/config'
+import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
+import { updateActorImages } from '@server/lib/activitypub/actors'
+import { sendUpdateActor } from '@server/lib/activitypub/send'
+import { getBiggestActorImage } from '@server/lib/actor-image'
+import { JobQueue } from '@server/lib/job-queue'
+import { AccountModel } from '@server/models/account/account'
+import { ActorModel } from '@server/models/actor/actor'
+import { VideoChannelModel } from '@server/models/video/video-channel'
+import { MAccountDefault, MActorDefault, MChannelDefault } from '@server/types/models'
+import { getLowercaseExtension } from '@shared/core-utils'
+import { buildUUID } from '@shared/extra-utils'
+import { ActorImageType } from '@shared/models'
+import { initDatabaseModels } from '../../server/initializers/database'
+
+run()
+  .then(() => process.exit(0))
+  .catch(err => {
+    console.error(err)
+    process.exit(-1)
+  })
+
+async function run () {
+  console.log('Generate avatar miniatures from existing avatars.')
+
+  await initDatabaseModels(true)
+  JobQueue.Instance.init(true)
+
+  const accounts: AccountModel[] = await AccountModel.findAll({
+    include: [
+      {
+        model: ActorModel,
+        required: true,
+        where: {
+          serverId: null
+        }
+      },
+      {
+        model: VideoChannelModel,
+        include: [
+          {
+            model: AccountModel
+          }
+        ]
+      }
+    ]
+  })
+
+  for (const account of accounts) {
+    try {
+      await fillAvatarSizeIfNeeded(account)
+      await generateSmallerAvatarIfNeeded(account)
+    } catch (err) {
+      console.error(`Cannot process account avatar ${account.name}`, err)
+    }
+
+    for (const videoChannel of account.VideoChannels) {
+      try {
+        await generateSmallerAvatarIfNeeded(videoChannel)
+      } catch (err) {
+        console.error(`Cannot process channel avatar ${videoChannel.name}`, err)
+      }
+    }
+  }
+
+  console.log('Generation finished!')
+}
+
+async function fillAvatarSizeIfNeeded (accountOrChannel: MAccountDefault | MChannelDefault) {
+  const avatars = accountOrChannel.Actor.Avatars
+
+  for (const avatar of avatars) {
+    if (avatar.width && avatar.height) continue
+
+    console.log('Filling size of avatars of %s.', accountOrChannel.name)
+
+    const { width, height } = await getImageSize(join(CONFIG.STORAGE.ACTOR_IMAGES, avatar.filename))
+    avatar.width = width
+    avatar.height = height
+
+    await avatar.save()
+  }
+}
+
+async function generateSmallerAvatarIfNeeded (accountOrChannel: MAccountDefault | MChannelDefault) {
+  const avatars = accountOrChannel.Actor.Avatars
+  if (avatars.length !== 1) {
+    return
+  }
+
+  console.log(`Processing ${accountOrChannel.name}.`)
+
+  await generateSmallerAvatar(accountOrChannel.Actor)
+  accountOrChannel.Actor = Object.assign(accountOrChannel.Actor, { Server: null })
+
+  return sendUpdateActor(accountOrChannel, undefined)
+}
+
+async function generateSmallerAvatar (actor: MActorDefault) {
+  const bigAvatar = getBiggestActorImage(actor.Avatars)
+
+  const imageSize = minBy(ACTOR_IMAGES_SIZE[ActorImageType.AVATAR], 'width')
+  const sourceFilename = bigAvatar.filename
+
+  const newImageName = buildUUID() + getLowercaseExtension(sourceFilename)
+  const source = join(CONFIG.STORAGE.ACTOR_IMAGES, sourceFilename)
+  const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, newImageName)
+
+  await processImage(source, destination, imageSize, true)
+
+  const actorImageInfo = {
+    name: newImageName,
+    fileUrl: null,
+    height: imageSize.height,
+    width: imageSize.width,
+    onDisk: true
+  }
+
+  await updateActorImages(actor, ActorImageType.AVATAR, [ actorImageInfo ], undefined)
+}
diff --git a/scripts/print-transcode-command.ts b/scripts/print-transcode-command.ts
index 21667f544..ef671c0aa 100644
--- a/scripts/print-transcode-command.ts
+++ b/scripts/print-transcode-command.ts
@@ -1,8 +1,8 @@
 import { program } from 'commander'
 import ffmpeg from 'fluent-ffmpeg'
 import { exit } from 'process'
-import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils'
-import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/video-transcoding-profiles'
+import { buildVODCommand, runCommand, TranscodeVODOptions } from '@server/helpers/ffmpeg'
+import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/default-transcoding-profiles'
 
 program
   .arguments('<path>')
@@ -33,12 +33,12 @@ async function run (path: string, cmd: any) {
 
     resolution: +cmd.resolution,
     isPortraitMode: false
-  } as TranscodeOptions
+  } as TranscodeVODOptions
 
   let command = ffmpeg(options.inputPath)
                .output(options.outputPath)
 
-  command = await buildx264VODCommand(command, options)
+  command = await buildVODCommand(command, options)
 
   command.on('start', (cmdline) => {
     console.log(cmdline)
diff --git a/scripts/test.sh b/scripts/test.sh
index 4d1d8720a..3b294b386 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -9,6 +9,7 @@ npm run ci -- api-1
 npm run ci -- api-2
 npm run ci -- api-3
 npm run ci -- api-4
+npm run ci -- api-5
 npm run ci -- external-plugins
 
 npm run ci -- lint