18 files changed, 68 insertions, 48 deletions

diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index aec138653..5ecbff28d 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -40,7 +40,7 @@ languages=(
 
 cd client
 
-rm -rf ./dist ./compiled
+rm -rf ./dist
 
 # Don't build other languages if --light arg is provided
 if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); then
@@ -49,7 +49,7 @@ if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); t
         additionalParams="--sourceMap=true"
     fi
 
-    npm run ng build -- --prod --output-path "dist/build" $additionalParams
+    node --max_old_space_size=8192 node_modules/.bin/ng build --configuration production --output-path "dist/build" $additionalParams
 
     for key in "${!languages[@]}"; do
         lang=${languages[$key]}
@@ -72,7 +72,8 @@ else
         export ANALYZE_BUNDLE=true
     fi
 
-    npm run ng build -- --localize=false --output-path "dist/$defaultLanguage/" --deploy-url "/client/$defaultLanguage/" --prod --stats-json $additionalParams
+    node --max_old_space_size=8192 node_modules/.bin/ng build --localize=false --output-path "dist/$defaultLanguage/" \
+                        --deploy-url "/client/$defaultLanguage/" --configuration production --stats-json $additionalParams
 fi
 
 cp "./dist/$defaultLanguage/manifest.webmanifest" "./dist/manifest.webmanifest"
diff --git a/scripts/ci.sh b/scripts/ci.sh
index f4a200a00..07e37e0ee 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -25,7 +25,7 @@ runTest () {
     joblog="$jobname-ci.log"
 
     parallel -j $jobs --retries $retries \
-        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail {}" \
+        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ./dist/server/tests/register.js --bail {}" \
         ::: $files
 
     cat "$joblog" | uniq -c
@@ -33,63 +33,72 @@ runTest () {
 }
 
 findTestFiles () {
-    find $1 -type f -name "*.ts" | grep -v "/index.ts" | xargs echo
+    exception="-not -name index.js"
+
+    if [ ! -z ${2+x} ]; then
+        exception="$exception -not -name $2"
+    fi
+
+    find $1 -type f -name "*.js" $exception | xargs echo
 }
 
-if [ "$1" = "misc" ]; then
+if [ "$1" = "client" ]; then
     npm run build
 
-    feedsFiles=$(findTestFiles server/tests/feeds)
-    helperFiles=$(findTestFiles server/tests/helpers)
-    pluginsFiles=$(findTestFiles server/tests/plugins)
-    miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
+    feedsFiles=$(findTestFiles ./dist/server/tests/feeds)
+    helperFiles=$(findTestFiles ./dist/server/tests/helpers)
+    miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js"
+    # Not in plugin task, it needs an index.html
+    pluginFiles="./dist/server/tests/plugins/html-injection.js"
 
-    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles
-elif [ "$1" = "cli" ]; then
+    MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles
+elif [ "$1" = "cli-plugin" ]; then
     npm run build:server
     npm run setup:cli
 
-    cliFiles=$(findTestFiles server/tests/cli)
+    pluginsFiles=$(findTestFiles ./dist/server/tests/plugins html-injection.js)
+    cliFiles=$(findTestFiles ./dist/server/tests/cli)
 
+    MOCHA_PARALLEL=true runTest "$1" 2 $pluginsFiles
     runTest "$1" 1 $cliFiles
 elif [ "$1" = "api-1" ]; then
     npm run build:server
 
-    checkParamFiles=$(findTestFiles server/tests/api/check-params)
-    notificationsFiles=$(findTestFiles server/tests/api/notifications)
-    searchFiles=$(findTestFiles server/tests/api/search)
+    checkParamFiles=$(findTestFiles ./dist/server/tests/api/check-params)
+    notificationsFiles=$(findTestFiles ./dist/server/tests/api/notifications)
+    searchFiles=$(findTestFiles ./dist/server/tests/api/search)
 
     MOCHA_PARALLEL=true runTest "$1" 3 $notificationsFiles $searchFiles $checkParamFiles
 elif [ "$1" = "api-2" ]; then
     npm run build:server
 
-    serverFiles=$(findTestFiles server/tests/api/server)
-    usersFiles=$(findTestFiles server/tests/api/users)
-    liveFiles=$(findTestFiles server/tests/api/live)
+    liveFiles=$(findTestFiles ./dist/server/tests/api/live)
+    serverFiles=$(findTestFiles ./dist/server/tests/api/server)
+    usersFiles=$(findTestFiles ./dist/server/tests/api/users)
 
     MOCHA_PARALLEL=true runTest "$1" 3 $serverFiles $usersFiles $liveFiles
 elif [ "$1" = "api-3" ]; then
     npm run build:server
 
-    videosFiles=$(findTestFiles server/tests/api/videos)
+    videosFiles=$(findTestFiles ./dist/server/tests/api/videos)
 
     MOCHA_PARALLEL=true runTest "$1" 3 $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
 
-    moderationFiles=$(findTestFiles server/tests/api/moderation)
-    redundancyFiles=$(findTestFiles server/tests/api/redundancy)
-    activitypubFiles=$(findTestFiles server/tests/api/activitypub)
+    moderationFiles=$(findTestFiles ./dist/server/tests/api/moderation)
+    redundancyFiles=$(findTestFiles ./dist/server/tests/api/redundancy)
+    activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
 
     MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server
 
-    externalPluginsFiles=$(findTestFiles server/tests/external-plugins)
+    externalPluginsFiles=$(findTestFiles ./dist/server/tests/external-plugins)
 
     runTest "$1" 1 $externalPluginsFiles
 elif [ "$1" = "lint" ]; then
-    npm run eslint -- --ext .ts "server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts"
+    npm run eslint -- --ext .ts "./server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts"
     npm run swagger-cli -- validate support/doc/api/openapi.yaml
 
     ( cd client
diff --git a/scripts/create-import-video-file-job.ts b/scripts/create-import-video-file-job.ts
index 5d38af066..a3a35bc10 100644
--- a/scripts/create-import-video-file-job.ts
+++ b/scripts/create-import-video-file-job.ts
@@ -1,7 +1,7 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { resolve } from 'path'
 import { VideoModel } from '../server/models/video/video'
 import { initDatabaseModels } from '../server/initializers/database'
@@ -36,7 +36,7 @@ async function run () {
     return
   }
 
-  const video = await VideoModel.loadByUUID(options.video)
+  const video = await VideoModel.load(options.video)
   if (!video) throw new Error('Video not found.')
   if (video.isOwned() === false) throw new Error('Cannot import files of a non owned video.')
 
@@ -45,7 +45,7 @@ async function run () {
     filePath: resolve(options.import)
   }
 
-  await JobQueue.Instance.init()
+  JobQueue.Instance.init()
   await JobQueue.Instance.createJobWithPromise({ type: 'video-file-import', payload: dataInput })
   console.log('Import job for video %s created.', video.uuid)
 }
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 56a5f4938..65e65b616 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,7 +1,7 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { VideoModel } from '../server/models/video/video'
 import { initDatabaseModels } from '../server/initializers/database'
 import { JobQueue } from '../server/lib/job-queue'
diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh
index e9cade800..1846f9a7d 100755
--- a/scripts/dev/client.sh
+++ b/scripts/dev/client.sh
@@ -2,7 +2,13 @@
 
 set -eu
 
-clientCommand="cd client && node node_modules/.bin/ng serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000"
+clientConfiguration="hmr"
+
+if [ ! -z ${2+x} ] && [ "$2" = "--ar-locale" ]; then
+  clientConfiguration="ar-locale"
+fi
+
+clientCommand="cd client && node --max_old_space_size=4096 node_modules/.bin/ng serve --proxy-config proxy.config.json --hmr --configuration $clientConfiguration --host 0.0.0.0 --disable-host-check --port 3000"
 serverCommand="npm run build:server && NODE_ENV=test node dist/server"
 
 if [ ! -z ${1+x} ] && [ "$1" = "--skip-server" ]; then
diff --git a/scripts/dev/index.sh b/scripts/dev/index.sh
index 56addb7fe..beb88606f 100755
--- a/scripts/dev/index.sh
+++ b/scripts/dev/index.sh
@@ -3,5 +3,5 @@
 set -eu
 
 NODE_ENV=test npm run concurrently -- -k \
-  "sh scripts/dev/client.sh --skip-server" \
+  "sh scripts/dev/client.sh --skip-server ${1:-}" \
   "sh scripts/dev/server.sh --skip-client"
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index a077f77a9..db5af3f91 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -37,6 +37,7 @@ async function run () {
     console.log(' * `video-language` by Rigel Kent (CC-BY)')
     console.log(' * `peertube-x` by Solen DP (CC-BY)')
     console.log(' * `flame` by Freepik (Flaticon License)')
+    console.log(' * `local` by Larea (CC-BY)')
   }
 
   {
diff --git a/scripts/optimize-old-videos.ts b/scripts/optimize-old-videos.ts
index 01d30244f..9692d76ba 100644
--- a/scripts/optimize-old-videos.ts
+++ b/scripts/optimize-old-videos.ts
@@ -5,7 +5,7 @@ import { VIDEO_TRANSCODING_FPS } from '../server/initializers/constants'
 import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffprobe-utils'
 import { getMaxBitrate } from '../shared/models/videos'
 import { VideoModel } from '../server/models/video/video'
-import { optimizeOriginalVideofile } from '../server/lib/video-transcoding'
+import { optimizeOriginalVideofile } from '../server/lib/transcoding/video-transcoding'
 import { initDatabaseModels } from '../server/initializers/database'
 import { basename, dirname } from 'path'
 import { copy, move, remove } from 'fs-extra'
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 5f4480c88..c16503589 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,7 +1,7 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
 import { createInterface } from 'readline'
@@ -85,6 +85,8 @@ function run () {
     const files = await getFiles()
 
     for (const file of files) {
+      if (file === 'peertube-audit.log') continue
+
       console.log('Opening %s.', file)
 
       const stream = createReadStream(file)
@@ -140,7 +142,8 @@ function toTimeFormat (time: string) {
 
   if (isNaN(timestamp) === true) return 'Unknown date'
 
-  return new Date(timestamp).toISOString()
+  const d = new Date(timestamp)
+  return d.toLocaleString() + `.${d.getMilliseconds()}`
 }
 
 function containsTags (loggerTags: string[], optionsTags: string[]) {
diff --git a/scripts/plugin/install.ts b/scripts/plugin/install.ts
index 2ea8a658b..de045c2d2 100755
--- a/scripts/plugin/install.ts
+++ b/scripts/plugin/install.ts
@@ -2,7 +2,7 @@ import { registerTSPaths } from '../../server/helpers/register-ts-paths'
 registerTSPaths()
 
 import { initDatabaseModels } from '../../server/initializers/database'
-import * as program from 'commander'
+import { program } from 'commander'
 import { PluginManager } from '../../server/lib/plugins/plugin-manager'
 import { isAbsolute } from 'path'
 
diff --git a/scripts/plugin/uninstall.ts b/scripts/plugin/uninstall.ts
index 8710b1750..1e14cc18f 100755
--- a/scripts/plugin/uninstall.ts
+++ b/scripts/plugin/uninstall.ts
@@ -2,7 +2,7 @@ import { registerTSPaths } from '../../server/helpers/register-ts-paths'
 registerTSPaths()
 
 import { initDatabaseModels } from '../../server/initializers/database'
-import * as program from 'commander'
+import { program } from 'commander'
 import { PluginManager } from '../../server/lib/plugins/plugin-manager'
 
 program
diff --git a/scripts/print-transcode-command.ts b/scripts/print-transcode-command.ts
index f6c96790e..d83363215 100644
--- a/scripts/print-transcode-command.ts
+++ b/scripts/print-transcode-command.ts
@@ -1,11 +1,11 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import * as ffmpeg from 'fluent-ffmpeg'
 import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils'
 import { exit } from 'process'
-import { VideoTranscodingProfilesManager } from '@server/lib/video-transcoding-profiles'
+import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/video-transcoding-profiles'
 
 program
   .arguments('<path>')
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index 32314b0b7..58d24816e 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -11,7 +11,7 @@ import { VideoRedundancyModel } from '../server/models/redundancy/video-redundan
 import * as Bluebird from 'bluebird'
 import { getUUIDFromFilename } from '../server/helpers/utils'
 import { ThumbnailModel } from '../server/models/video/thumbnail'
-import { ActorImageModel } from '../server/models/account/actor-image'
+import { ActorImageModel } from '../server/models/actor/actor-image'
 import { uniq, values } from 'lodash'
 import { ThumbnailType } from '@shared/models'
 
@@ -89,7 +89,7 @@ async function pruneDirectory (directory: string, existFun: ExistFun) {
 function doesVideoExist (keepOnlyOwned: boolean) {
   return async (file: string) => {
     const uuid = getUUIDFromFilename(file)
-    const video = await VideoModel.loadByUUID(uuid)
+    const video = await VideoModel.load(uuid)
 
     return video && (keepOnlyOwned === false || video.isOwned())
   }
diff --git a/scripts/regenerate-thumbnails.ts b/scripts/regenerate-thumbnails.ts
index b95343c0b..078f3830b 100644
--- a/scripts/regenerate-thumbnails.ts
+++ b/scripts/regenerate-thumbnails.ts
@@ -2,7 +2,7 @@ import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
 import * as Bluebird from 'bluebird'
-import * as program from 'commander'
+import { program } from 'commander'
 import { pathExists, remove } from 'fs-extra'
 import { generateImageFilename, processImage } from '@server/helpers/image-utils'
 import { THUMBNAILS_SIZE } from '@server/initializers/constants'
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts
index 7e7de6b8a..4c45396d4 100755
--- a/scripts/reset-password.ts
+++ b/scripts/reset-password.ts
@@ -1,9 +1,9 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { initDatabaseModels } from '../server/initializers/database'
-import { UserModel } from '../server/models/account/user'
+import { UserModel } from '../server/models/user/user'
 import { isUserPasswordValid } from '../server/helpers/custom-validators/users'
 
 program
diff --git a/scripts/test.sh b/scripts/test.sh
index 32034531d..01b259fe2 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -7,8 +7,8 @@ npm run setup:cli
 
 npm run ci -- lint
 
-npm run ci -- misc
-npm run ci -- cli
+npm run ci -- client
+npm run ci -- cli-plugin
 npm run ci -- api-1
 npm run ci -- api-2
 npm run ci -- api-3
diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index e497be4e2..592684225 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -2,9 +2,9 @@ import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
 import { WEBSERVER } from '../server/initializers/constants'
-import { ActorFollowModel } from '../server/models/activitypub/actor-follow'
+import { ActorFollowModel } from '../server/models/actor/actor-follow'
 import { VideoModel } from '../server/models/video/video'
-import { ActorModel } from '../server/models/activitypub/actor'
+import { ActorModel } from '../server/models/actor/actor'
 import {
   getLocalAccountActivityPubUrl,
   getLocalVideoActivityPubUrl,
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 12629ad65..aa7804bd1 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-PEERTUBE_PATH=${1:-/var/www/peertube/}
+PEERTUBE_PATH=${1:-/var/www/peertube}
 
 if [ ! -e "$PEERTUBE_PATH" ]; then
   echo "Error - path \"$PEERTUBE_PATH\" wasn't found"