113 files changed, 3641 insertions, 1969 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 442317ce2..a1edde1ef 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,7 +44,7 @@ jobs:
    env:
      PGUSER: peertube
      PGHOST: localhost
-      NODE_PENDING_JOB_WAIT: 500
+      NODE_PENDING_JOB_WAIT: 250
    steps:
      - uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8fa4069f..ef0ec39bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,128 @@
 # Changelog
+## v3.2.0-rc.1 (~ May)
+### IMPORTANT NOTES
+ * **Important:** Due to a bug in ffmpeg, PeerTube is not compatible with ffmpeg 4.4. See https://github.com/Chocobozzz/PeerTube/issues/3990
+ * By default, HLS transcoding is now enabled and webtorrent is disabled. We suggest you to reflect this change.
+ See [the documentation](https://docs.joinpeertube.org/admin-configuration?id=webtorrent-transcoding-or-hls-transcoding) for more information
+ * PeerTube client now displays bigger video thumbnails.
+ To fix old thumbnails quality, run `regenerate-thumbnails` script after your PeerTube upgrade: https://docs.joinpeertube.org/maintain-tools?id=regenerate-thumbnailsjs
+### Maintenance
+ * Support `X-Frame-Options` header, enabled by default in the configuration
+ * Directly use `node` in [systemd template](https://github.com/Chocobozzz/PeerTube/blob/develop/support/systemd/peertube.service)
+ * Check ffmpeg version at PeerTube startup
+### CLI tools
+ * Add `regenerate-thumbnails` script to regenerate thumbnails of local videos
+### Plugins/Themes/Embed API
+ * Theme:
+   * `--submenuColor` becomes `--submenuBackgroundColor`
+ * Support HTML placeholders for plugins. See [the documentation](https://docs.joinpeertube.org/contribute-plugins?id=html-placeholder-elements) for more information
+   * `player-next` next to the PeerTube player
+ * Support storing files for plugins in a dedicated directory. See [the documentation](https://docs.joinpeertube.org/contribute-plugins?id=storage) for more information
+ * Transcoding:
+   * Add `inputOptions` option support for transcoding profile [#3917](https://github.com/Chocobozzz/PeerTube/pull/3917)
+   * Add `scaleFilter.name` option support for transcoding profile [#3917](https://github.com/Chocobozzz/PeerTube/pull/3917)
+ * Plugin settings:
+   * Add ability to register `html` and `select` setting
+   * Add ability to hide a plugin setting depending on the form state
+ * Plugin form fields (to add inputs to video form...):
+   * Add ability to hide a plugin field depending on the form state using `.hidden` property
+ * Add client helpers:
+   * `getServerConfig()`
+   * `getAuthHeader()`
+ * Add server helpers:
+   * `config.getServerConfig()`
+   * `plugin.getBaseStaticRoute()`
+   * `plugin.getBaseRouterRoute()`
+   * `plugin.getDataDirectoryPath()`
+   * `user.getAuthUser()`
+ * Add client plugin hooks (https://docs.joinpeertube.org/api-plugins):
+   * `action:modal.video-download.shown`
+   * `action:video-upload.init`
+   * `action:video-url-import.init`
+   * `action:video-torrent-import.init`
+   * `action:go-live.init`
+   * `action:auth-user.logged-in` & `action:auth-user.logged-out`
+   * `action:auth-user.information-loaded`
+   * `action:admin-plugin-settings.init`
+ * Add server plugin hooks (https://docs.joinpeertube.org/api-plugins):
+   * `filter:api.download.video.allowed.result` & `filter:api.download.torrent.allowed.result` to forbid download
+   * `filter:html.embed.video-playlist.allowed.result` & `filter:html.embed.video.allowed.result` to forbid embed
+   * `filter:api.search.videos.local.list.params` & `filter:api.search.videos.local.list.result`
+   * `filter:api.search.videos.index.list.params` & `filter:api.search.videos.index.list.result`
+   * `filter:api.search.video-channels.local.list.params` & `filter:api.search.video-channels.local.list.result`
+   * `filter:api.search.video-channels.index.list.params` & `filter:api.search.video-channels.index.list.result`
+### Features
+ * Accessibility/UI:
+   * :tada: Redesign channel and account page
+   * :tada: Increase video miniature size
+   * :tada: Add channel banner support
+   * Use a square avatar for channels and a round avatar for accounts
+   * Use account initial as default account avatar [#4002](https://github.com/Chocobozzz/PeerTube/pull/4002)
+   * Prefer channel display in video miniature
+   * Add *support* button in channel page
+   * Set direct download as default in video download modal [#3880](https://github.com/Chocobozzz/PeerTube/pull/3880)
+   * Show less information in video download modal by default [#3890](https://github.com/Chocobozzz/PeerTube/pull/3890)
+   * Autofocus admin plugin search input
+   * Add `1.75` playback rate to player [#3888](https://github.com/Chocobozzz/PeerTube/pull/3888)
+   * Add `title` attribute to embed code [#3901](https://github.com/Chocobozzz/PeerTube/pull/3901)
+   * Don't pause player when opening a modal [#3909](https://github.com/Chocobozzz/PeerTube/pull/3909)
+   * Add link below the player to open the video on origin instance [#3624](https://github.com/Chocobozzz/PeerTube/issues/3624)
+ * Notify admins on new available PeerTube version
+ * Notify admins on new available plugin version
+ * Video player:
+  * Add loop toggle to context menu [#3949](https://github.com/Chocobozzz/PeerTube/pull/3949)
+  * Add icons to context menu [#3955](https://github.com/Chocobozzz/PeerTube/pull/3955)
+  * Add a *Previous* button in playlist watch page [#3485](https://github.com/Chocobozzz/PeerTube/pull/3485)
+  * Automatically close the settings menu when clicking outside the player
+  * Add "stats for nerds" panel in context menu [#3958](https://github.com/Chocobozzz/PeerTube/pull/3958)
+ * Add channel and playlist stats to stats endpoint [#3747](https://github.com/Chocobozzz/PeerTube/pull/3747)
+ * Support `playlistPosition=last` and negative index (`playlistPosition=-2`) URL query parameters for playlists [#3974](https://github.com/Chocobozzz/PeerTube/pull/3974)
+ * My videos:
+   * Add ability to sort videos (publication date, most viewed...)
+   * Add ability to only display live videos
+ * Automatically resume videos for non logged-in users [#3885](https://github.com/Chocobozzz/PeerTube/pull/3885)
+ * Admin plugins:
+   * Show a modal when upgrading a plugin to a major version
+   * Display a setting button after plugin installation
+ * Add ability to search live videos
+ * Use bigger thumbnails for feeds
+ * Parse video description markdown for Opengraph/Twitter/HTML elements
+ * Open the remote interaction modal when replying to a comment if we are logged-out
+ * Handle `.srt` captions with broken durations
+ * Performance:
+   * Player now lazy loads video captions
+   * Faster admin table filters
+### Bug fixes
+ * More robust comments fetcher of remote video
+ * Fix database ssl connection
+ * Remove unnecessary black border above and below video in player [#3920](https://github.com/Chocobozzz/PeerTube/pull/3920)
+ * Reduce tag input excessive padding [#3927](https://github.com/Chocobozzz/PeerTube/pull/3927)
+ * Fix disappearing hamburger menu for narrow screens [#3929](https://github.com/Chocobozzz/PeerTube/pull/3929)
+ * Fix Youtube subtitle import with some languages
+ * Fix transcoding profile update in admin config
+ * Fix outbox fetch with subtitled videos
+ * Correctly unload a plugin on update/uninstall [#3940](https://github.com/Chocobozzz/PeerTube/pull/3940)
+ * Ensure to install plugins that are supported by PeerTube
+ * Fix welcome/warning modal displaying twice
+ * Fix h265 video import using CLI
+ * Fix context menu when watching a playlist
+ * Fix transcoding job priority preventing video publication when there are many videos to transcode
 ## v3.1.0
 ### IMPORTANT NOTES
diff --git a/client/.stylelintrc.json b/client/.stylelintrc.json
index 25f0b1002..6a322da62 100644
--- a/client/.stylelintrc.json
+++ b/client/.stylelintrc.json
@@ -24,6 +24,12 @@
    "rule-empty-line-before": null,
    "selector-max-id": null,
    "scss/at-function-pattern": null,
-    "function-parentheses-space-inside": "never-single-line"
+    "function-parentheses-space-inside": "never-single-line",
+    "property-no-vendor-prefix": [
+      true,
+      {
+        "ignoreProperties": [ "mask-image" ]
+      }
+    ]
  }
 }
diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts
index 942025b6b..ad2acee7f 100644
--- a/client/e2e/src/po/video-upload.po.ts
+++ b/client/e2e/src/po/video-upload.po.ts
@@ -26,7 +26,12 @@ export class VideoUploadPage {
    await elem.sendKeys(fileToUpload)
    // Wait for the upload to finish
-    await browser.wait(browser.ExpectedConditions.elementToBeClickable(this.getSecondStepSubmitButton()))
+    await browser.wait(async () => {
+      const actionButton = this.getSecondStepSubmitButton().element(by.css('.action-button'))
+      const klass = await actionButton.getAttribute('class')
+      return !klass.includes('disabled')
+    })
  }
  async validSecondUploadStep (videoName: string) {
diff --git a/client/package.json b/client/package.json
index 140fc3095..8486ace22 100644
--- a/client/package.json
+++ b/client/package.json
@@ -96,6 +96,7 @@
    "lodash-es": "^4.17.4",
    "markdown-it": "12.0.4",
    "mini-css-extract-plugin": "^1.3.1",
+    "ngx-uploadx": "^4.1.0",
    "p2p-media-loader-hlsjs": "^0.6.2",
    "path-browserify": "^1.0.0",
    "primeng": "^11.0.0-rc.1",
diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html
index f81465f88..6bc1d0448 100644
--- a/client/src/app/+about/about-follows/about-follows.component.html
+++ b/client/src/app/+about/about-follows/about-follows.component.html
@@ -9,7 +9,7 @@
      {{ follower}}
    </a>
-    <button i18n class="showMore" *ngIf="!loadedAllFollowers && canLoadMoreFollowers()" (click)="loadAllFollowers()">Show full list</button>
+    <button i18n class="show-more" *ngIf="!loadedAllFollowers && canLoadMoreFollowers()" (click)="loadAllFollowers()">Show full list</button>
  </div>
  <div class="col-xl-6 col-md-12">
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
index 0628c7a96..7e916e122 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
@@ -79,7 +79,13 @@ export class AccountVideoChannelsComponent implements OnInit, OnDestroy {
  }
  loadMoreChannels () {
-    this.videoChannelService.listAccountVideoChannels(this.account, this.channelPagination)
+    const options = {
+      account: this.account,
+      componentPagination: this.channelPagination,
+      sort: '-updatedAt'
+    }
+    this.videoChannelService.listAccountVideoChannels(options)
      .pipe(
        tap(res => this.channelPagination.totalItems = res.total),
        switchMap(res => from(res.data)),
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index fbd7380a9..c69b04a01 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -66,7 +66,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
                          distinctUntilChanged(),
                          switchMap(accountId => this.accountService.getAccount(accountId)),
                          tap(account => this.onAccount(account)),
-                          switchMap(account => this.videoChannelService.listAccountVideoChannels(account)),
+                          switchMap(account => this.videoChannelService.listAccountVideoChannels({ account })),
                          catchError(err => this.restExtractor.redirectTo404IfNotFound(err, 'other', [
                            HttpStatusCode.BAD_REQUEST_400,
                            HttpStatusCode.NOT_FOUND_404
diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html
index 6900e8717..8d8f12c48 100644
--- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html
+++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html
@@ -20,7 +20,7 @@
    <my-global-icon iconName="search"></my-global-icon>
    <ng-container i18n>
-      {{ pagination.totalItems }} {pagination.totalItems, plural, =1 {result} other {results}} for {{ search }}"
+      {{ pagination.totalItems }} {pagination.totalItems, plural, =1 {result} other {results}} for "{{ search }}"
    </ng-container>
  </ng-container>
 </div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
index c16368952..a0f2f28f8 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
@@ -2,7 +2,7 @@ import { ViewportScroller } from '@angular/common'
 import { HttpErrorResponse } from '@angular/common/http'
 import { AfterViewChecked, Component, OnInit } from '@angular/core'
 import { AuthService, Notifier, User, UserService } from '@app/core'
-import { uploadErrorHandler } from '@app/helpers'
+import { genericUploadErrorHandler } from '@app/helpers'
 @Component({
  selector: 'my-account-settings',
@@ -46,7 +46,7 @@ export class MyAccountSettingsComponent implements OnInit, AfterViewChecked {
          this.user.updateAccountAvatar(data.avatar)
        },
-        (err: HttpErrorResponse) => uploadErrorHandler({
+        (err: HttpErrorResponse) => genericUploadErrorHandler({
          err,
          name: $localize`avatar`,
          notifier: this.notifier
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts b/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts
index a29af176c..c9173039a 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts
@@ -3,7 +3,7 @@ import { HttpErrorResponse } from '@angular/common/http'
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, Notifier, ServerService } from '@app/core'
-import { uploadErrorHandler } from '@app/helpers'
+import { genericUploadErrorHandler } from '@app/helpers'
 import {
  VIDEO_CHANNEL_DESCRIPTION_VALIDATOR,
  VIDEO_CHANNEL_DISPLAY_NAME_VALIDATOR,
@@ -109,7 +109,7 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements
            this.videoChannel.updateAvatar(data.avatar)
          },
-          (err: HttpErrorResponse) => uploadErrorHandler({
+          (err: HttpErrorResponse) => genericUploadErrorHandler({
            err,
            name: $localize`avatar`,
            notifier: this.notifier
@@ -139,7 +139,7 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements
            this.videoChannel.updateBanner(data.banner)
          },
-          (err: HttpErrorResponse) => uploadErrorHandler({
+          (err: HttpErrorResponse) => genericUploadErrorHandler({
            err,
            name: $localize`banner`,
            notifier: this.notifier
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
index 9e3bf35b4..67b3ee496 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
@@ -68,8 +68,14 @@ channel with the same name (${videoChannel.name})!`,
    this.authService.userInformationLoaded
        .pipe(mergeMap(() => {
          const user = this.authService.getUser()
+          const options = {
+            account: user.account,
+            withStats: true,
+            search: this.search,
+            sort: '-updatedAt'
+          }
-          return this.videoChannelService.listAccountVideoChannels(user.account, null, true, this.search)
+          return this.videoChannelService.listAccountVideoChannels(options)
        })).subscribe(res => {
          this.videoChannels = res.data
          this.totalItems = res.total
diff --git a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html
index 088765b20..d0393a2a4 100644
--- a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html
+++ b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html
@@ -8,13 +8,8 @@
  <div class="modal-body" [formGroup]="form">
    <div class="form-group">
      <label i18n for="channel">Select a channel to receive the video</label>
-      <div class="peertube-select-container">
+      <my-select-channel labelForId="channel" formControlName="channel" [items]="videoChannels"></my-select-channel>
-        <select formControlName="channel" id="channel" class="form-control">
-          <option i18n value="undefined" disabled>Channel that will receive the video</option>
-          <option *ngFor="let channel of videoChannels" [value]="channel.id">{{ channel.displayName }}
-          </option>
-        </select>
-      </div>
      <div *ngIf="formErrors.channel" class="form-error">{{ formErrors.channel }}</div>
    </div>
  </div>
diff --git a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
index 0e2395754..7889d0985 100644
--- a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
+++ b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
@@ -1,11 +1,12 @@
-import { switchMap } from 'rxjs/operators'
+import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
 import { AuthService, Notifier } from '@app/core'
+import { listUserChannels } from '@app/helpers'
 import { OWNERSHIP_CHANGE_CHANNEL_VALIDATOR } from '@app/shared/form-validators/video-ownership-change-validators'
 import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
-import { VideoChannelService, VideoOwnershipService } from '@app/shared/shared-main'
+import { VideoOwnershipService } from '@app/shared/shared-main'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { VideoChangeOwnership, VideoChannel } from '@shared/models'
+import { VideoChangeOwnership } from '@shared/models'
 @Component({
  selector: 'my-accept-ownership',
@@ -18,8 +19,7 @@ export class MyAcceptOwnershipComponent extends FormReactive implements OnInit {
  @ViewChild('modal', { static: true }) modal: ElementRef
  videoChangeOwnership: VideoChangeOwnership | undefined = undefined
+  videoChannels: SelectChannelItem[]
-  videoChannels: VideoChannel[]
  error: string = null
@@ -28,7 +28,6 @@ export class MyAcceptOwnershipComponent extends FormReactive implements OnInit {
    private videoOwnershipService: VideoOwnershipService,
    private notifier: Notifier,
    private authService: AuthService,
-    private videoChannelService: VideoChannelService,
    private modalService: NgbModal
    ) {
    super()
@@ -37,9 +36,8 @@ export class MyAcceptOwnershipComponent extends FormReactive implements OnInit {
  ngOnInit () {
    this.videoChannels = []
-    this.authService.userInformationLoaded
+    listUserChannels(this.authService)
-      .pipe(switchMap(() => this.videoChannelService.listAccountVideoChannels(this.authService.getUser().account)))
+      .subscribe(channels => this.videoChannels = channels)
-      .subscribe(videoChannels => this.videoChannels = videoChannels.data)
    this.buildForm({
      channel: OWNERSHIP_CHANGE_CHANNEL_VALIDATOR
diff --git a/client/src/app/+search/search-filters.component.html b/client/src/app/+search/search-filters.component.html
index 1d1e7b868..421bc7f6f 100644
--- a/client/src/app/+search/search-filters.component.html
+++ b/client/src/app/+search/search-filters.component.html
@@ -18,6 +18,25 @@
      <div class="form-group">
        <div class="radio-label label-container">
+          <label i18n>Display only</label>
+          <button i18n class="reset-button reset-button-small" (click)="resetField('isLive')" *ngIf="advancedSearch.isLive !== undefined">
+            Reset
+          </button>
+        </div>
+        <div class="peertube-radio-container">
+          <input type="radio" name="isLive" id="isLiveTrue" value="true" [(ngModel)]="advancedSearch.isLive">
+          <label i18n for="isLiveTrue" class="radio">Live videos</label>
+        </div>
+        <div class="peertube-radio-container">
+          <input type="radio" name="isLive" id="isLiveFalse" value="false" [(ngModel)]="advancedSearch.isLive">
+          <label i18n for="isLiveFalse" class="radio">VOD videos</label>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="radio-label label-container">
          <label i18n>Display sensitive content</label>
          <button i18n class="reset-button reset-button-small" (click)="resetField('nsfw')" *ngIf="advancedSearch.nsfw !== undefined">
            Reset
@@ -44,7 +63,7 @@
        </div>
        <div class="peertube-radio-container" *ngFor="let date of publishedDateRanges">
-          <input type="radio" (change)="inputUpdated()" name="publishedDateRange" [id]="date.id" [value]="date.id" [(ngModel)]="publishedDateRange">
+          <input type="radio" (change)="onInputUpdated()" name="publishedDateRange" [id]="date.id" [value]="date.id" [(ngModel)]="publishedDateRange">
          <label [for]="date.id" class="radio">{{ date.label }}</label>
        </div>
      </div>
@@ -60,7 +79,7 @@
        <div class="row">
          <div class="pl-0 col-sm-6">
            <input
-              (change)="inputUpdated()"
+              (change)="onInputUpdated()"
              (keydown.enter)="$event.preventDefault()"
              type="text" id="original-publication-after" name="original-publication-after"
              i18n-placeholder placeholder="After..."
@@ -70,7 +89,7 @@
          </div>
          <div class="pr-0 col-sm-6">
            <input
-              (change)="inputUpdated()"
+              (change)="onInputUpdated()"
              (keydown.enter)="$event.preventDefault()"
              type="text" id="original-publication-before" name="original-publication-before"
              i18n-placeholder placeholder="Before..."
@@ -93,7 +112,7 @@
        </div>
        <div class="peertube-radio-container" *ngFor="let duration of durationRanges">
-          <input type="radio" (change)="inputUpdated()" name="durationRange" [id]="duration.id" [value]="duration.id" [(ngModel)]="durationRange">
+          <input type="radio" (change)="onInputUpdated()" name="durationRange" [id]="duration.id" [value]="duration.id" [(ngModel)]="durationRange">
          <label [for]="duration.id" class="radio">{{ duration.label }}</label>
        </div>
      </div>
diff --git a/client/src/app/+search/search-filters.component.ts b/client/src/app/+search/search-filters.component.ts
index a2af9a942..59aba22ff 100644
--- a/client/src/app/+search/search-filters.component.ts
+++ b/client/src/app/+search/search-filters.component.ts
@@ -3,6 +3,8 @@ import { ServerService } from '@app/core'
 import { AdvancedSearch } from '@app/shared/shared-search'
 import { ServerConfig, VideoConstant } from '@shared/models'
+type FormOption = { id: string, label: string }
 @Component({
  selector: 'my-search-filters',
  styleUrls: [ './search-filters.component.scss' ],
@@ -17,9 +19,10 @@ export class SearchFiltersComponent implements OnInit {
  videoLicences: VideoConstant<number>[] = []
  videoLanguages: VideoConstant<string>[] = []
-  publishedDateRanges: { id: string, label: string }[] = []
+  publishedDateRanges: FormOption[] = []
-  sorts: { id: string, label: string }[] = []
+  sorts: FormOption[] = []
-  durationRanges: { id: string, label: string }[] = []
+  durationRanges: FormOption[] = []
+  videoType: FormOption[] = []
  publishedDateRange: string
  durationRange: string
@@ -34,10 +37,6 @@ export class SearchFiltersComponent implements OnInit {
  ) {
    this.publishedDateRanges = [
      {
-        id: 'any_published_date',
-        label: $localize`Any`
-      },
-      {
        id: 'today',
        label: $localize`Today`
      },
@@ -55,12 +54,19 @@ export class SearchFiltersComponent implements OnInit {
      }
    ]
-    this.durationRanges = [
+    this.videoType = [
      {
-        id: 'any_duration',
+        id: 'vod',
-        label: $localize`Any`
+        label: $localize`VOD videos`
      },
      {
+        id: 'live',
+        label: $localize`Live videos`
+      }
+    ]
+    this.durationRanges = [
+      {
        id: 'short',
        label: $localize`Short (< 4 min)`
      },
@@ -104,24 +110,26 @@ export class SearchFiltersComponent implements OnInit {
    this.loadOriginallyPublishedAtYears()
  }
-  inputUpdated () {
+  onInputUpdated () {
    this.updateModelFromDurationRange()
    this.updateModelFromPublishedRange()
    this.updateModelFromOriginallyPublishedAtYears()
  }
  formUpdated () {
-    this.inputUpdated()
+    this.onInputUpdated()
    this.filtered.emit(this.advancedSearch)
  }
  reset () {
    this.advancedSearch.reset()
+    this.resetOriginalPublicationYears()
    this.durationRange = undefined
    this.publishedDateRange = undefined
-    this.originallyPublishedStartYear = undefined
-    this.originallyPublishedEndYear = undefined
+    this.onInputUpdated()
-    this.inputUpdated()
  }
  resetField (fieldName: string, value?: any) {
@@ -130,7 +138,7 @@ export class SearchFiltersComponent implements OnInit {
  resetLocalField (fieldName: string, value?: any) {
    this[fieldName] = value
-    this.inputUpdated()
+    this.onInputUpdated()
  }
  resetOriginalPublicationYears () {
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
index 094b4d3b3..16233f9e0 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
@@ -5,7 +5,7 @@
      <a ngbNavLink i18n>Basic info</a>
      <ng-template ngbNavContent>
-        <div class="row">
+        <div class="form-columns">
          <div class="col-video-edit">
            <div class="form-group">
              <label i18n for="name">Title</label>
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
index bc32d7964..c1c7c686d 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
@@ -1,9 +1,3 @@
-// Bootstrap grid utilities require functions, variables and mixins
-@import 'node_modules/bootstrap/scss/functions';
-@import 'node_modules/bootstrap/scss/variables';
-@import 'node_modules/bootstrap/scss/mixins';
-@import 'node_modules/bootstrap/scss/grid';
 @import 'variables';
 @import 'mixins';
@@ -57,65 +51,62 @@ my-peertube-checkbox {
  }
 }
-.captions {
+.captions-header {
+  text-align: right;
-  .captions-header {
+  margin-bottom: 1rem;
-    text-align: right;
+}
-    margin-bottom: 1rem;
-    .create-caption {
+.create-caption {
-      @include create-button;
+  @include create-button;
-    }
+}
-  }
-  .caption-entry {
+.caption-entry {
-    display: flex;
+  display: flex;
-    height: 40px;
+  height: 40px;
-    align-items: center;
+  align-items: center;
-    a.caption-entry-label {
+  a.caption-entry-label {
-      @include disable-default-a-behaviour;
+    @include disable-default-a-behaviour;
-      flex-grow: 1;
+    flex-grow: 1;
-      color: #000;
+    color: #000;
-      &:hover {
+    &:hover {
-        opacity: 0.8;
+      opacity: 0.8;
-      }
    }
+  }
-    .caption-entry-label {
+  .caption-entry-label {
-      font-size: 15px;
+    font-size: 15px;
-      font-weight: bold;
+    font-weight: bold;
-      margin-right: 20px;
-      width: 150px;
-    }
-    .caption-entry-state {
+    margin-right: 20px;
-      width: 200px;
+    width: 150px;
+  }
-      &.caption-entry-state-create {
+  .caption-entry-state {
-        color: #39CC0B;
+    width: 200px;
-      }
-      &.caption-entry-state-delete {
+    &.caption-entry-state-create {
-        color: #FF0000;
+      color: #39CC0B;
-      }
    }
-    .caption-entry-delete {
+    &.caption-entry-state-delete {
-      @include peertube-button;
+      color: #FF0000;
-      @include grey-button;
    }
  }
-  .no-caption {
+  .caption-entry-delete {
-    text-align: center;
+    @include peertube-button;
-    font-size: 15px;
+    @include grey-button;
  }
 }
+.no-caption {
+  text-align: center;
+  font-size: 15px;
+}
 .submit-container {
  text-align: right;
@@ -143,35 +134,15 @@ p-calendar {
  }
 }
-// columns for the video
+.form-columns {
-.col-video-edit {
+  display: grid;
-  @include make-col-ready();
-  @include media-breakpoint-up(md) {
+  grid-template-columns: 66% 1fr;
-    @include make-col(7);
+  grid-gap: 30px;
-    + .col-video-edit {
-      @include make-col(5);
-    }
-  }
-  @include media-breakpoint-up(xl) {
-    @include make-col(8);
-    + .col-video-edit {
-      @include make-col(4);
-    }
-  }
 }
-:host-context(.expanded) {
+@include on-small-main-col {
-  .col-video-edit {
+  .form-columns {
-    @include media-breakpoint-up(md) {
+    grid-template-columns: 1fr;
-      @include make-col(8);
-      + .col-video-edit {
-        @include make-col(4);
-      }
-    }
  }
 }
diff --git a/client/src/app/+videos/+video-edit/video-add-components/uploaderx-form-data.ts b/client/src/app/+videos/+video-edit/video-add-components/uploaderx-form-data.ts
new file mode 100644
index 000000000..3392a0d8a
--- /dev/null
+++ b/client/src/app/+videos/+video-edit/video-add-components/uploaderx-form-data.ts
@@ -0,0 +1,48 @@
+import { objectToFormData } from '@app/helpers'
+import { resolveUrl, UploaderX } from 'ngx-uploadx'
+/**
+ * multipart/form-data uploader extending the UploaderX implementation of Google Resumable
+ * for use with multer
+ *
+ * @see https://github.com/kukhariev/ngx-uploadx/blob/637e258fe366b8095203f387a6101a230ee4f8e6/src/uploadx/lib/uploaderx.ts
+ * @example
+ *
+ *   options: UploadxOptions = {
+ *     uploaderClass: UploaderXFormData
+ *   };
+ */
+export class UploaderXFormData extends UploaderX {
+  async getFileUrl (): Promise<string> {
+    const headers = {
+      'X-Upload-Content-Length': this.size.toString(),
+      'X-Upload-Content-Type': this.file.type || 'application/octet-stream'
+    }
+    const previewfile = this.metadata.previewfile as any as File
+    delete this.metadata.previewfile
+    const data = objectToFormData(this.metadata)
+    if (previewfile !== undefined) {
+      data.append('previewfile', previewfile, previewfile.name)
+      data.append('thumbnailfile', previewfile, previewfile.name)
+    }
+    await this.request({
+      method: 'POST',
+      body: data,
+      url: this.endpoint,
+      headers
+    })
+    const location = this.getValueFromResponse('location')
+    if (!location) {
+      throw new Error('Invalid or missing Location header')
+    }
+    this.offset = this.responseStatus === 201 ? 0 : undefined
+    return resolveUrl(location, this.endpoint)
+  }
+}
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index 4c0b09894..86a779f8a 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
@@ -1,12 +1,17 @@
-<div *ngIf="!isUploadingVideo" class="upload-video-container" dragDrop (fileDropped)="setVideoFile($event)">
+<div *ngIf="!isUploadingVideo" class="upload-video-container" dragDrop (fileDropped)="onFileDropped($event)">
  <div class="first-step-block">
    <my-global-icon class="upload-icon" iconName="upload" aria-hidden="true"></my-global-icon>
    <div class="button-file form-control" [ngbTooltip]="'(extensions: ' + videoExtensions + ')'">
      <span i18n>Select the file to upload</span>
      <input
-        aria-label="Select the file to upload" i18n-aria-label
+        aria-label="Select the file to upload"
-        #videofileInput type="file" name="videofile" id="videofile" [accept]="videoExtensions" (change)="fileChange()" autofocus
+        i18n-aria-label
+        #videofileInput
+        [accept]="videoExtensions"
+        (change)="onFileChange($event)"
+        id="videofile"
+        type="file"
      />
    </div>
@@ -41,7 +46,13 @@
      </div>
      <div class="form-group upload-audio-button">
-        <my-button className="orange-button" i18n-label [label]="getAudioUploadLabel()" icon="upload" (click)="uploadFirstStep(true)"></my-button>
+        <my-button
+          className="orange-button"
+          [label]="getAudioUploadLabel()"
+          icon="upload"
+          (click)="uploadAudio()"
+        >
+        </my-button>
      </div>
    </ng-container>
  </div>
@@ -64,6 +75,7 @@
      <span>{{ error }}</span>
    </div>
  </div>
  <div class="btn-group" role="group">
    <input type="button" class="btn" i18n-value="Retry failed upload of a video" value="Retry" (click)="retryUpload()" />
    <input type="button" class="btn" i18n-value="Cancel ongoing upload of a video" value="Cancel" (click)="cancelUpload()" />
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
index 9549257f6..d9f348a70 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
@@ -47,8 +47,4 @@
    margin-left: 10px;
  }
-  .btn-group > input:not(:first-child) {
-    margin-left: 0;
-  }
 }
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index effb37077..2d3fc3578 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -1,15 +1,16 @@
-import { Subscription } from 'rxjs'
-import { HttpErrorResponse, HttpEventType, HttpResponse } from '@angular/common/http'
 import { AfterViewInit, Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'
 import { Router } from '@angular/router'
+import { UploadxOptions, UploadState, UploadxService } from 'ngx-uploadx'
+import { UploaderXFormData } from './uploaderx-form-data'
 import { AuthService, CanComponentDeactivate, HooksService, Notifier, ServerService, UserService } from '@app/core'
-import { scrollToTop, uploadErrorHandler } from '@app/helpers'
+import { scrollToTop, genericUploadErrorHandler } from '@app/helpers'
 import { FormValidatorService } from '@app/shared/shared-forms'
 import { BytesPipe, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
 import { VideoPrivacy } from '@shared/models'
 import { VideoSend } from './video-send'
+import { HttpErrorResponse, HttpEventType, HttpHeaders } from '@angular/common/http'
 @Component({
  selector: 'my-video-upload',
@@ -20,23 +21,18 @@ import { VideoSend } from './video-send'
    './video-send.scss'
  ]
 })
-export class VideoUploadComponent extends VideoSend implements OnInit, AfterViewInit, OnDestroy, CanComponentDeactivate {
+export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy, AfterViewInit, CanComponentDeactivate {
  @Output() firstStepDone = new EventEmitter<string>()
  @Output() firstStepError = new EventEmitter<void>()
  @ViewChild('videofileInput') videofileInput: ElementRef<HTMLInputElement>
-  // So that it can be accessed in the template
-  readonly SPECIAL_SCHEDULED_PRIVACY = VideoEdit.SPECIAL_SCHEDULED_PRIVACY
  userVideoQuotaUsed = 0
  userVideoQuotaUsedDaily = 0
  isUploadingAudioFile = false
  isUploadingVideo = false
-  isUpdatingVideo = false
  videoUploaded = false
-  videoUploadObservable: Subscription = null
  videoUploadPercents = 0
  videoUploadedIds = {
    id: 0,
@@ -49,7 +45,13 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
  error: string
  enableRetryAfterError: boolean
+  // So that it can be accessed in the template
  protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PUBLIC
+  protected readonly BASE_VIDEO_UPLOAD_URL = VideoService.BASE_VIDEO_URL + 'upload-resumable'
+  private uploadxOptions: UploadxOptions
+  private isUpdatingVideo = false
+  private fileToUpload: File
  constructor (
    protected formValidatorService: FormValidatorService,
@@ -61,15 +63,77 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
    protected videoCaptionService: VideoCaptionService,
    private userService: UserService,
    private router: Router,
-    private hooks: HooksService
+    private hooks: HooksService,
-    ) {
+    private resumableUploadService: UploadxService
+  ) {
    super()
+    this.uploadxOptions = {
+      endpoint: this.BASE_VIDEO_UPLOAD_URL,
+      multiple: false,
+      token: this.authService.getAccessToken(),
+      uploaderClass: UploaderXFormData,
+      retryConfig: {
+        maxAttempts: 6,
+        shouldRetry: (code: number) => {
+          return code < 400 || code >= 501
+        }
+      }
+    }
  }
  get videoExtensions () {
    return this.serverConfig.video.file.extensions.join(', ')
  }
+  onUploadVideoOngoing (state: UploadState) {
+    switch (state.status) {
+      case 'error':
+        const error = state.response?.error || 'Unknow error'
+        this.handleUploadError({
+          error: new Error(error),
+          name: 'HttpErrorResponse',
+          message: error,
+          ok: false,
+          headers: new HttpHeaders(state.responseHeaders),
+          status: +state.responseStatus,
+          statusText: error,
+          type: HttpEventType.Response,
+          url: state.url
+        })
+        break
+      case 'cancelled':
+        this.isUploadingVideo = false
+        this.videoUploadPercents = 0
+        this.firstStepError.emit()
+        this.enableRetryAfterError = false
+        this.error = ''
+        break
+      case 'queue':
+        this.closeFirstStep(state.name)
+        break
+      case 'uploading':
+        this.videoUploadPercents = state.progress
+        break
+      case 'paused':
+        this.notifier.info($localize`Upload cancelled`)
+        break
+      case 'complete':
+        this.videoUploaded = true
+        this.videoUploadPercents = 100
+        this.videoUploadedIds = state?.response.video
+        break
+    }
+  }
  ngOnInit () {
    super.ngOnInit()
@@ -78,6 +142,9 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
          this.userVideoQuotaUsed = data.videoQuotaUsed
          this.userVideoQuotaUsedDaily = data.videoQuotaUsedDaily
        })
+    this.resumableUploadService.events
+      .subscribe(state => this.onUploadVideoOngoing(state))
  }
  ngAfterViewInit () {
@@ -85,7 +152,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
  }
  ngOnDestroy () {
-    if (this.videoUploadObservable) this.videoUploadObservable.unsubscribe()
+    this.cancelUpload()
  }
  canDeactivate () {
@@ -105,137 +172,43 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
    }
  }
-  getVideoFile () {
+  onFileDropped (files: FileList) {
-    return this.videofileInput.nativeElement.files[0]
-  }
-  setVideoFile (files: FileList) {
    this.videofileInput.nativeElement.files = files
-    this.fileChange()
-  }
-  getAudioUploadLabel () {
-    const videofile = this.getVideoFile()
-    if (!videofile) return $localize`Upload`
-    return $localize`Upload ${videofile.name}`
+    this.onFileChange({ target: this.videofileInput.nativeElement })
  }
-  fileChange () {
+  onFileChange (event: Event | { target: HTMLInputElement }) {
-    this.uploadFirstStep()
+    const file = (event.target as HTMLInputElement).files[0]
-  }
-  retryUpload () {
-    this.enableRetryAfterError = false
-    this.error = ''
-    this.uploadVideo()
-  }
-  cancelUpload () {
-    if (this.videoUploadObservable !== null) {
-      this.videoUploadObservable.unsubscribe()
-    }
-    this.isUploadingVideo = false
-    this.videoUploadPercents = 0
-    this.videoUploadObservable = null
-    this.firstStepError.emit()
+    if (!file) return
-    this.enableRetryAfterError = false
-    this.error = ''
-    this.notifier.info($localize`Upload cancelled`)
+    if (!this.checkGlobalUserQuota(file)) return
-  }
+    if (!this.checkDailyUserQuota(file)) return
-  uploadFirstStep (clickedOnButton = false) {
+    if (this.isAudioFile(file.name)) {
-    const videofile = this.getVideoFile()
-    if (!videofile) return
-    if (!this.checkGlobalUserQuota(videofile)) return
-    if (!this.checkDailyUserQuota(videofile)) return
-    if (clickedOnButton === false && this.isAudioFile(videofile.name)) {
      this.isUploadingAudioFile = true
      return
    }
-    // Build name field
-    const nameWithoutExtension = videofile.name.replace(/\.[^/.]+$/, '')
-    let name: string
-    // If the name of the file is very small, keep the extension
-    if (nameWithoutExtension.length < 3) name = videofile.name
-    else name = nameWithoutExtension
-    const nsfw = this.serverConfig.instance.isNSFW
-    const waitTranscoding = true
-    const commentsEnabled = true
-    const downloadEnabled = true
-    const channelId = this.firstStepChannelId.toString()
-    this.formData = new FormData()
-    this.formData.append('name', name)
-    // Put the video "private" -> we are waiting the user validation of the second step
-    this.formData.append('privacy', VideoPrivacy.PRIVATE.toString())
-    this.formData.append('nsfw', '' + nsfw)
-    this.formData.append('commentsEnabled', '' + commentsEnabled)
-    this.formData.append('downloadEnabled', '' + downloadEnabled)
-    this.formData.append('waitTranscoding', '' + waitTranscoding)
-    this.formData.append('channelId', '' + channelId)
-    this.formData.append('videofile', videofile)
-    if (this.previewfileUpload) {
-      this.formData.append('previewfile', this.previewfileUpload)
-      this.formData.append('thumbnailfile', this.previewfileUpload)
-    }
    this.isUploadingVideo = true
-    this.firstStepDone.emit(name)
+    this.fileToUpload = file
-    this.form.patchValue({
-      name,
-      privacy: this.firstStepPrivacyId,
-      nsfw,
-      channelId: this.firstStepChannelId,
-      previewfile: this.previewfileUpload
-    })
-    this.uploadVideo()
+    this.uploadFile(file)
  }
-  uploadVideo () {
+  uploadAudio () {
-    this.videoUploadObservable = this.videoService.uploadVideo(this.formData).subscribe(
+    this.uploadFile(this.getInputVideoFile(), this.previewfileUpload)
-      event => {
+  }
-        if (event.type === HttpEventType.UploadProgress) {
-          this.videoUploadPercents = Math.round(100 * event.loaded / event.total)
-        } else if (event instanceof HttpResponse) {
-          this.videoUploaded = true
-          this.videoUploadedIds = event.body.video
-          this.videoUploadObservable = null
-        }
-      },
-      (err: HttpErrorResponse) => {
+  retryUpload () {
-        // Reset progress (but keep isUploadingVideo true)
+    this.enableRetryAfterError = false
-        this.videoUploadPercents = 0
+    this.error = ''
-        this.videoUploadObservable = null
+    this.uploadFile(this.fileToUpload)
-        this.enableRetryAfterError = true
+  }
-        this.error = uploadErrorHandler({
-          err,
-          name: $localize`video`,
-          notifier: this.notifier,
-          sticky: false
-        })
-        if (err.status === HttpStatusCode.PAYLOAD_TOO_LARGE_413 ||
+  cancelUpload () {
-            err.status === HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) {
+    this.resumableUploadService.control({ action: 'cancel' })
-          this.cancelUpload()
-        }
-      }
-    )
  }
  isPublishingButtonDisabled () {
@@ -245,6 +218,13 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
      !this.videoUploadedIds.id
  }
+  getAudioUploadLabel () {
+    const videofile = this.getInputVideoFile()
+    if (!videofile) return $localize`Upload`
+    return $localize`Upload ${videofile.name}`
+  }
  updateSecondStep () {
    if (this.isPublishingButtonDisabled() || !this.checkForm()) {
      return
@@ -275,6 +255,62 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
        )
  }
+  private getInputVideoFile () {
+    return this.videofileInput.nativeElement.files[0]
+  }
+  private uploadFile (file: File, previewfile?: File) {
+    const metadata = {
+      waitTranscoding: true,
+      commentsEnabled: true,
+      downloadEnabled: true,
+      channelId: this.firstStepChannelId,
+      nsfw: this.serverConfig.instance.isNSFW,
+      privacy: VideoPrivacy.PRIVATE.toString(),
+      filename: file.name,
+      previewfile: previewfile as any
+    }
+    this.resumableUploadService.handleFiles(file, {
+      ...this.uploadxOptions,
+      metadata
+    })
+    this.isUploadingVideo = true
+  }
+  private handleUploadError (err: HttpErrorResponse) {
+    // Reset progress (but keep isUploadingVideo true)
+    this.videoUploadPercents = 0
+    this.enableRetryAfterError = true
+    this.error = genericUploadErrorHandler({
+      err,
+      name: $localize`video`,
+      notifier: this.notifier,
+      sticky: false
+    })
+    if (err.status === HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) {
+      this.cancelUpload()
+    }
+  }
+  private closeFirstStep (filename: string) {
+    const nameWithoutExtension = filename.replace(/\.[^/.]+$/, '')
+    const name = nameWithoutExtension.length < 3 ? filename : nameWithoutExtension
+    this.form.patchValue({
+      name,
+      privacy: this.firstStepPrivacyId,
+      nsfw: this.serverConfig.instance.isNSFW,
+      channelId: this.firstStepChannelId,
+      previewfile: this.previewfileUpload
+    })
+    this.firstStepDone.emit(name)
+  }
  private checkGlobalUserQuota (videofile: File) {
    const bytePipes = new BytesPipe()
@@ -285,8 +321,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
      const videoQuotaUsedBytes = bytePipes.transform(this.userVideoQuotaUsed, 0)
      const videoQuotaBytes = bytePipes.transform(videoQuota, 0)
-      const msg = $localize`Your video quota is exceeded with this video (
+      const msg = $localize`Your video quota is exceeded with this video (video size: ${videoSizeBytes}, used: ${videoQuotaUsedBytes}, quota: ${videoQuotaBytes})`
-video size: ${videoSizeBytes}, used: ${videoQuotaUsedBytes}, quota: ${videoQuotaBytes})`
      this.notifier.error(msg)
      return false
@@ -304,9 +339,7 @@ video size: ${videoSizeBytes}, used: ${videoQuotaUsedBytes}, quota: ${videoQuota
      const videoSizeBytes = bytePipes.transform(videofile.size, 0)
      const quotaUsedDailyBytes = bytePipes.transform(this.userVideoQuotaUsedDaily, 0)
      const quotaDailyBytes = bytePipes.transform(videoQuotaDaily, 0)
+      const msg = $localize`Your daily video quota is exceeded with this video (video size: ${videoSizeBytes}, used: ${quotaUsedDailyBytes}, quota: ${quotaDailyBytes})`
-      const msg = $localize`Your daily video quota is exceeded with this video (
-video size: ${videoSizeBytes}, used: ${quotaUsedDailyBytes}, quota: ${quotaDailyBytes})`
      this.notifier.error(msg)
      return false
diff --git a/client/src/app/+videos/+video-edit/video-add.module.ts b/client/src/app/+videos/+video-edit/video-add.module.ts
index da651119b..e836cf81e 100644
--- a/client/src/app/+videos/+video-edit/video-add.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core'
 import { CanDeactivateGuard } from '@app/core'
+import { UploadxModule } from 'ngx-uploadx'
 import { VideoEditModule } from './shared/video-edit.module'
 import { DragDropDirective } from './video-add-components/drag-drop.directive'
 import { VideoImportTorrentComponent } from './video-add-components/video-import-torrent.component'
@@ -13,7 +14,9 @@ import { VideoAddComponent } from './video-add.component'
  imports: [
    VideoAddRoutingModule,
-    VideoEditModule
+    VideoEditModule,
+    UploadxModule
  ],
  declarations: [
diff --git a/client/src/app/+videos/+video-edit/video-update.resolver.ts b/client/src/app/+videos/+video-edit/video-update.resolver.ts
index 276548b79..9172b78a8 100644
--- a/client/src/app/+videos/+video-edit/video-update.resolver.ts
+++ b/client/src/app/+videos/+video-edit/video-update.resolver.ts
@@ -2,7 +2,9 @@ import { forkJoin, of } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
-import { VideoCaptionService, VideoChannelService, VideoDetails, VideoService } from '@app/shared/shared-main'
+import { AuthService } from '@app/core'
+import { listUserChannels } from '@app/helpers'
+import { VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main'
 import { LiveVideoService } from '@app/shared/shared-video-live'
 @Injectable()
@@ -10,7 +12,7 @@ export class VideoUpdateResolver implements Resolve<any> {
  constructor (
    private videoService: VideoService,
    private liveVideoService: LiveVideoService,
-    private videoChannelService: VideoChannelService,
+    private authService: AuthService,
    private videoCaptionService: VideoCaptionService
  ) {
  }
@@ -31,17 +33,7 @@ export class VideoUpdateResolver implements Resolve<any> {
        .loadCompleteDescription(video.descriptionPath)
        .pipe(map(description => Object.assign(video, { description }))),
-      this.videoChannelService
+      listUserChannels(this.authService),
-        .listAccountVideoChannels(video.account)
-        .pipe(
-          map(result => result.data),
-          map(videoChannels => videoChannels.map(c => ({
-            id: c.id,
-            label: c.displayName,
-            support: c.support,
-            avatarPath: c.avatar?.path
-          })))
-        ),
      this.videoCaptionService
        .listCaptions(video.id)
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index e21ada0f1..0543564b4 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -40,8 +40,10 @@
  }
  .icon-menu {
-    background-color: pvar(--mainForegroundColor);
    mask-image: url('../assets/images/misc/menu.svg');
+    -webkit-mask-image: url('../assets/images/misc/menu.svg');
+    background-color: pvar(--mainForegroundColor);
    margin: 0 18px 0 20px;
    @media screen and (max-width: $mobile-view) {
diff --git a/client/src/app/helpers/utils.ts b/client/src/app/helpers/utils.ts
index a1747af3c..94f6def26 100644
--- a/client/src/app/helpers/utils.ts
+++ b/client/src/app/helpers/utils.ts
@@ -1,4 +1,4 @@
-import { map } from 'rxjs/operators'
+import { first, map } from 'rxjs/operators'
 import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { DatePipe } from '@angular/common'
 import { HttpErrorResponse } from '@angular/common/http'
@@ -23,20 +23,29 @@ function getParameterByName (name: string, url: string) {
 function listUserChannels (authService: AuthService) {
  return authService.userInformationLoaded
-    .pipe(map(() => {
+    .pipe(
-      const user = authService.getUser()
+      first(),
-      if (!user) return undefined
+      map(() => {
+        const user = authService.getUser()
-      const videoChannels = user.videoChannels
+        if (!user) return undefined
-      if (Array.isArray(videoChannels) === false) return undefined
+        const videoChannels = user.videoChannels
-      return videoChannels.map(c => ({
+        if (Array.isArray(videoChannels) === false) return undefined
-        id: c.id,
-        label: c.displayName,
+        return videoChannels
-        support: c.support,
+          .sort((a, b) => {
-        avatarPath: c.avatar?.path
+            if (a.updatedAt < b.updatedAt) return 1
-      }) as SelectChannelItem)
+            if (a.updatedAt > b.updatedAt) return -1
-    }))
+            return 0
+          })
+          .map(c => ({
+            id: c.id,
+            label: c.displayName,
+            support: c.support,
+            avatarPath: c.avatar?.path
+          }) as SelectChannelItem)
+      })
+    )
 }
 function getAbsoluteAPIUrl () {
@@ -167,8 +176,8 @@ function isXPercentInViewport (el: HTMLElement, percentVisible: number) {
  )
 }
-function uploadErrorHandler (parameters: {
+function genericUploadErrorHandler (parameters: {
-  err: HttpErrorResponse
+  err: Pick<HttpErrorResponse, 'message' | 'status' | 'headers'>
  name: string
  notifier: Notifier
  sticky?: boolean
@@ -180,6 +189,9 @@ function uploadErrorHandler (parameters: {
  if (err instanceof ErrorEvent) { // network error
    message = $localize`The connection was interrupted`
    notifier.error(message, title, null, sticky)
+  } else if (err.status === HttpStatusCode.INTERNAL_SERVER_ERROR_500) {
+    message = $localize`The server encountered an error`
+    notifier.error(message, title, null, sticky)
  } else if (err.status === HttpStatusCode.REQUEST_TIMEOUT_408) {
    message = $localize`Your ${name} file couldn't be transferred before the set timeout (usually 10min)`
    notifier.error(message, title, null, sticky)
@@ -210,5 +222,5 @@ export {
  isInViewport,
  isXPercentInViewport,
  listUserChannels,
-  uploadErrorHandler
+  genericUploadErrorHandler
 }
diff --git a/client/src/app/shared/shared-main/account/account.model.ts b/client/src/app/shared/shared-main/account/account.model.ts
index 6d9f0ee65..7b5611f35 100644
--- a/client/src/app/shared/shared-main/account/account.model.ts
+++ b/client/src/app/shared/shared-main/account/account.model.ts
@@ -4,8 +4,12 @@ import { Actor } from './actor.model'
 export class Account extends Actor implements ServerAccount {
  displayName: string
  description: string
+  updatedAt: Date | string
  nameWithHost: string
  nameWithHostForced: string
  mutedByUser: boolean
  mutedByInstance: boolean
  mutedServerByUser: boolean
@@ -30,6 +34,8 @@ export class Account extends Actor implements ServerAccount {
    this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
    this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true)
+    if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
    this.mutedByUser = false
    this.mutedByInstance = false
    this.mutedServerByUser = false
diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts
index 6ba0bb09e..2fccc472a 100644
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -12,7 +12,6 @@ export abstract class Actor implements ServerActor {
  followersCount: number
  createdAt: Date | string
-  updatedAt: Date | string
  avatar: ActorImage
@@ -55,7 +54,6 @@ export abstract class Actor implements ServerActor {
    this.followersCount = hash.followersCount
    if (hash.createdAt) this.createdAt = new Date(hash.createdAt.toString())
-    if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
    this.avatar = hash.avatar
    this.isLocal = Actor.IS_LOCAL(this.host)
diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss
index 09b5f95d7..22b24c853 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.scss
+++ b/client/src/app/shared/shared-main/buttons/button.component.scss
@@ -30,7 +30,7 @@ span[class$=-button] {
 .action-button {
  @include peertube-button-link;
-  @include button-with-icon(21px, 0, -1px);
+  @include button-with-icon(21px);
 }
 .orange-button {
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
index c40dd5311..a9dcf2fa2 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
@@ -16,6 +16,8 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
  banner: ActorImage
  bannerUrl: string
+  updatedAt: Date | string
  ownerAccount?: ServerAccount
  ownerBy?: string
@@ -59,6 +61,8 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
    this.videosCount = hash.videosCount
+    if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
    if (hash.viewsPerDay) {
      this.viewsPerDay = hash.viewsPerDay.map(v => ({ ...v, date: new Date(v.date) }))
    }
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
index e65261763..a89f1065a 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
@@ -40,23 +40,24 @@ export class VideoChannelService {
               )
  }
-  listAccountVideoChannels (
+  listAccountVideoChannels (options: {
-    account: Account,
+    account: Account
-    componentPagination?: ComponentPaginationLight,
+    componentPagination?: ComponentPaginationLight
-    withStats = false,
+    withStats?: boolean
+    sort?: string
    search?: string
-  ): Observable<ResultList<VideoChannel>> {
+  }): Observable<ResultList<VideoChannel>> {
+    const { account, componentPagination, withStats = false, sort, search } = options
    const pagination = componentPagination
      ? this.restService.componentPaginationToRestPagination(componentPagination)
      : { start: 0, count: 20 }
    let params = new HttpParams()
-    params = this.restService.addRestGetParams(params, pagination)
+    params = this.restService.addRestGetParams(params, pagination, sort)
    params = params.set('withStats', withStats + '')
-    if (search) {
+    if (search) params = params.set('search', search)
-      params = params.set('search', search)
-    }
    const url = AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels'
    return this.authHttp.get<ResultList<VideoChannelServer>>(url, { params })
diff --git a/client/src/app/shared/shared-search/advanced-search.model.ts b/client/src/app/shared/shared-search/advanced-search.model.ts
index 0e3924841..2c83f53b6 100644
--- a/client/src/app/shared/shared-search/advanced-search.model.ts
+++ b/client/src/app/shared/shared-search/advanced-search.model.ts
@@ -1,4 +1,4 @@
-import { BooleanBothQuery, SearchTargetType } from '@shared/models'
+import { BooleanBothQuery, BooleanQuery, SearchTargetType, VideosSearchQuery } from '@shared/models'
 export class AdvancedSearch {
  startDate: string // ISO 8601
@@ -21,6 +21,8 @@ export class AdvancedSearch {
  durationMin: number // seconds
  durationMax: number // seconds
+  isLive: BooleanQuery
  sort: string
  searchTarget: SearchTargetType
@@ -41,6 +43,8 @@ export class AdvancedSearch {
    tagsOneOf?: any
    tagsAllOf?: any
+    isLive?: BooleanQuery
    durationMin?: string
    durationMax?: string
    sort?: string
@@ -54,6 +58,8 @@ export class AdvancedSearch {
    this.originallyPublishedEndDate = options.originallyPublishedEndDate || undefined
    this.nsfw = options.nsfw || undefined
+    this.isLive = options.isLive || undefined
    this.categoryOneOf = options.categoryOneOf || undefined
    this.licenceOneOf = options.licenceOneOf || undefined
    this.languageOneOf = options.languageOneOf || undefined
@@ -94,6 +100,7 @@ export class AdvancedSearch {
    this.tagsAllOf = undefined
    this.durationMin = undefined
    this.durationMax = undefined
+    this.isLive = undefined
    this.sort = '-match'
  }
@@ -112,12 +119,16 @@ export class AdvancedSearch {
      tagsAllOf: this.tagsAllOf,
      durationMin: this.durationMin,
      durationMax: this.durationMax,
+      isLive: this.isLive,
      sort: this.sort,
      searchTarget: this.searchTarget
    }
  }
-  toAPIObject () {
+  toAPIObject (): VideosSearchQuery {
+    let isLive: boolean
+    if (this.isLive) isLive = this.isLive === 'true'
    return {
      startDate: this.startDate,
      endDate: this.endDate,
@@ -131,6 +142,7 @@ export class AdvancedSearch {
      tagsAllOf: this.tagsAllOf,
      durationMin: this.durationMin,
      durationMax: this.durationMax,
+      isLive,
      sort: this.sort,
      searchTarget: this.searchTarget
    }
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
index 5df89d019..0bbdff1e6 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
@@ -95,6 +95,7 @@ my-actor-avatar {
  .video-bottom {
    display: flex;
    width: 100%;
+    min-width: 1px;
  }
  .video-miniature-name {
@@ -145,6 +146,7 @@ my-actor-avatar {
  .video-bottom {
    display: flex;
+    min-width: 1px;
  }
  // We don't display avatar in row mode
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 89b6f0c4c..ae511aa02 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -402,7 +402,26 @@ ngx-loading-bar {
    }
    .admin-sub-header {
-      @include admin-sub-header-responsive;
+      flex-direction: column;
+      .form-sub-title {
+        margin-right: 0 !important;
+        margin-bottom: 10px;
+        text-align: center;
+      }
+      .admin-sub-nav {
+        display: block;
+        overflow-x: auto;
+        white-space: nowrap;
+        height: 50px;
+        padding: 10px 0;
+        width: 100%;
+        a {
+          margin-left: 5px;
+        }
+      }
    }
    my-markdown-textarea {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index b2083e516..06e55532a 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -336,20 +336,6 @@
  cursor: pointer;
 }
-@mixin select-arrow-down {
-  top: 50%;
-  right: calc(0% + 15px);
-  content: ' ';
-  height: 0;
-  width: 0;
-  position: absolute;
-  pointer-events: none;
-  border: 5px solid rgba(0, 0, 0, 0);
-  border-top-color: #000;
-  margin-top: -2px;
-  z-index: 100;
-}
 @mixin responsive-width ($width) {
  width: $width;
@@ -381,7 +367,17 @@
  }
  &::after {
-    @include select-arrow-down;
+    top: 50%;
+    right: calc(0% + 15px);
+    content: ' ';
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+    border: 5px solid rgba(0, 0, 0, 0);
+    border-top-color: #000;
+    margin-top: -2px;
+    z-index: 100;
  }
  select {
@@ -849,29 +845,6 @@
  }
 }
-@mixin admin-sub-header-responsive {
-  flex-direction: column;
-  .form-sub-title {
-    margin-right: 0 !important;
-    margin-bottom: 10px;
-    text-align: center;
-  }
-  .admin-sub-nav {
-    display: block;
-    overflow-x: auto;
-    white-space: nowrap;
-    height: 50px;
-    padding: 10px 0;
-    width: 100%;
-    a {
-      margin-left: 5px;
-    }
-  }
-}
 // applies ratio (default to 16:9) to a child element (using $selector) only using
 // an immediate's parent size. This allows to set a ratio without explicit
 // dimensions, as width/height cannot be computed from each other.
diff --git a/client/src/sass/player/context-menu.scss b/client/src/sass/player/context-menu.scss
index 45cee3e77..1738f486d 100644
--- a/client/src/sass/player/context-menu.scss
+++ b/client/src/sass/player/context-menu.scss
@@ -47,6 +47,7 @@ $context-menu-width: 350px;
      @each $icon in $icons {
        &[class$="-#{$icon}"] {
          mask-image: url('#{$assets-path}/player/images/#{$icon}.svg');
+          -webkit-mask-image: url('#{$assets-path}/player/images/#{$icon}.svg');
        }
      }
diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss
index 8fe2e054d..c010f7297 100644
--- a/client/src/sass/player/peertube-skin.scss
+++ b/client/src/sass/player/peertube-skin.scss
@@ -346,6 +346,8 @@ body {
        &.icon-next,
        &.icon-previous {
          mask-image: url('#{$assets-path}/player/images/next.svg');
+          -webkit-mask-image: url('#{$assets-path}/player/images/next.svg');
          background-color: #fff;
          mask-size: cover;
          width: 11px;
diff --git a/client/src/sass/player/playlist.scss b/client/src/sass/player/playlist.scss
index 8558fc837..3279bd263 100644
--- a/client/src/sass/player/playlist.scss
+++ b/client/src/sass/player/playlist.scss
@@ -40,10 +40,12 @@ $playlist-menu-width: 350px;
    }
    .cross {
+      mask-image: url('#{$assets-path}/images/feather/x.svg');
+      -webkit-mask-image: url('#{$assets-path}/images/feather/x.svg');
      cursor: pointer;
      width: 20px;
      height: 20px;
-      mask-image: url('#{$assets-path}/images/feather/x.svg');
      background-color: #fff;
      mask-size: cover;
    }
@@ -85,9 +87,11 @@ $playlist-menu-width: 350px;
 }
 .vjs-playlist-icon {
+  mask-image: url('#{$assets-path}/images/feather/list.svg');
+  -webkit-mask-image: url('#{$assets-path}/images/feather/list.svg');
  width: 22px;
  height: 22px;
-  mask-image: url('#{$assets-path}/images/feather/list.svg');
  background-color: #fff;
  mask-size: cover;
  margin-bottom: 3px;
diff --git a/client/yarn.lock b/client/yarn.lock
index 571314f22..1b1455cc8 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7793,6 +7793,13 @@ next-tick@~1.0.0:
  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+ngx-uploadx@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-uploadx/-/ngx-uploadx-4.1.0.tgz#b3ed4566a2505239026bbdc10c2345aae28d67df"
+  integrity sha512-KCG0NT4SBc/5MRl8aR6joHHg+WeTdrkhLeC1DrNgVxrTBuuenlEwOVDpkLJMPX/8HE6Bq33rx1U2NNZYVl9NMQ==
+  dependencies:
+    tslib "^1.9.0"
 nice-try@^1.0.4:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
diff --git a/engines.yaml b/engines.yaml
new file mode 100644
index 000000000..5a68ca4ba
--- /dev/null
+++ b/engines.yaml
@@ -0,0 +1,5 @@
+node: ">=12.x"
+yarn: ">=1.x"
+postgres: ">=10.x"
+redis-server: ">=2.8.18"
+ffmpeg: ">=4.1"
diff --git a/package.json b/package.json
index 2c4c478ac..d3375c7d4 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,8 @@
  "private": true,
  "licence": "AGPL-3.0",
  "engines": {
-    "node": ">=10.x",
+    "node": ">=12.x",
-    "yarn": ">=1.x",
+    "yarn": ">=1.x"
-    "postgres": ">=10.x",
-    "redis-server": ">=2.8.18",
-    "ffmpeg": ">=4.1"
  },
  "bin": {
    "peertube": "dist/server/tools/peertube.js"
@@ -76,6 +73,7 @@
    "swagger-cli": "swagger-cli"
  },
  "dependencies": {
+    "@uploadx/core": "^4.4.0",
    "apicache": "1.6.2",
    "async": "^3.0.1",
    "async-lru": "^1.1.1",
@@ -99,7 +97,7 @@
    "express-validator": "^6.4.0",
    "flat": "^5.0.0",
    "fluent-ffmpeg": "^2.1.0",
-    "fs-extra": "^9.0.0",
+    "fs-extra": "^10.0.0",
    "got": "^11.8.2",
    "helmet": "^4.1.0",
    "http-signature": "1.3.5",
@@ -113,7 +111,7 @@
    "lodash": "^4.17.10",
    "lru-cache": "^6.0.0",
    "magnet-uri": "^6.1.0",
-    "markdown-it": "12.0.4",
+    "markdown-it": "^12.0.4",
    "markdown-it-emoji": "^2.0.0",
    "memoizee": "^0.4.14",
    "morgan": "^1.5.3",
@@ -133,7 +131,7 @@
    "sanitize-html": "2.x",
    "sequelize": "6.6.2",
    "sequelize-typescript": "^2.0.0-beta.1",
-    "sitemap": "^6.1.0",
+    "sitemap": "^7.0.0",
    "socket.io": "^4.0.1",
    "sql-formatter": "^4.0.0-beta.0",
    "srt-to-vtt": "^1.1.2",
@@ -143,7 +141,7 @@
    "uuid": "^8.1.0",
    "validator": "^13.0.0",
    "webfinger.js": "^2.6.6",
-    "webtorrent": "^0.116.1",
+    "webtorrent": "^0.118.0",
    "winston": "3.3.3",
    "ws": "^7.0.0",
    "youtube-dl": "^3.0.2"
@@ -154,9 +152,9 @@
    "@types/async": "^3.0.0",
    "@types/async-lock": "^1.1.0",
    "@types/bcrypt": "^3.0.0",
-    "@types/bluebird": "3.5.33",
+    "@types/bluebird": "^3.5.33",
    "@types/body-parser": "^1.16.3",
-    "@types/bull": "3.15.0",
+    "@types/bull": "^3.15.0",
    "@types/bytes": "^3.0.0",
    "@types/chai": "^4.0.4",
    "@types/chai-json-schema": "^1.4.3",
diff --git a/scripts/ci.sh b/scripts/ci.sh
index a0de62d91..f4a200a00 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -44,7 +44,7 @@ if [ "$1" = "misc" ]; then
    pluginsFiles=$(findTestFiles server/tests/plugins)
    miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
-    TS_NODE_FILES=true runTest "$1" 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
+    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles
 elif [ "$1" = "cli" ]; then
    npm run build:server
    npm run setup:cli
diff --git a/server.ts b/server.ts
index 2531080a3..97dffe756 100644
--- a/server.ts
+++ b/server.ts
@@ -116,6 +116,7 @@ import { YoutubeDlUpdateScheduler } from './server/lib/schedulers/youtube-dl-upd
 import { VideosRedundancyScheduler } from './server/lib/schedulers/videos-redundancy-scheduler'
 import { RemoveOldHistoryScheduler } from './server/lib/schedulers/remove-old-history-scheduler'
 import { AutoFollowIndexInstances } from './server/lib/schedulers/auto-follow-index-instances'
+import { RemoveDanglingResumableUploadsScheduler } from './server/lib/schedulers/remove-dangling-resumable-uploads-scheduler'
 import { isHTTPSignatureDigestValid } from './server/helpers/peertube-crypto'
 import { PeerTubeSocket } from './server/lib/peertube-socket'
 import { updateStreamingPlaylistsInfohashesIfNeeded } from './server/lib/hls'
@@ -280,6 +281,7 @@ async function startApplication () {
  PluginsCheckScheduler.Instance.enable()
  PeerTubeVersionCheckScheduler.Instance.enable()
  AutoFollowIndexInstances.Instance.enable()
+  RemoveDanglingResumableUploadsScheduler.Instance.enable()
  // Redis initialization
  Redis.Instance.init()
diff --git a/server/controllers/api/server/debug.ts b/server/controllers/api/server/debug.ts
index 7787186be..ff0d9ca3c 100644
--- a/server/controllers/api/server/debug.ts
+++ b/server/controllers/api/server/debug.ts
@@ -1,4 +1,6 @@
 import { InboxManager } from '@server/lib/activitypub/inbox-manager'
+import { RemoveDanglingResumableUploadsScheduler } from '@server/lib/schedulers/remove-dangling-resumable-uploads-scheduler'
+import { SendDebugCommand } from '@shared/models'
 import * as express from 'express'
 import { UserRight } from '../../../../shared/models/users'
 import { authenticate, ensureUserHasRight } from '../../../middlewares'
@@ -11,6 +13,12 @@ debugRouter.get('/debug',
  getDebug
 )
+debugRouter.post('/debug/run-command',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_DEBUG),
+  runCommand
+)
 // ---------------------------------------------------------------------------
 export {
@@ -25,3 +33,13 @@ function getDebug (req: express.Request, res: express.Response) {
    activityPubMessagesWaiting: InboxManager.Instance.getActivityPubMessagesWaiting()
  })
 }
+async function runCommand (req: express.Request, res: express.Response) {
+  const body: SendDebugCommand = req.body
+  if (body.command === 'remove-dandling-resumable-uploads') {
+    await RemoveDanglingResumableUploadsScheduler.Instance.execute()
+  }
+  return res.sendStatus(204)
+}
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 6ec6478e4..c32626d30 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -2,6 +2,7 @@ import * as express from 'express'
 import { move } from 'fs-extra'
 import { extname } from 'path'
 import toInt from 'validator/lib/toInt'
+import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload'
 import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
 import { changeVideoChannelShare } from '@server/lib/activitypub/share'
 import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
@@ -10,8 +11,9 @@ import { addOptimizeOrMergeAudioJob, buildLocalVideoFromReq, buildVideoThumbnail
 import { generateVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
 import { getServerActor } from '@server/models/application/application'
 import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
+import { uploadx } from '@uploadx/core'
 import { VideoCreate, VideosCommonQuery, VideoState, VideoUpdate } from '../../../../shared'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs'
 import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger'
 import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils'
 import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils'
@@ -47,7 +49,9 @@ import {
  setDefaultPagination,
  setDefaultVideosSort,
  videoFileMetadataGetValidator,
-  videosAddValidator,
+  videosAddLegacyValidator,
+  videosAddResumableInitValidator,
+  videosAddResumableValidator,
  videosCustomGetValidator,
  videosGetValidator,
  videosRemoveValidator,
@@ -69,6 +73,7 @@ import { watchingRouter } from './watching'
 const lTags = loggerTagsFactory('api', 'video')
 const auditLogger = auditLoggerFactory('videos')
 const videosRouter = express.Router()
+const uploadxMiddleware = uploadx.upload({ directory: getResumableUploadPath() })
 const reqVideoFileAdd = createReqFiles(
  [ 'videofile', 'thumbnailfile', 'previewfile' ],
@@ -79,6 +84,16 @@ const reqVideoFileAdd = createReqFiles(
    previewfile: CONFIG.STORAGE.TMP_DIR
  }
 )
+const reqVideoFileAddResumable = createReqFiles(
+  [ 'thumbnailfile', 'previewfile' ],
+  MIMETYPES.IMAGE.MIMETYPE_EXT,
+  {
+    thumbnailfile: getResumableUploadPath(),
+    previewfile: getResumableUploadPath()
+  }
+)
 const reqVideoFileUpdate = createReqFiles(
  [ 'thumbnailfile', 'previewfile' ],
  MIMETYPES.IMAGE.MIMETYPE_EXT,
@@ -111,18 +126,39 @@ videosRouter.get('/',
  commonVideosFiltersValidator,
  asyncMiddleware(listVideos)
 )
+videosRouter.post('/upload',
+  authenticate,
+  reqVideoFileAdd,
+  asyncMiddleware(videosAddLegacyValidator),
+  asyncRetryTransactionMiddleware(addVideoLegacy)
+)
+videosRouter.post('/upload-resumable',
+  authenticate,
+  reqVideoFileAddResumable,
+  asyncMiddleware(videosAddResumableInitValidator),
+  uploadxMiddleware
+)
+videosRouter.delete('/upload-resumable',
+  authenticate,
+  uploadxMiddleware
+)
+videosRouter.put('/upload-resumable',
+  authenticate,
+  uploadxMiddleware, // uploadx doesn't use call next() before the file upload completes
+  asyncMiddleware(videosAddResumableValidator),
+  asyncMiddleware(addVideoResumable)
+)
 videosRouter.put('/:id',
  authenticate,
  reqVideoFileUpdate,
  asyncMiddleware(videosUpdateValidator),
  asyncRetryTransactionMiddleware(updateVideo)
 )
-videosRouter.post('/upload',
-  authenticate,
-  reqVideoFileAdd,
-  asyncMiddleware(videosAddValidator),
-  asyncRetryTransactionMiddleware(addVideo)
-)
 videosRouter.get('/:id/description',
  asyncMiddleware(videosGetValidator),
@@ -157,23 +193,23 @@ export {
 // ---------------------------------------------------------------------------
-function listVideoCategories (req: express.Request, res: express.Response) {
+function listVideoCategories (_req: express.Request, res: express.Response) {
  res.json(VIDEO_CATEGORIES)
 }
-function listVideoLicences (req: express.Request, res: express.Response) {
+function listVideoLicences (_req: express.Request, res: express.Response) {
  res.json(VIDEO_LICENCES)
 }
-function listVideoLanguages (req: express.Request, res: express.Response) {
+function listVideoLanguages (_req: express.Request, res: express.Response) {
  res.json(VIDEO_LANGUAGES)
 }
-function listVideoPrivacies (req: express.Request, res: express.Response) {
+function listVideoPrivacies (_req: express.Request, res: express.Response) {
  res.json(VIDEO_PRIVACIES)
 }
-async function addVideo (req: express.Request, res: express.Response) {
+async function addVideoLegacy (req: express.Request, res: express.Response) {
  // Uploading the video could be long
  // Set timeout to 10 minutes, as Express's default is 2 minutes
  req.setTimeout(1000 * 60 * 10, () => {
@@ -183,13 +219,42 @@ async function addVideo (req: express.Request, res: express.Response) {
  const videoPhysicalFile = req.files['videofile'][0]
  const videoInfo: VideoCreate = req.body
+  const files = req.files
+  return addVideo({ res, videoPhysicalFile, videoInfo, files })
+}
-  const videoData = buildLocalVideoFromReq(videoInfo, res.locals.videoChannel.id)
+async function addVideoResumable (_req: express.Request, res: express.Response) {
-  videoData.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED
+  const videoPhysicalFile = res.locals.videoFileResumable
-  videoData.duration = videoPhysicalFile['duration'] // duration was added by a previous middleware
+  const videoInfo = videoPhysicalFile.metadata
+  const files = { previewfile: videoInfo.previewfile }
+  // Don't need the meta file anymore
+  await deleteResumableUploadMetaFile(videoPhysicalFile.path)
+  return addVideo({ res, videoPhysicalFile, videoInfo, files })
+}
+async function addVideo (options: {
+  res: express.Response
+  videoPhysicalFile: express.VideoUploadFile
+  videoInfo: VideoCreate
+  files: express.UploadFiles
+}) {
+  const { res, videoPhysicalFile, videoInfo, files } = options
+  const videoChannel = res.locals.videoChannel
+  const user = res.locals.oauth.token.User
+  const videoData = buildLocalVideoFromReq(videoInfo, videoChannel.id)
+  videoData.state = CONFIG.TRANSCODING.ENABLED
+    ? VideoState.TO_TRANSCODE
+    : VideoState.PUBLISHED
+  videoData.duration = videoPhysicalFile.duration // duration was added by a previous middleware
  const video = new VideoModel(videoData) as MVideoFullLight
-  video.VideoChannel = res.locals.videoChannel
+  video.VideoChannel = videoChannel
  video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
  const videoFile = new VideoFileModel({
@@ -217,7 +282,7 @@ async function addVideo (req: express.Request, res: express.Response) {
  const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
    video,
-    files: req.files,
+    files,
    fallback: type => generateVideoMiniature({ video, videoFile, type })
  })
@@ -248,9 +313,12 @@ async function addVideo (req: express.Request, res: express.Response) {
      }, { transaction: t })
    }
+    // Channel has a new content, set as updated
+    await videoCreated.VideoChannel.setAsUpdated(t)
    await autoBlacklistVideoIfNeeded({
      video,
-      user: res.locals.oauth.token.User,
+      user,
      isRemote: false,
      isNew: true,
      transaction: t
@@ -279,7 +347,7 @@ async function addVideo (req: express.Request, res: express.Response) {
    .catch(err => logger.error('Cannot federate or notify video creation %s', video.url, { err, ...lTags(video.uuid) }))
  if (video.state === VideoState.TO_TRANSCODE) {
-    await addOptimizeOrMergeAudioJob(videoCreated, videoFile, res.locals.oauth.token.User)
+    await addOptimizeOrMergeAudioJob(videoCreated, videoFile, user)
  }
  Hooks.runAction('action:api.video.uploaded', { video: videoCreated })
diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts
index 921067e65..f0717bbbc 100644
--- a/server/controllers/feeds.ts
+++ b/server/controllers/feeds.ts
@@ -167,7 +167,7 @@ async function generateVideoFeed (req: express.Request, res: express.Response) {
    videoChannelId: videoChannel ? videoChannel.id : null
  }
-  const resultList = await VideoModel.listForApi({
+  const { data } = await VideoModel.listForApi({
    start,
    count: FEEDS.COUNT,
    sort: req.query.sort,
@@ -175,10 +175,11 @@ async function generateVideoFeed (req: express.Request, res: express.Response) {
    nsfw,
    filter: req.query.filter as VideoFilter,
    withFiles: true,
+    countVideos: false,
    ...options
  })
-  addVideosToFeed(feed, resultList.data)
+  addVideosToFeed(feed, data)
  // Now the feed generation is done, let's send it!
  return sendFeed(feed, req, res)
@@ -198,20 +199,22 @@ async function generateVideoFeedForSubscriptions (req: express.Request, res: exp
    queryString: new URL(WEBSERVER.URL + req.url).search
  })
-  const resultList = await VideoModel.listForApi({
+  const { data } = await VideoModel.listForApi({
    start,
    count: FEEDS.COUNT,
    sort: req.query.sort,
    includeLocalVideos: false,
    nsfw,
    filter: req.query.filter as VideoFilter,
    withFiles: true,
+    countVideos: false,
    followerActorId: res.locals.user.Account.Actor.id,
    user: res.locals.user
  })
-  addVideosToFeed(feed, resultList.data)
+  addVideosToFeed(feed, data)
  // Now the feed generation is done, let's send it!
  return sendFeed(feed, req, res)
diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts
index 877345157..675a7b663 100644
--- a/server/helpers/custom-validators/activitypub/actor.ts
+++ b/server/helpers/custom-validators/activitypub/actor.ts
@@ -1,6 +1,6 @@
 import validator from 'validator'
 import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
-import { exists, isArray } from '../misc'
+import { exists, isArray, isDateValid } from '../misc'
 import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
 import { isHostValid } from '../servers'
 import { peertubeTruncate } from '@server/helpers/core-utils'
@@ -47,7 +47,21 @@ function isActorPrivateKeyValid (privateKey: string) {
    validator.isLength(privateKey, CONSTRAINTS_FIELDS.ACTORS.PRIVATE_KEY)
 }
-function isActorObjectValid (actor: any) {
+function isActorFollowingCountValid (value: string) {
+  return exists(value) && validator.isInt('' + value, { min: 0 })
+}
+function isActorFollowersCountValid (value: string) {
+  return exists(value) && validator.isInt('' + value, { min: 0 })
+}
+function isActorDeleteActivityValid (activity: any) {
+  return isBaseActivityValid(activity, 'Delete')
+}
+function sanitizeAndCheckActorObject (actor: any) {
+  normalizeActor(actor)
  return exists(actor) &&
    isActivityPubUrlValid(actor.id) &&
    isActorTypeValid(actor.type) &&
@@ -68,24 +82,6 @@ function isActorObjectValid (actor: any) {
    (actor.type !== 'Group' || actor.attributedTo.length !== 0)
 }
-function isActorFollowingCountValid (value: string) {
-  return exists(value) && validator.isInt('' + value, { min: 0 })
-}
-function isActorFollowersCountValid (value: string) {
-  return exists(value) && validator.isInt('' + value, { min: 0 })
-}
-function isActorDeleteActivityValid (activity: any) {
-  return isBaseActivityValid(activity, 'Delete')
-}
-function sanitizeAndCheckActorObject (object: any) {
-  normalizeActor(object)
-  return isActorObjectValid(object)
-}
 function normalizeActor (actor: any) {
  if (!actor) return
@@ -95,6 +91,8 @@ function normalizeActor (actor: any) {
    actor.url = actor.url.href || actor.url.url
  }
+  if (!isDateValid(actor.published)) actor.published = undefined
  if (actor.summary && typeof actor.summary === 'string') {
    actor.summary = peertubeTruncate(actor.summary, { length: CONSTRAINTS_FIELDS.USERS.DESCRIPTION.max })
@@ -135,7 +133,6 @@ export {
  isActorPublicKeyValid,
  isActorPreferredUsernameValid,
  isActorPrivateKeyValid,
-  isActorObjectValid,
  isActorFollowingCountValid,
  isActorFollowersCountValid,
  isActorDeleteActivityValid,
diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts
index effdd98cb..fd3b45804 100644
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -1,6 +1,7 @@
 import 'multer'
-import validator from 'validator'
+import { UploadFilesForCheck } from 'express'
 import { sep } from 'path'
+import validator from 'validator'
 function exists (value: any) {
  return value !== undefined && value !== null
@@ -108,7 +109,7 @@ function isFileFieldValid (
 }
 function isFileMimeTypeValid (
-  files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
+  files: UploadFilesForCheck,
  mimeTypeRegex: string,
  field: string,
  optional = false
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 87966798f..b33e088eb 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -1,4 +1,6 @@
+import { UploadFilesForCheck } from 'express'
 import { values } from 'lodash'
+import * as magnetUtil from 'magnet-uri'
 import validator from 'validator'
 import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
 import {
@@ -6,13 +8,12 @@ import {
  MIMETYPES,
  VIDEO_CATEGORIES,
  VIDEO_LICENCES,
+  VIDEO_LIVE,
  VIDEO_PRIVACIES,
  VIDEO_RATE_TYPES,
-  VIDEO_STATES,
+  VIDEO_STATES
-  VIDEO_LIVE
 } from '../../initializers/constants'
 import { exists, isArray, isDateValid, isFileMimeTypeValid, isFileValid } from './misc'
-import * as magnetUtil from 'magnet-uri'
 const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS
@@ -81,7 +82,7 @@ function isVideoFileExtnameValid (value: string) {
  return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined)
 }
-function isVideoFileMimeTypeValid (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
+function isVideoFileMimeTypeValid (files: UploadFilesForCheck) {
  return isFileMimeTypeValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile')
 }
diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index 2b916efc2..f9cb33aca 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -1,8 +1,9 @@
 import * as retry from 'async/retry'
 import * as Bluebird from 'bluebird'
+import { QueryTypes, Transaction } from 'sequelize'
 import { Model } from 'sequelize-typescript'
+import { sequelizeTypescript } from '@server/initializers/database'
 import { logger } from './logger'
-import { Transaction } from 'sequelize'
 function retryTransactionWrapper <T, A, B, C, D> (
  functionToRetry: (arg1: A, arg2: B, arg3: C, arg4: D) => Promise<T> | Bluebird<T>,
@@ -96,6 +97,18 @@ function deleteNonExistingModels <T extends { hasSameUniqueKeysThan (other: T):
              .map(f => f.destroy({ transaction: t }))
 }
+// Sequelize always skip the update if we only update updatedAt field
+function setAsUpdated (table: string, id: number, transaction?: Transaction) {
+  return sequelizeTypescript.query(
+    `UPDATE "${table}" SET "updatedAt" = :updatedAt WHERE id = :id`,
+    {
+      replacements: { table, id, updatedAt: new Date() },
+      type: QueryTypes.UPDATE,
+      transaction
+    }
+  )
+}
 // ---------------------------------------------------------------------------
 export {
@@ -104,5 +117,6 @@ export {
  transactionRetryer,
  updateInstanceWithAnother,
  afterCommitIfTransaction,
-  deleteNonExistingModels
+  deleteNonExistingModels,
+  setAsUpdated
 }
diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index c0d3f8f32..ede22a3cc 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -2,7 +2,7 @@ import * as express from 'express'
 import * as multer from 'multer'
 import { REMOTE_SCHEME } from '../initializers/constants'
 import { logger } from './logger'
-import { deleteFileAsync, generateRandomString } from './utils'
+import { deleteFileAndCatch, generateRandomString } from './utils'
 import { extname } from 'path'
 import { isArray } from './custom-validators/misc'
 import { CONFIG } from '../initializers/config'
@@ -36,15 +36,15 @@ function cleanUpReqFiles (req: { files: { [fieldname: string]: Express.Multer.Fi
  if (!files) return
  if (isArray(files)) {
-    (files as Express.Multer.File[]).forEach(f => deleteFileAsync(f.path))
+    (files as Express.Multer.File[]).forEach(f => deleteFileAndCatch(f.path))
    return
  }
  for (const key of Object.keys(files)) {
    const file = files[key]
-    if (isArray(file)) file.forEach(f => deleteFileAsync(f.path))
+    if (isArray(file)) file.forEach(f => deleteFileAndCatch(f.path))
-    else deleteFileAsync(file.path)
+    else deleteFileAndCatch(file.path)
  }
 }
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts
index 75297df8f..25d9d4951 100644
--- a/server/helpers/ffmpeg-utils.ts
+++ b/server/helpers/ffmpeg-utils.ts
@@ -679,10 +679,16 @@ function getFFmpegVersion () {
      return execPromise(`${ffmpegPath} -version`)
        .then(stdout => {
-          const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+\.\d+)/)
+          const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+(\.\d+)?)/)
          if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`))
-          return res(parsed[1])
+          // Fix ffmpeg version that does not include patch version (4.4 for example)
+          let version = parsed[1]
+          if (version.match(/^\d+\.\d+$/)) {
+            version += '.0'
+          }
+          return res(version)
        })
        .catch(err => rej(err))
    })
diff --git a/server/helpers/upload.ts b/server/helpers/upload.ts
new file mode 100644
index 000000000..030a6b7d5
--- /dev/null
+++ b/server/helpers/upload.ts
@@ -0,0 +1,21 @@
+import { METAFILE_EXTNAME } from '@uploadx/core'
+import { remove } from 'fs-extra'
+import { join } from 'path'
+import { RESUMABLE_UPLOAD_DIRECTORY } from '../initializers/constants'
+function getResumableUploadPath (filename?: string) {
+  if (filename) return join(RESUMABLE_UPLOAD_DIRECTORY, filename)
+  return RESUMABLE_UPLOAD_DIRECTORY
+}
+function deleteResumableUploadMetaFile (filepath: string) {
+  return remove(filepath + METAFILE_EXTNAME)
+}
+// ---------------------------------------------------------------------------
+export {
+  getResumableUploadPath,
+  deleteResumableUploadMetaFile
+}
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 0545e8996..6c95a43b6 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -6,7 +6,7 @@ import { CONFIG } from '../initializers/config'
 import { execPromise, execPromise2, randomBytesPromise, sha256 } from './core-utils'
 import { logger } from './logger'
-function deleteFileAsync (path: string) {
+function deleteFileAndCatch (path: string) {
  remove(path)
    .catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err }))
 }
@@ -83,7 +83,7 @@ function getUUIDFromFilename (filename: string) {
 // ---------------------------------------------------------------------------
 export {
-  deleteFileAsync,
+  deleteFileAndCatch,
  generateRandomString,
  getFormattedObjects,
  getSecureTorrentName,
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index d390fd95e..6f388420e 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -24,7 +24,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
 // ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 640
+const LAST_MIGRATION_VERSION = 645
 // ---------------------------------------------------------------------------
@@ -208,7 +208,8 @@ const SCHEDULER_INTERVALS_MS = {
  autoFollowIndexInstances: 60000 * 60 * 24, // 1 day
  removeOldViews: 60000 * 60 * 24, // 1 day
  removeOldHistory: 60000 * 60 * 24, // 1 day
-  updateInboxStats: 1000 * 60// 1 minute
+  updateInboxStats: 1000 * 60, // 1 minute
+  removeDanglingResumableUploads: 60000 * 60 * 16 // 16 hours
 }
 // ---------------------------------------------------------------------------
@@ -285,6 +286,7 @@ const CONSTRAINTS_FIELDS = {
    LIKES: { min: 0 },
    DISLIKES: { min: 0 },
    FILE_SIZE: { min: -1 },
+    PARTIAL_UPLOAD_SIZE: { max: 50 * 1024 * 1024 * 1024 }, // 50GB
    URL: { min: 3, max: 2000 } // Length
  },
  VIDEO_PLAYLISTS: {
@@ -645,6 +647,7 @@ const LRU_CACHE = {
  }
 }
+const RESUMABLE_UPLOAD_DIRECTORY = join(CONFIG.STORAGE.TMP_DIR, 'resumable-uploads')
 const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls')
 const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls')
@@ -819,6 +822,7 @@ export {
  PEERTUBE_VERSION,
  LAZY_STATIC_PATHS,
  SEARCH_INDEX,
+  RESUMABLE_UPLOAD_DIRECTORY,
  HLS_REDUNDANCY_DIRECTORY,
  P2P_MEDIA_LOADER_PEER_VERSION,
  ACTOR_IMAGES_SIZE,
diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index cb58454cb..8dcff64e2 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -6,7 +6,7 @@ import { UserModel } from '../models/account/user'
 import { ApplicationModel } from '../models/application/application'
 import { OAuthClientModel } from '../models/oauth/oauth-client'
 import { applicationExist, clientsExist, usersExist } from './checker-after-init'
-import { FILES_CACHE, HLS_STREAMING_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION } from './constants'
+import { FILES_CACHE, HLS_STREAMING_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION, RESUMABLE_UPLOAD_DIRECTORY } from './constants'
 import { sequelizeTypescript } from './database'
 import { ensureDir, remove } from 'fs-extra'
 import { CONFIG } from './config'
@@ -79,6 +79,9 @@ function createDirectoriesIfNotExist () {
  // Playlist directories
  tasks.push(ensureDir(HLS_STREAMING_PLAYLIST_DIRECTORY))
+  // Resumable upload directory
+  tasks.push(ensureDir(RESUMABLE_UPLOAD_DIRECTORY))
  return Promise.all(tasks)
 }
diff --git a/server/initializers/migrations/0645-actor-remote-creation-date.ts b/server/initializers/migrations/0645-actor-remote-creation-date.ts
new file mode 100644
index 000000000..38b3b881c
--- /dev/null
+++ b/server/initializers/migrations/0645-actor-remote-creation-date.ts
@@ -0,0 +1,26 @@
+import * as Sequelize from 'sequelize'
+async function up (utils: {
+  transaction: Sequelize.Transaction
+  queryInterface: Sequelize.QueryInterface
+  sequelize: Sequelize.Sequelize
+  db: any
+}): Promise<void> {
+  {
+    const data = {
+      type: Sequelize.DATE,
+      defaultValue: null,
+      allowNull: true
+    }
+    await utils.queryInterface.addColumn('actor', 'remoteCreatedAt', data)
+  }
+}
+function down (options) {
+  throw new Error('Not implemented.')
+}
+export {
+  up,
+  down
+}
diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index eec951d4e..5fe7381c9 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -165,6 +165,8 @@ async function updateActorInstance (actorInstance: ActorModel, attributes: Activ
  actorInstance.followersUrl = attributes.followers
  actorInstance.followingUrl = attributes.following
+  if (attributes.published) actorInstance.remoteCreatedAt = new Date(attributes.published)
  if (attributes.endpoints?.sharedInbox) {
    actorInstance.sharedInboxUrl = attributes.endpoints.sharedInbox
  }
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index 506204674..15726f90b 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -697,6 +697,9 @@ async function createVideo (videoObject: VideoObject, channel: MChannelAccountLi
        videoCreated.VideoLive = await videoLive.save({ transaction: t })
      }
+      // We added a video in this channel, set it as updated
+      await channel.setAsUpdated(t)
      const autoBlacklisted = await autoBlacklistVideoIfNeeded({
        video: videoCreated,
        user: undefined,
diff --git a/server/lib/hls.ts b/server/lib/hls.ts
index 84539e2c1..05be403f3 100644
--- a/server/lib/hls.ts
+++ b/server/lib/hls.ts
@@ -50,13 +50,12 @@ async function updateMasterHLSPlaylist (video: MVideoWithFile) {
    let line = `#EXT-X-STREAM-INF:${bandwidth},${resolution}`
    if (file.fps) line += ',FRAME-RATE=' + file.fps
-    const videoCodec = await getVideoStreamCodec(videoFilePath)
+    const codecs = await Promise.all([
-    line += `,CODECS="${videoCodec}`
+      getVideoStreamCodec(videoFilePath),
+      getAudioStreamCodec(videoFilePath)
+    ])
-    const audioCodec = await getAudioStreamCodec(videoFilePath)
+    line += `,CODECS="${codecs.filter(c => !!c).join(',')}"`
-    if (audioCodec) line += `,${audioCodec}`
-    line += '"'
    masterPlaylists.push(line)
    masterPlaylists.push(VideoStreamingPlaylistModel.getHlsPlaylistFilename(file.resolution))
diff --git a/server/lib/moderation.ts b/server/lib/moderation.ts
index 5180b3299..925d64902 100644
--- a/server/lib/moderation.ts
+++ b/server/lib/moderation.ts
@@ -1,6 +1,8 @@
+import { VideoUploadFile } from 'express'
 import { PathLike } from 'fs-extra'
 import { Transaction } from 'sequelize/types'
 import { AbuseAuditView, auditLoggerFactory } from '@server/helpers/audit-logger'
+import { afterCommitIfTransaction } from '@server/helpers/database-utils'
 import { logger } from '@server/helpers/logger'
 import { AbuseModel } from '@server/models/abuse/abuse'
 import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
@@ -28,7 +30,6 @@ import { VideoModel } from '../models/video/video'
 import { VideoCommentModel } from '../models/video/video-comment'
 import { sendAbuse } from './activitypub/send/send-flag'
 import { Notifier } from './notifier'
-import { afterCommitIfTransaction } from '@server/helpers/database-utils'
 export type AcceptResult = {
  accepted: boolean
@@ -38,7 +39,7 @@ export type AcceptResult = {
 // Can be filtered by plugins
 function isLocalVideoAccepted (object: {
  videoBody: VideoCreate
-  videoFile: Express.Multer.File & { duration?: number }
+  videoFile: VideoUploadFile
  user: UserModel
 }): AcceptResult {
  return { accepted: true }
diff --git a/server/lib/plugins/plugin-helpers-builder.ts b/server/lib/plugins/plugin-helpers-builder.ts
index d57c69ef0..f1bc24d8b 100644
--- a/server/lib/plugins/plugin-helpers-builder.ts
+++ b/server/lib/plugins/plugin-helpers-builder.ts
@@ -17,6 +17,7 @@ import { VideoBlacklistCreate } from '@shared/models'
 import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../blocklist'
 import { getServerConfig } from '../config'
 import { blacklistVideo, unblacklistVideo } from '../video-blacklist'
+import { UserModel } from '@server/models/account/user'
 function buildPluginHelpers (pluginModel: MPlugin, npmName: string): PeerTubeHelpers {
  const logger = buildPluginLogger(npmName)
@@ -163,6 +164,11 @@ function buildPluginRelatedHelpers (plugin: MPlugin, npmName: string) {
 function buildUserHelpers () {
  return {
-    getAuthUser: (res: express.Response) => res.locals.oauth?.token?.User
+    getAuthUser: (res: express.Response) => {
+      const user = res.locals.oauth?.token?.User
+      if (!user) return undefined
+      return UserModel.loadByIdFull(user.id)
+    }
  }
 }
diff --git a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts
new file mode 100644
index 000000000..1acea7998
--- /dev/null
+++ b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts
@@ -0,0 +1,61 @@
+import * as bluebird from 'bluebird'
+import { readdir, remove, stat } from 'fs-extra'
+import { logger, loggerTagsFactory } from '@server/helpers/logger'
+import { getResumableUploadPath } from '@server/helpers/upload'
+import { SCHEDULER_INTERVALS_MS } from '@server/initializers/constants'
+import { METAFILE_EXTNAME } from '@uploadx/core'
+import { AbstractScheduler } from './abstract-scheduler'
+const lTags = loggerTagsFactory('scheduler', 'resumable-upload', 'cleaner')
+export class RemoveDanglingResumableUploadsScheduler extends AbstractScheduler {
+  private static instance: AbstractScheduler
+  private lastExecutionTimeMs: number
+  protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.removeDanglingResumableUploads
+  private constructor () {
+    super()
+    this.lastExecutionTimeMs = new Date().getTime()
+  }
+  protected async internalExecute () {
+    const path = getResumableUploadPath()
+    const files = await readdir(path)
+    const metafiles = files.filter(f => f.endsWith(METAFILE_EXTNAME))
+    if (metafiles.length === 0) return
+    logger.debug('Reading resumable video upload folder %s with %d files', path, metafiles.length, lTags())
+    try {
+      await bluebird.map(metafiles, metafile => {
+        return this.deleteIfOlderThan(metafile, this.lastExecutionTimeMs)
+      }, { concurrency: 5 })
+    } catch (error) {
+      logger.error('Failed to handle file during resumable video upload folder cleanup', { error, ...lTags() })
+    } finally {
+      this.lastExecutionTimeMs = new Date().getTime()
+    }
+  }
+  private async deleteIfOlderThan (metafile: string, olderThan: number) {
+    const metafilePath = getResumableUploadPath(metafile)
+    const statResult = await stat(metafilePath)
+    // Delete uploads that started since a long time
+    if (statResult.ctimeMs < olderThan) {
+      await remove(metafilePath)
+      const datafile = metafilePath.replace(new RegExp(`${METAFILE_EXTNAME}$`), '')
+      await remove(datafile)
+    }
+  }
+  static get Instance () {
+    return this.instance || (this.instance = new this())
+  }
+}
diff --git a/server/lib/video.ts b/server/lib/video.ts
index 9469b8178..21e4b7ff2 100644
--- a/server/lib/video.ts
+++ b/server/lib/video.ts
@@ -1,3 +1,4 @@
+import { UploadFiles } from 'express'
 import { Transaction } from 'sequelize/types'
 import { DEFAULT_AUDIO_RESOLUTION, JOB_PRIORITY } from '@server/initializers/constants'
 import { sequelizeTypescript } from '@server/initializers/database'
@@ -32,7 +33,7 @@ function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): Fil
 async function buildVideoThumbnailsFromReq (options: {
  video: MVideoThumbnail
-  files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[]
+  files: UploadFiles
  fallback: (type: ThumbnailType) => Promise<MThumbnail>
  automaticallyGenerated?: boolean
 }) {
diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts
index bb617d77c..d26bcd4a6 100644
--- a/server/middlewares/validators/videos/videos.ts
+++ b/server/middlewares/validators/videos/videos.ts
@@ -1,9 +1,10 @@
 import * as express from 'express'
-import { body, param, query, ValidationChain } from 'express-validator'
+import { body, header, param, query, ValidationChain } from 'express-validator'
+import { getResumableUploadPath } from '@server/helpers/upload'
 import { isAbleToUploadVideo } from '@server/lib/user'
 import { getServerActor } from '@server/models/application/application'
 import { ExpressPromiseHandler } from '@server/types/express'
-import { MVideoWithRights } from '@server/types/models'
+import { MUserAccountId, MVideoWithRights } from '@server/types/models'
 import { ServerErrorCode, UserRight, VideoChangeOwnershipStatus, VideoPrivacy } from '../../../../shared'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import { VideoChangeOwnershipAccept } from '../../../../shared/models/videos/video-change-ownership-accept.model'
@@ -47,6 +48,7 @@ import {
  doesVideoExist,
  doesVideoFileOfVideoExist
 } from '../../../helpers/middlewares'
+import { deleteFileAndCatch } from '../../../helpers/utils'
 import { getVideoWithAttributes } from '../../../helpers/video'
 import { CONFIG } from '../../../initializers/config'
 import { CONSTRAINTS_FIELDS, OVERVIEWS } from '../../../initializers/constants'
@@ -57,7 +59,7 @@ import { VideoModel } from '../../../models/video/video'
 import { authenticatePromiseIfNeeded } from '../../auth'
 import { areValidationErrors } from '../utils'
-const videosAddValidator = getCommonVideoEditAttributes().concat([
+const videosAddLegacyValidator = getCommonVideoEditAttributes().concat([
  body('videofile')
    .custom((value, { req }) => isFileFieldValid(req.files, 'videofile'))
    .withMessage('Should have a file'),
@@ -73,54 +75,117 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([
    logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files })
    if (areValidationErrors(req, res)) return cleanUpReqFiles(req)
-    if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req)
-    const videoFile: Express.Multer.File & { duration?: number } = req.files['videofile'][0]
+    const videoFile: express.VideoUploadFile = req.files['videofile'][0]
    const user = res.locals.oauth.token.User
-    if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req)
+    if (!await commonVideoChecksPass({ req, res, user, videoFileSize: videoFile.size, files: req.files })) {
-    if (!isVideoFileMimeTypeValid(req.files)) {
-      res.status(HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415)
-         .json({
-           error: 'This file is not supported. Please, make sure it is of the following type: ' +
-                  CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ')
-         })
      return cleanUpReqFiles(req)
    }
-    if (!isVideoFileSizeValid(videoFile.size.toString())) {
+    try {
-      res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413)
+      if (!videoFile.duration) await addDurationToVideo(videoFile)
-         .json({
+    } catch (err) {
-           error: 'This file is too large.'
+      logger.error('Invalid input file in videosAddLegacyValidator.', { err })
-         })
+      res.status(HttpStatusCode.UNPROCESSABLE_ENTITY_422)
+         .json({ error: 'Video file unreadable.' })
      return cleanUpReqFiles(req)
    }
-    if (await isAbleToUploadVideo(user.id, videoFile.size) === false) {
+    if (!await isVideoAccepted(req, res, videoFile)) return cleanUpReqFiles(req)
-      res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413)
-         .json({ error: 'The user video quota is exceeded with this video.' })
-      return cleanUpReqFiles(req)
+    return next()
-    }
+  }
+])
+/**
+ * Gets called after the last PUT request
+ */
+const videosAddResumableValidator = [
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    const user = res.locals.oauth.token.User
+    const body: express.CustomUploadXFile<express.UploadXFileMetadata> = req.body
+    const file = { ...body, duration: undefined, path: getResumableUploadPath(body.id), filename: body.metadata.filename }
+    const cleanup = () => deleteFileAndCatch(file.path)
-    let duration: number
+    if (!await doesVideoChannelOfAccountExist(file.metadata.channelId, user, res)) return cleanup()
    try {
-      duration = await getDurationFromVideoFile(videoFile.path)
+      if (!file.duration) await addDurationToVideo(file)
    } catch (err) {
-      logger.error('Invalid input file in videosAddValidator.', { err })
+      logger.error('Invalid input file in videosAddResumableValidator.', { err })
      res.status(HttpStatusCode.UNPROCESSABLE_ENTITY_422)
         .json({ error: 'Video file unreadable.' })
-      return cleanUpReqFiles(req)
+      return cleanup()
    }
-    videoFile.duration = duration
+    if (!await isVideoAccepted(req, res, file)) return cleanup()
-    if (!await isVideoAccepted(req, res, videoFile)) return cleanUpReqFiles(req)
+    res.locals.videoFileResumable = file
+    return next()
+  }
+]
+/**
+ * File is created in POST initialisation, and its body is saved as a 'metadata' field is saved by uploadx for later use.
+ * see https://github.com/kukhariev/node-uploadx/blob/dc9fb4a8ac5a6f481902588e93062f591ec6ef03/packages/core/src/handlers/uploadx.ts
+ *
+ * Uploadx doesn't use next() until the upload completes, so this middleware has to be placed before uploadx
+ * see https://github.com/kukhariev/node-uploadx/blob/dc9fb4a8ac5a6f481902588e93062f591ec6ef03/packages/core/src/handlers/base-handler.ts
+ *
+ */
+const videosAddResumableInitValidator = getCommonVideoEditAttributes().concat([
+  body('filename')
+    .isString()
+    .exists()
+    .withMessage('Should have a valid filename'),
+  body('name')
+    .trim()
+    .custom(isVideoNameValid)
+    .withMessage('Should have a valid name'),
+  body('channelId')
+    .customSanitizer(toIntOrNull)
+    .custom(isIdValid).withMessage('Should have correct video channel id'),
+  header('x-upload-content-length')
+    .isNumeric()
+    .exists()
+    .withMessage('Should specify the file length'),
+  header('x-upload-content-type')
+    .isString()
+    .exists()
+    .withMessage('Should specify the file mimetype'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    const videoFileMetadata = {
+      mimetype: req.headers['x-upload-content-type'] as string,
+      size: +req.headers['x-upload-content-length'],
+      originalname: req.body.name
+    }
+    const user = res.locals.oauth.token.User
+    const cleanup = () => cleanUpReqFiles(req)
+    logger.debug('Checking videosAddResumableInitValidator parameters and headers', {
+      parameters: req.body,
+      headers: req.headers,
+      files: req.files
+    })
+    if (areValidationErrors(req, res)) return cleanup()
+    const files = { videofile: [ videoFileMetadata ] }
+    if (!await commonVideoChecksPass({ req, res, user, videoFileSize: videoFileMetadata.size, files })) return cleanup()
+    // multer required unsetting the Content-Type, now we can set it for node-uploadx
+    req.headers['content-type'] = 'application/json; charset=utf-8'
+    // place previewfile in metadata so that uploadx saves it in .META
+    if (req.files['previewfile']) req.body.previewfile = req.files['previewfile']
    return next()
  }
@@ -478,7 +543,10 @@ const commonVideosFiltersValidator = [
 // ---------------------------------------------------------------------------
 export {
-  videosAddValidator,
+  videosAddLegacyValidator,
+  videosAddResumableValidator,
+  videosAddResumableInitValidator,
  videosUpdateValidator,
  videosGetValidator,
  videoFileMetadataGetValidator,
@@ -515,7 +583,51 @@ function areErrorsInScheduleUpdate (req: express.Request, res: express.Response)
  return false
 }
-async function isVideoAccepted (req: express.Request, res: express.Response, videoFile: Express.Multer.File & { duration?: number }) {
+async function commonVideoChecksPass (parameters: {
+  req: express.Request
+  res: express.Response
+  user: MUserAccountId
+  videoFileSize: number
+  files: express.UploadFilesForCheck
+}): Promise<boolean> {
+  const { req, res, user, videoFileSize, files } = parameters
+  if (areErrorsInScheduleUpdate(req, res)) return false
+  if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return false
+  if (!isVideoFileMimeTypeValid(files)) {
+    res.status(HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415)
+        .json({
+          error: 'This file is not supported. Please, make sure it is of the following type: ' +
+                CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ')
+        })
+    return false
+  }
+  if (!isVideoFileSizeValid(videoFileSize.toString())) {
+    res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413)
+        .json({ error: 'This file is too large. It exceeds the maximum file size authorized.' })
+    return false
+  }
+  if (await isAbleToUploadVideo(user.id, videoFileSize) === false) {
+    res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413)
+        .json({ error: 'The user video quota is exceeded with this video.' })
+    return false
+  }
+  return true
+}
+export async function isVideoAccepted (
+  req: express.Request,
+  res: express.Response,
+  videoFile: express.VideoUploadFile
+) {
  // Check we accept this video
  const acceptParameters = {
    videoBody: req.body,
@@ -538,3 +650,11 @@ async function isVideoAccepted (req: express.Request, res: express.Response, vid
  return true
 }
+async function addDurationToVideo (videoFile: { path: string, duration?: number }) {
+  const duration: number = await getDurationFromVideoFile(videoFile.path)
+  if (isNaN(duration)) throw new Error(`Couldn't get video duration`)
+  videoFile.duration = duration
+}
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 312451abe..d33353af7 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -411,7 +411,6 @@ export class AccountModel extends Model {
      id: this.id,
      displayName: this.getDisplayName(),
      description: this.description,
-      createdAt: this.createdAt,
      updatedAt: this.updatedAt,
      userId: this.userId ? this.userId : undefined
    }
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index 00c6d73aa..513455773 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -565,6 +565,10 @@ export class UserModel extends Model {
    return UserModel.unscoped().findByPk(id)
  }
+  static loadByIdFull (id: number): Promise<MUserDefault> {
+    return UserModel.findByPk(id)
+  }
  static loadByIdWithChannels (id: number, withStats = false): Promise<MUserDefault> {
    const scopes = [
      ScopeNames.WITH_VIDEOCHANNELS
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts
index 19f3f7e04..1af9efac2 100644
--- a/server/models/activitypub/actor.ts
+++ b/server/models/activitypub/actor.ts
@@ -69,9 +69,7 @@ export const unusedActorAttributesForAPI = [
  'outboxUrl',
  'sharedInboxUrl',
  'followersUrl',
-  'followingUrl',
+  'followingUrl'
-  'createdAt',
-  'updatedAt'
 ]
 @DefaultScope(() => ({
@@ -222,6 +220,10 @@ export class ActorModel extends Model {
  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACTORS.URL.max))
  followingUrl: string
+  @AllowNull(true)
+  @Column
+  remoteCreatedAt: Date
  @CreatedAt
  createdAt: Date
@@ -555,8 +557,7 @@ export class ActorModel extends Model {
      followingCount: this.followingCount,
      followersCount: this.followersCount,
      banner,
-      createdAt: this.createdAt,
+      createdAt: this.getCreatedAt()
-      updatedAt: this.updatedAt
    })
  }
@@ -608,6 +609,7 @@ export class ActorModel extends Model {
        owner: this.url,
        publicKeyPem: this.publicKey
      },
+      published: this.getCreatedAt().toISOString(),
      icon,
      image
    }
@@ -690,4 +692,8 @@ export class ActorModel extends Model {
    return isOutdated(this, ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL)
  }
+  getCreatedAt (this: MActorAPChannel | MActorAPAccount | MActorFormattable) {
+    return this.remoteCreatedAt || this.createdAt
+  }
 }
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index b7ffbd3b1..081b21f2d 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -1,4 +1,4 @@
-import { FindOptions, Includeable, literal, Op, QueryTypes, ScopeOptions } from 'sequelize'
+import { FindOptions, Includeable, literal, Op, QueryTypes, ScopeOptions, Transaction } from 'sequelize'
 import {
  AllowNull,
  BeforeDestroy,
@@ -17,6 +17,7 @@ import {
  Table,
  UpdatedAt
 } from 'sequelize-typescript'
+import { setAsUpdated } from '@server/helpers/database-utils'
 import { MAccountActor } from '@server/types/models'
 import { ActivityPubActor } from '../../../shared/models/activitypub'
 import { VideoChannel, VideoChannelSummary } from '../../../shared/models/videos'
@@ -653,7 +654,6 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
      description: this.description,
      support: this.support,
      isLocal: this.Actor.isOwned(),
-      createdAt: this.createdAt,
      updatedAt: this.updatedAt,
      ownerAccount: undefined,
      videosCount,
@@ -691,4 +691,8 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
  isOutdated () {
    return this.Actor.isOutdated()
  }
+  setAsUpdated (transaction: Transaction) {
+    return setAsUpdated('videoChannel', this.id, transaction)
+  }
 }
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index e55a21a6b..8c316e00c 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -24,6 +24,7 @@ import {
  Table,
  UpdatedAt
 } from 'sequelize-typescript'
+import { setAsUpdated } from '@server/helpers/database-utils'
 import { buildNSFWFilter } from '@server/helpers/express-utils'
 import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video'
 import { LiveManager } from '@server/lib/live-manager'
@@ -2053,11 +2054,7 @@ export class VideoModel extends Model {
  }
  setAsRefreshed () {
-    const options = {
+    return setAsUpdated('video', this.id)
-      where: { id: this.id }
-    }
-    return VideoModel.update({ updatedAt: new Date() }, options)
  }
  requiresAuth () {
diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts
index d0b0b9c21..143515838 100644
--- a/server/tests/api/check-params/index.ts
+++ b/server/tests/api/check-params/index.ts
@@ -13,6 +13,7 @@ import './plugins'
 import './redundancy'
 import './search'
 import './services'
+import './upload-quota'
 import './user-notifications'
 import './user-subscriptions'
 import './users'
diff --git a/server/tests/api/check-params/upload-quota.ts b/server/tests/api/check-params/upload-quota.ts
new file mode 100644
index 000000000..d0fbec415
--- /dev/null
+++ b/server/tests/api/check-params/upload-quota.ts
@@ -0,0 +1,152 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import { expect } from 'chai'
+import { HttpStatusCode, randomInt } from '@shared/core-utils'
+import { getGoodVideoUrl, getMagnetURI, getMyVideoImports, importVideo } from '@shared/extra-utils/videos/video-imports'
+import { MyUser, VideoImport, VideoImportState, VideoPrivacy } from '@shared/models'
+import {
+  cleanupTests,
+  flushAndRunServer,
+  getMyUserInformation,
+  immutableAssign,
+  registerUser,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  updateUser,
+  uploadVideo,
+  userLogin,
+  waitJobs
+} from '../../../../shared/extra-utils'
+describe('Test upload quota', function () {
+  let server: ServerInfo
+  let rootId: number
+  // ---------------------------------------------------------------
+  before(async function () {
+    this.timeout(30000)
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
+    await setDefaultVideoChannel([ server ])
+    const res = await getMyUserInformation(server.url, server.accessToken)
+    rootId = (res.body as MyUser).id
+    await updateUser({
+      url: server.url,
+      userId: rootId,
+      accessToken: server.accessToken,
+      videoQuota: 42
+    })
+  })
+  describe('When having a video quota', function () {
+    it('Should fail with a registered user having too many videos with legacy upload', async function () {
+      this.timeout(30000)
+      const user = { username: 'registered' + randomInt(1, 1500), password: 'password' }
+      await registerUser(server.url, user.username, user.password)
+      const userAccessToken = await userLogin(server, user)
+      const videoAttributes = { fixture: 'video_short2.webm' }
+      for (let i = 0; i < 5; i++) {
+        await uploadVideo(server.url, userAccessToken, videoAttributes)
+      }
+      await uploadVideo(server.url, userAccessToken, videoAttributes, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'legacy')
+    })
+    it('Should fail with a registered user having too many videos with resumable upload', async function () {
+      this.timeout(30000)
+      const user = { username: 'registered' + randomInt(1, 1500), password: 'password' }
+      await registerUser(server.url, user.username, user.password)
+      const userAccessToken = await userLogin(server, user)
+      const videoAttributes = { fixture: 'video_short2.webm' }
+      for (let i = 0; i < 5; i++) {
+        await uploadVideo(server.url, userAccessToken, videoAttributes)
+      }
+      await uploadVideo(server.url, userAccessToken, videoAttributes, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'resumable')
+    })
+    it('Should fail to import with HTTP/Torrent/magnet', async function () {
+      this.timeout(120000)
+      const baseAttributes = {
+        channelId: server.videoChannel.id,
+        privacy: VideoPrivacy.PUBLIC
+      }
+      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { targetUrl: getGoodVideoUrl() }))
+      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { magnetUri: getMagnetURI() }))
+      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { torrentfile: 'video-720p.torrent' as any }))
+      await waitJobs([ server ])
+      const res = await getMyVideoImports(server.url, server.accessToken)
+      expect(res.body.total).to.equal(3)
+      const videoImports: VideoImport[] = res.body.data
+      expect(videoImports).to.have.lengthOf(3)
+      for (const videoImport of videoImports) {
+        expect(videoImport.state.id).to.equal(VideoImportState.FAILED)
+        expect(videoImport.error).not.to.be.undefined
+        expect(videoImport.error).to.contain('user video quota is exceeded')
+      }
+    })
+  })
+  describe('When having a daily video quota', function () {
+    it('Should fail with a user having too many videos daily', async function () {
+      await updateUser({
+        url: server.url,
+        userId: rootId,
+        accessToken: server.accessToken,
+        videoQuotaDaily: 42
+      })
+      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'legacy')
+      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'resumable')
+    })
+  })
+  describe('When having an absolute and daily video quota', function () {
+    it('Should fail if exceeding total quota', async function () {
+      await updateUser({
+        url: server.url,
+        userId: rootId,
+        accessToken: server.accessToken,
+        videoQuota: 42,
+        videoQuotaDaily: 1024 * 1024 * 1024
+      })
+      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'legacy')
+      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'resumable')
+    })
+    it('Should fail if exceeding daily quota', async function () {
+      await updateUser({
+        url: server.url,
+        userId: rootId,
+        accessToken: server.accessToken,
+        videoQuota: 1024 * 1024 * 1024,
+        videoQuotaDaily: 42
+      })
+      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'legacy')
+      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413, 'resumable')
+    })
+  })
+  after(async function () {
+    await cleanupTests([ server ])
+  })
+})
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index 2b03fde2d..dcff0d52b 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
-import { expect } from 'chai'
 import { omit } from 'lodash'
 import { join } from 'path'
-import { User, UserRole, VideoImport, VideoImportState } from '../../../../shared'
+import { User, UserRole } from '../../../../shared'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  addVideoChannel,
  blockUser,
@@ -29,7 +29,6 @@ import {
  ServerInfo,
  setAccessTokensToServers,
  unblockUser,
-  updateUser,
  uploadVideo,
  userLogin
 } from '../../../../shared/extra-utils'
@@ -39,11 +38,7 @@ import {
  checkBadSortPagination,
  checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { getGoodVideoUrl, getMagnetURI, getMyVideoImports, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
 import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
-import { VideoPrivacy } from '../../../../shared/models/videos'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test users API validators', function () {
  const path = '/api/v1/users/'
@@ -1093,102 +1088,6 @@ describe('Test users API validators', function () {
    })
  })
-  describe('When having a video quota', function () {
-    it('Should fail with a user having too many videos', async function () {
-      await updateUser({
-        url: server.url,
-        userId: rootId,
-        accessToken: server.accessToken,
-        videoQuota: 42
-      })
-      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413)
-    })
-    it('Should fail with a registered user having too many videos', async function () {
-      this.timeout(30000)
-      const user = {
-        username: 'user3',
-        password: 'my super password'
-      }
-      userAccessToken = await userLogin(server, user)
-      const videoAttributes = { fixture: 'video_short2.webm' }
-      await uploadVideo(server.url, userAccessToken, videoAttributes)
-      await uploadVideo(server.url, userAccessToken, videoAttributes)
-      await uploadVideo(server.url, userAccessToken, videoAttributes)
-      await uploadVideo(server.url, userAccessToken, videoAttributes)
-      await uploadVideo(server.url, userAccessToken, videoAttributes)
-      await uploadVideo(server.url, userAccessToken, videoAttributes, HttpStatusCode.PAYLOAD_TOO_LARGE_413)
-    })
-    it('Should fail to import with HTTP/Torrent/magnet', async function () {
-      this.timeout(120000)
-      const baseAttributes = {
-        channelId: 1,
-        privacy: VideoPrivacy.PUBLIC
-      }
-      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { targetUrl: getGoodVideoUrl() }))
-      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { magnetUri: getMagnetURI() }))
-      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { torrentfile: 'video-720p.torrent' as any }))
-      await waitJobs([ server ])
-      const res = await getMyVideoImports(server.url, server.accessToken)
-      expect(res.body.total).to.equal(3)
-      const videoImports: VideoImport[] = res.body.data
-      expect(videoImports).to.have.lengthOf(3)
-      for (const videoImport of videoImports) {
-        expect(videoImport.state.id).to.equal(VideoImportState.FAILED)
-        expect(videoImport.error).not.to.be.undefined
-        expect(videoImport.error).to.contain('user video quota is exceeded')
-      }
-    })
-  })
-  describe('When having a daily video quota', function () {
-    it('Should fail with a user having too many videos daily', async function () {
-      await updateUser({
-        url: server.url,
-        userId: rootId,
-        accessToken: server.accessToken,
-        videoQuotaDaily: 42
-      })
-      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413)
-    })
-  })
-  describe('When having an absolute and daily video quota', function () {
-    it('Should fail if exceeding total quota', async function () {
-      await updateUser({
-        url: server.url,
-        userId: rootId,
-        accessToken: server.accessToken,
-        videoQuota: 42,
-        videoQuotaDaily: 1024 * 1024 * 1024
-      })
-      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413)
-    })
-    it('Should fail if exceeding daily quota', async function () {
-      await updateUser({
-        url: server.url,
-        userId: rootId,
-        accessToken: server.accessToken,
-        videoQuota: 1024 * 1024 * 1024,
-        videoQuotaDaily: 42
-      })
-      await uploadVideo(server.url, server.accessToken, {}, HttpStatusCode.PAYLOAD_TOO_LARGE_413)
-    })
-  })
  describe('When asking a password reset', function () {
    const path = '/api/v1/users/ask-reset-password'
diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts
index 188d1835c..c970c4a15 100644
--- a/server/tests/api/check-params/videos.ts
+++ b/server/tests/api/check-params/videos.ts
@@ -1,11 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
 import * as chai from 'chai'
 import { omit } from 'lodash'
-import 'mocha'
 import { join } from 'path'
-import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  checkUploadVideoParam,
  cleanupTests,
  createUser,
  flushAndRunServer,
@@ -18,17 +19,18 @@ import {
  makePutBodyRequest,
  makeUploadRequest,
  removeVideo,
+  root,
  ServerInfo,
  setAccessTokensToServers,
-  userLogin,
+  userLogin
-  root
 } from '../../../../shared/extra-utils'
 import {
  checkBadCountPagination,
  checkBadSortPagination,
  checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
+import { randomInt } from '@shared/core-utils'
 const expect = chai.expect
@@ -183,7 +185,7 @@ describe('Test videos API validator', function () {
  describe('When adding a video', function () {
    let baseCorrectParams
    const baseCorrectAttaches = {
-      videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.webm')
+      fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short.webm')
    }
    before(function () {
@@ -206,256 +208,243 @@ describe('Test videos API validator', function () {
      }
    })
-    it('Should fail with nothing', async function () {
+    function runSuite (mode: 'legacy' | 'resumable') {
-      const fields = {}
-      const attaches = {}
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
-    })
-    it('Should fail without name', async function () {
+      it('Should fail with nothing', async function () {
-      const fields = omit(baseCorrectParams, 'name')
+        const fields = {}
-      const attaches = baseCorrectAttaches
+        const attaches = {}
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
+      })
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail without name', async function () {
-    })
+        const fields = omit(baseCorrectParams, 'name')
+        const attaches = baseCorrectAttaches
-    it('Should fail with a long name', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { name: 'super'.repeat(65) })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a long name', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { name: 'super'.repeat(65) })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad category', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { category: 125 })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad category', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { category: 125 })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad licence', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { licence: 125 })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad licence', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { licence: 125 })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad language', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { language: 'a'.repeat(15) })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad language', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { language: 'a'.repeat(15) })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a long description', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { description: 'super'.repeat(2500) })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a long description', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { description: 'super'.repeat(2500) })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a long support text', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { support: 'super'.repeat(201) })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a long support text', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { support: 'super'.repeat(201) })
+        const attaches = baseCorrectAttaches
-    it('Should fail without a channel', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = omit(baseCorrectParams, 'channelId')
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail without a channel', async function () {
-    })
+        const fields = omit(baseCorrectParams, 'channelId')
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad channel', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { channelId: 545454 })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad channel', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { channelId: 545454 })
+        const attaches = baseCorrectAttaches
-    it('Should fail with another user channel', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const user = {
+      })
-        username: 'fake',
-        password: 'fake_password'
-      }
-      await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      const accessTokenUser = await userLogin(server, user)
+      it('Should fail with another user channel', async function () {
-      const res = await getMyUserInformation(server.url, accessTokenUser)
+        const user = {
-      const customChannelId = res.body.videoChannels[0].id
+          username: 'fake' + randomInt(0, 1500),
+          password: 'fake_password'
+        }
+        await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      const fields = immutableAssign(baseCorrectParams, { channelId: customChannelId })
+        const accessTokenUser = await userLogin(server, user)
-      const attaches = baseCorrectAttaches
+        const res = await getMyUserInformation(server.url, accessTokenUser)
+        const customChannelId = res.body.videoChannels[0].id
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: userAccessToken, fields, attaches })
+        const fields = immutableAssign(baseCorrectParams, { channelId: customChannelId })
-    })
+        const attaches = baseCorrectAttaches
-    it('Should fail with too many tags', async function () {
+        await checkUploadVideoParam(server.url, userAccessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6' ] })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with too many tags', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6' ] })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a tag length too low', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 't' ] })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a tag length too low', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 't' ] })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a tag length too big', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 'my_super_tag_too_long_long_long_long_long_long' ] })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a tag length too big', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 'my_super_tag_too_long_long_long_long_long_long' ] })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad schedule update (miss updateAt)', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { 'scheduleUpdate[privacy]': VideoPrivacy.PUBLIC })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad schedule update (miss updateAt)', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { scheduleUpdate: { privacy: VideoPrivacy.PUBLIC } })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad schedule update (wrong updateAt)', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, {
-        'scheduleUpdate[privacy]': VideoPrivacy.PUBLIC,
-        'scheduleUpdate[updateAt]': 'toto'
      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad schedule update (wrong updateAt)', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, {
+          scheduleUpdate: {
+            privacy: VideoPrivacy.PUBLIC,
+            updateAt: 'toto'
+          }
+        })
+        const attaches = baseCorrectAttaches
-    it('Should fail with a bad originally published at attribute', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = immutableAssign(baseCorrectParams, { originallyPublishedAt: 'toto' })
+      })
-      const attaches = baseCorrectAttaches
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+      it('Should fail with a bad originally published at attribute', async function () {
-    })
+        const fields = immutableAssign(baseCorrectParams, { originallyPublishedAt: 'toto' })
+        const attaches = baseCorrectAttaches
-    it('Should fail without an input file', async function () {
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      const fields = baseCorrectParams
+      })
-      const attaches = {}
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
-    })
-    it('Should fail with an incorrect input file', async function () {
+      it('Should fail without an input file', async function () {
-      const fields = baseCorrectParams
+        const fields = baseCorrectParams
-      let attaches = {
+        const attaches = {}
-        videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short_fake.webm')
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-      }
-      await makeUploadRequest({
-        url: server.url,
-        path: path + '/upload',
-        token: server.accessToken,
-        fields,
-        attaches,
-        statusCodeExpected: HttpStatusCode.UNPROCESSABLE_ENTITY_422
      })
-      attaches = {
+      it('Should fail with an incorrect input file', async function () {
-        videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mkv')
+        const fields = baseCorrectParams
-      }
+        let attaches = { fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short_fake.webm') }
-      await makeUploadRequest({
-        url: server.url,
+        await checkUploadVideoParam(
-        path: path + '/upload',
+          server.url,
-        token: server.accessToken,
+          server.accessToken,
-        fields,
+          { ...fields, ...attaches },
-        attaches,
+          HttpStatusCode.UNPROCESSABLE_ENTITY_422,
-        statusCodeExpected: HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415
+          mode
+        )
+        attaches = { fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short.mkv') }
+        await checkUploadVideoParam(
+          server.url,
+          server.accessToken,
+          { ...fields, ...attaches },
+          HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415,
+          mode
+        )
      })
-    })
-    it('Should fail with an incorrect thumbnail file', async function () {
+      it('Should fail with an incorrect thumbnail file', async function () {
-      const fields = baseCorrectParams
+        const fields = baseCorrectParams
-      const attaches = {
+        const attaches = {
-        thumbnailfile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4'),
+          thumbnailfile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4'),
-        videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
+          fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
-      }
+        }
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-    })
+      })
-    it('Should fail with a big thumbnail file', async function () {
+      it('Should fail with a big thumbnail file', async function () {
-      const fields = baseCorrectParams
+        const fields = baseCorrectParams
-      const attaches = {
+        const attaches = {
-        thumbnailfile: join(root(), 'server', 'tests', 'fixtures', 'preview-big.png'),
+          thumbnailfile: join(root(), 'server', 'tests', 'fixtures', 'preview-big.png'),
-        videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
+          fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
-      }
+        }
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-    })
+      })
-    it('Should fail with an incorrect preview file', async function () {
+      it('Should fail with an incorrect preview file', async function () {
-      const fields = baseCorrectParams
+        const fields = baseCorrectParams
-      const attaches = {
+        const attaches = {
-        previewfile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4'),
+          previewfile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4'),
-        videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
+          fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
-      }
+        }
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-    })
+      })
-    it('Should fail with a big preview file', async function () {
+      it('Should fail with a big preview file', async function () {
-      const fields = baseCorrectParams
+        const fields = baseCorrectParams
-      const attaches = {
+        const attaches = {
-        previewfile: join(root(), 'server', 'tests', 'fixtures', 'preview-big.png'),
+          previewfile: join(root(), 'server', 'tests', 'fixtures', 'preview-big.png'),
-        videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
+          fixture: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
-      }
+        }
-      await makeUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
+        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
-    })
+      })
-    it('Should succeed with the correct parameters', async function () {
+      it('Should succeed with the correct parameters', async function () {
-      this.timeout(10000)
+        this.timeout(10000)
-      const fields = baseCorrectParams
+        const fields = baseCorrectParams
-      {
+        {
-        const attaches = baseCorrectAttaches
+          const attaches = baseCorrectAttaches
-        await makeUploadRequest({
+          await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.OK_200, mode)
-          url: server.url,
+        }
-          path: path + '/upload',
-          token: server.accessToken,
-          fields,
-          attaches,
-          statusCodeExpected: HttpStatusCode.OK_200
-        })
-      }
-      {
+        {
-        const attaches = immutableAssign(baseCorrectAttaches, {
+          const attaches = immutableAssign(baseCorrectAttaches, {
-          videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
+            videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.mp4')
-        })
+          })
-        await makeUploadRequest({
+          await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.OK_200, mode)
-          url: server.url,
+        }
-          path: path + '/upload',
-          token: server.accessToken,
-          fields,
-          attaches,
-          statusCodeExpected: HttpStatusCode.OK_200
-        })
-      }
-      {
+        {
-        const attaches = immutableAssign(baseCorrectAttaches, {
+          const attaches = immutableAssign(baseCorrectAttaches, {
-          videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.ogv')
+            videofile: join(root(), 'server', 'tests', 'fixtures', 'video_short.ogv')
-        })
+          })
-        await makeUploadRequest({
+          await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.OK_200, mode)
-          url: server.url,
+        }
-          path: path + '/upload',
+      })
-          token: server.accessToken,
+    }
-          fields,
-          attaches,
+    describe('Resumable upload', function () {
-          statusCodeExpected: HttpStatusCode.OK_200
+      runSuite('resumable')
-        })
+    })
-      }
+    describe('Legacy upload', function () {
+      runSuite('legacy')
    })
  })
@@ -678,7 +667,7 @@ describe('Test videos API validator', function () {
      })
      expect(res.body.data).to.be.an('array')
-      expect(res.body.data.length).to.equal(3)
+      expect(res.body.data.length).to.equal(6)
    })
    it('Should fail without a correct uuid', async function () {
diff --git a/server/tests/api/live/live-constraints.ts b/server/tests/api/live/live-constraints.ts
index 5569e6066..cc635de33 100644
--- a/server/tests/api/live/live-constraints.ts
+++ b/server/tests/api/live/live-constraints.ts
@@ -2,15 +2,15 @@
 import 'mocha'
 import * as chai from 'chai'
-import { User, VideoDetails, VideoPrivacy } from '@shared/models'
+import { VideoDetails, VideoPrivacy } from '@shared/models'
 import {
  checkLiveCleanup,
  cleanupTests,
  createLive,
-  createUser,
  doubleFollow,
  flushAndRunMultipleServers,
-  getMyUserInformation,
+  generateUser,
+  getCustomConfigResolutions,
  getVideo,
  runAndTestFfmpegStreamError,
  ServerInfo,
@@ -18,7 +18,6 @@ import {
  setDefaultVideoChannel,
  updateCustomSubConfig,
  updateUser,
-  userLogin,
  wait,
  waitJobs,
  waitUntilLivePublished
@@ -62,6 +61,16 @@ describe('Test live constraints', function () {
    }
  }
+  function updateQuota (options: { total: number, daily: number }) {
+    return updateUser({
+      url: servers[0].url,
+      accessToken: servers[0].accessToken,
+      userId,
+      videoQuota: options.total,
+      videoQuotaDaily: options.daily
+    })
+  }
  before(async function () {
    this.timeout(120000)
@@ -82,27 +91,12 @@ describe('Test live constraints', function () {
    })
    {
-      const user = { username: 'user1', password: 'superpassword' }
+      const res = await generateUser(servers[0], 'user1')
-      const res = await createUser({
+      userId = res.userId
-        url: servers[0].url,
+      userChannelId = res.userChannelId
-        accessToken: servers[0].accessToken,
+      userAccessToken = res.token
-        username: user.username,
-        password: user.password
+      await updateQuota({ total: 1, daily: -1 })
-      })
-      userId = res.body.user.id
-      userAccessToken = await userLogin(servers[0], user)
-      const resMe = await getMyUserInformation(servers[0].url, userAccessToken)
-      userChannelId = (resMe.body as User).videoChannels[0].id
-      await updateUser({
-        url: servers[0].url,
-        userId,
-        accessToken: servers[0].accessToken,
-        videoQuota: 1,
-        videoQuotaDaily: -1
-      })
    }
    // Server 1 and server 2 follow each other
@@ -137,13 +131,7 @@ describe('Test live constraints', function () {
    // Wait for user quota memoize cache invalidation
    await wait(5000)
-    await updateUser({
+    await updateQuota({ total: -1, daily: 1 })
-      url: servers[0].url,
-      userId,
-      accessToken: servers[0].accessToken,
-      videoQuota: -1,
-      videoQuotaDaily: 1
-    })
    const userVideoLiveoId = await createLiveWrapper(true)
    await runAndTestFfmpegStreamError(servers[0].url, userAccessToken, userVideoLiveoId, true)
@@ -160,13 +148,7 @@ describe('Test live constraints', function () {
    // Wait for user quota memoize cache invalidation
    await wait(5000)
-    await updateUser({
+    await updateQuota({ total: 10 * 1000 * 1000, daily: -1 })
-      url: servers[0].url,
-      userId,
-      accessToken: servers[0].accessToken,
-      videoQuota: 10 * 1000 * 1000,
-      videoQuotaDaily: -1
-    })
    const userVideoLiveoId = await createLiveWrapper(true)
    await runAndTestFfmpegStreamError(servers[0].url, userAccessToken, userVideoLiveoId, false)
@@ -182,15 +164,7 @@ describe('Test live constraints', function () {
        maxDuration: 1,
        transcoding: {
          enabled: true,
-          resolutions: {
+          resolutions: getCustomConfigResolutions(true)
-            '240p': true,
-            '360p': true,
-            '480p': true,
-            '720p': true,
-            '1080p': true,
-            '1440p': true,
-            '2160p': true
-          }
        }
      }
    })
diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts
index a5bda009f..d52e8c7e4 100644
--- a/server/tests/api/live/live-permanent.ts
+++ b/server/tests/api/live/live-permanent.ts
@@ -8,6 +8,7 @@ import {
  createLive,
  doubleFollow,
  flushAndRunMultipleServers,
+  getCustomConfigResolutions,
  getLive,
  getPlaylistsCount,
  getVideo,
@@ -69,15 +70,7 @@ describe('Permenant live', function () {
        maxDuration: -1,
        transcoding: {
          enabled: true,
-          resolutions: {
+          resolutions: getCustomConfigResolutions(true)
-            '240p': true,
-            '360p': true,
-            '480p': true,
-            '720p': true,
-            '1080p': true,
-            '1440p': true,
-            '2160p': true
-          }
        }
      }
    })
@@ -159,15 +152,7 @@ describe('Permenant live', function () {
        maxDuration: -1,
        transcoding: {
          enabled: true,
-          resolutions: {
+          resolutions: getCustomConfigResolutions(false)
-            '240p': false,
-            '360p': false,
-            '480p': false,
-            '720p': false,
-            '1080p': false,
-            '1440p': false,
-            '2160p': false
-          }
        }
      }
    })
diff --git a/server/tests/api/live/live-save-replay.ts b/server/tests/api/live/live-save-replay.ts
index 61c8e74dd..3d4736c8f 100644
--- a/server/tests/api/live/live-save-replay.ts
+++ b/server/tests/api/live/live-save-replay.ts
@@ -12,6 +12,7 @@ import {
  createLive,
  doubleFollow,
  flushAndRunMultipleServers,
+  getCustomConfigResolutions,
  getVideo,
  getVideosList,
  removeVideo,
@@ -108,15 +109,7 @@ describe('Save replay setting', function () {
        maxDuration: -1,
        transcoding: {
          enabled: false,
-          resolutions: {
+          resolutions: getCustomConfigResolutions(true)
-            '240p': true,
-            '360p': true,
-            '480p': true,
-            '720p': true,
-            '1080p': true,
-            '1440p': true,
-            '2160p': true
-          }
        }
      }
    })
diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts
index 0846b04f4..8a91fbba3 100644
--- a/server/tests/api/server/follow-constraints.ts
+++ b/server/tests/api/server/follow-constraints.ts
@@ -28,7 +28,7 @@ describe('Test follow constraints', function () {
  let userAccessToken: string
  before(async function () {
-    this.timeout(60000)
+    this.timeout(90000)
    servers = await flushAndRunMultipleServers(2)
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index dcd03879b..f60c66e4b 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -130,26 +130,32 @@ describe('Test users with multiple servers', function () {
  })
  it('Should have updated my profile on other servers too', async function () {
+    let createdAt: string | Date
    for (const server of servers) {
      const resAccounts = await getAccountsList(server.url, '-createdAt')
-      const rootServer1List = resAccounts.body.data.find(a => a.name === 'root' && a.host === 'localhost:' + servers[0].port) as Account
+      const resList = resAccounts.body.data.find(a => a.name === 'root' && a.host === 'localhost:' + servers[0].port) as Account
-      expect(rootServer1List).not.to.be.undefined
+      expect(resList).not.to.be.undefined
+      const resAccount = await getAccount(server.url, resList.name + '@' + resList.host)
+      const account = resAccount.body as Account
+      if (!createdAt) createdAt = account.createdAt
-      const resAccount = await getAccount(server.url, rootServer1List.name + '@' + rootServer1List.host)
+      expect(account.name).to.equal('root')
-      const rootServer1Get = resAccount.body as Account
+      expect(account.host).to.equal('localhost:' + servers[0].port)
-      expect(rootServer1Get.name).to.equal('root')
+      expect(account.displayName).to.equal('my super display name')
-      expect(rootServer1Get.host).to.equal('localhost:' + servers[0].port)
+      expect(account.description).to.equal('my super description updated')
-      expect(rootServer1Get.displayName).to.equal('my super display name')
+      expect(createdAt).to.equal(account.createdAt)
-      expect(rootServer1Get.description).to.equal('my super description updated')
      if (server.serverNumber === 1) {
-        expect(rootServer1Get.userId).to.be.a('number')
+        expect(account.userId).to.be.a('number')
      } else {
-        expect(rootServer1Get.userId).to.be.undefined
+        expect(account.userId).to.be.undefined
      }
-      await testImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png')
+      await testImage(server.url, 'avatar2-resized', account.avatar.path, '.png')
    }
  })
diff --git a/server/tests/api/videos/index.ts b/server/tests/api/videos/index.ts
index fc8b447b7..5c07f8926 100644
--- a/server/tests/api/videos/index.ts
+++ b/server/tests/api/videos/index.ts
@@ -1,5 +1,6 @@
 import './audio-only'
 import './multiple-servers'
+import './resumable-upload'
 import './single-server'
 import './video-captions'
 import './video-change-ownership'
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 55e280e9f..41cd814e0 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -181,7 +181,7 @@ describe('Test multiple servers', function () {
        thumbnailfile: 'thumbnail.jpg',
        previewfile: 'preview.jpg'
      }
-      await uploadVideo(servers[1].url, userAccessToken, videoAttributes)
+      await uploadVideo(servers[1].url, userAccessToken, videoAttributes, HttpStatusCode.OK_200, 'resumable')
      // Transcoding
      await waitJobs(servers)
diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts
new file mode 100644
index 000000000..af9221c43
--- /dev/null
+++ b/server/tests/api/videos/resumable-upload.ts
@@ -0,0 +1,187 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import * as chai from 'chai'
+import { pathExists, readdir, stat } from 'fs-extra'
+import { join } from 'path'
+import { HttpStatusCode } from '@shared/core-utils'
+import {
+  buildAbsoluteFixturePath,
+  buildServerDirectory,
+  flushAndRunServer,
+  getMyUserInformation,
+  prepareResumableUpload,
+  sendDebugCommand,
+  sendResumableChunks,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  updateUser
+} from '@shared/extra-utils'
+import { MyUser, VideoPrivacy } from '@shared/models'
+const expect = chai.expect
+// Most classic resumable upload tests are done in other test suites
+describe('Test resumable upload', function () {
+  const defaultFixture = 'video_short.mp4'
+  let server: ServerInfo
+  let rootId: number
+  async function buildSize (fixture: string, size?: number) {
+    if (size !== undefined) return size
+    const baseFixture = buildAbsoluteFixturePath(fixture)
+    return (await stat(baseFixture)).size
+  }
+  async function prepareUpload (sizeArg?: number) {
+    const size = await buildSize(defaultFixture, sizeArg)
+    const attributes = {
+      name: 'video',
+      channelId: server.videoChannel.id,
+      privacy: VideoPrivacy.PUBLIC,
+      fixture: defaultFixture
+    }
+    const mimetype = 'video/mp4'
+    const res = await prepareResumableUpload({ url: server.url, token: server.accessToken, attributes, size, mimetype })
+    return res.header['location'].split('?')[1]
+  }
+  async function sendChunks (options: {
+    pathUploadId: string
+    size?: number
+    expectedStatus?: HttpStatusCode
+    contentLength?: number
+    contentRange?: string
+    contentRangeBuilder?: (start: number, chunk: any) => string
+  }) {
+    const { pathUploadId, expectedStatus, contentLength, contentRangeBuilder } = options
+    const size = await buildSize(defaultFixture, options.size)
+    const absoluteFilePath = buildAbsoluteFixturePath(defaultFixture)
+    return sendResumableChunks({
+      url: server.url,
+      token: server.accessToken,
+      pathUploadId,
+      videoFilePath: absoluteFilePath,
+      size,
+      contentLength,
+      contentRangeBuilder,
+      specialStatus: expectedStatus
+    })
+  }
+  async function checkFileSize (uploadIdArg: string, expectedSize: number | null) {
+    const uploadId = uploadIdArg.replace(/^upload_id=/, '')
+    const subPath = join('tmp', 'resumable-uploads', uploadId)
+    const filePath = buildServerDirectory(server, subPath)
+    const exists = await pathExists(filePath)
+    if (expectedSize === null) {
+      expect(exists).to.be.false
+      return
+    }
+    expect(exists).to.be.true
+    expect((await stat(filePath)).size).to.equal(expectedSize)
+  }
+  async function countResumableUploads () {
+    const subPath = join('tmp', 'resumable-uploads')
+    const filePath = buildServerDirectory(server, subPath)
+    const files = await readdir(filePath)
+    return files.length
+  }
+  before(async function () {
+    this.timeout(30000)
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
+    await setDefaultVideoChannel([ server ])
+    const res = await getMyUserInformation(server.url, server.accessToken)
+    rootId = (res.body as MyUser).id
+    await updateUser({
+      url: server.url,
+      userId: rootId,
+      accessToken: server.accessToken,
+      videoQuota: 10_000_000
+    })
+  })
+  describe('Directory cleaning', function () {
+    it('Should correctly delete files after an upload', async function () {
+      const uploadId = await prepareUpload()
+      await sendChunks({ pathUploadId: uploadId })
+      expect(await countResumableUploads()).to.equal(0)
+    })
+    it('Should not delete files after an unfinished upload', async function () {
+      await prepareUpload()
+      expect(await countResumableUploads()).to.equal(2)
+    })
+    it('Should not delete recent uploads', async function () {
+      await sendDebugCommand(server.url, server.accessToken, { command: 'remove-dandling-resumable-uploads' })
+      expect(await countResumableUploads()).to.equal(2)
+    })
+    it('Should delete old uploads', async function () {
+      await sendDebugCommand(server.url, server.accessToken, { command: 'remove-dandling-resumable-uploads' })
+      expect(await countResumableUploads()).to.equal(0)
+    })
+  })
+  describe('Resumable upload and chunks', function () {
+    it('Should accept the same amount of chunks', async function () {
+      const uploadId = await prepareUpload()
+      await sendChunks({ pathUploadId: uploadId })
+      await checkFileSize(uploadId, null)
+    })
+    it('Should not accept more chunks than expected', async function () {
+      const size = 100
+      const uploadId = await prepareUpload(size)
+      await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409 })
+      await checkFileSize(uploadId, 0)
+    })
+    it('Should not accept more chunks than expected with an invalid content length/content range', async function () {
+      const uploadId = await prepareUpload(1500)
+      await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 })
+      await checkFileSize(uploadId, 0)
+    })
+    it('Should not accept more chunks than expected with an invalid content length', async function () {
+      const uploadId = await prepareUpload(500)
+      const size = 1000
+      const contentRangeBuilder = start => `bytes ${start}-${start + size - 1}/${size}`
+      await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentRangeBuilder, contentLength: size })
+      await checkFileSize(uploadId, 0)
+    })
+  })
+})
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index a79648bf7..1058a1e9c 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
 import * as chai from 'chai'
 import { keyBy } from 'lodash'
-import 'mocha'
-import { VideoPrivacy } from '../../../../shared/models/videos'
 import {
  checkVideoFilesWereRemoved,
  cleanupTests,
@@ -28,430 +28,432 @@ import {
  viewVideo,
  wait
 } from '../../../../shared/extra-utils'
+import { VideoPrivacy } from '../../../../shared/models/videos'
+import { HttpStatusCode } from '@shared/core-utils'
 const expect = chai.expect
 describe('Test a single server', function () {
-  let server: ServerInfo = null
-  let videoId = -1
-  let videoId2 = -1
-  let videoUUID = ''
-  let videosListBase: any[] = null
-  const getCheckAttributes = () => ({
-    name: 'my super name',
-    category: 2,
-    licence: 6,
-    language: 'zh',
-    nsfw: true,
-    description: 'my super description',
-    support: 'my super support text',
-    account: {
-      name: 'root',
-      host: 'localhost:' + server.port
-    },
-    isLocal: true,
-    duration: 5,
-    tags: [ 'tag1', 'tag2', 'tag3' ],
-    privacy: VideoPrivacy.PUBLIC,
-    commentsEnabled: true,
-    downloadEnabled: true,
-    channel: {
-      displayName: 'Main root channel',
-      name: 'root_channel',
-      description: '',
-      isLocal: true
-    },
-    fixture: 'video_short.webm',
-    files: [
-      {
-        resolution: 720,
-        size: 218910
-      }
-    ]
-  })
-  const updateCheckAttributes = () => ({
-    name: 'my super video updated',
-    category: 4,
-    licence: 2,
-    language: 'ar',
-    nsfw: false,
-    description: 'my super description updated',
-    support: 'my super support text updated',
-    account: {
-      name: 'root',
-      host: 'localhost:' + server.port
-    },
-    isLocal: true,
-    tags: [ 'tagup1', 'tagup2' ],
-    privacy: VideoPrivacy.PUBLIC,
-    duration: 5,
-    commentsEnabled: false,
-    downloadEnabled: false,
-    channel: {
-      name: 'root_channel',
-      displayName: 'Main root channel',
-      description: '',
-      isLocal: true
-    },
-    fixture: 'video_short3.webm',
-    files: [
-      {
-        resolution: 720,
-        size: 292677
-      }
-    ]
-  })
-  before(async function () {
-    this.timeout(30000)
-    server = await flushAndRunServer(1)
-    await setAccessTokensToServers([ server ])
-  })
-  it('Should list video categories', async function () {
-    const res = await getVideoCategories(server.url)
-    const categories = res.body
-    expect(Object.keys(categories)).to.have.length.above(10)
-    expect(categories[11]).to.equal('News & Politics')
-  })
-  it('Should list video licences', async function () {
-    const res = await getVideoLicences(server.url)
-    const licences = res.body
-    expect(Object.keys(licences)).to.have.length.above(5)
-    expect(licences[3]).to.equal('Attribution - No Derivatives')
-  })
-  it('Should list video languages', async function () {
-    const res = await getVideoLanguages(server.url)
-    const languages = res.body
-    expect(Object.keys(languages)).to.have.length.above(5)
-    expect(languages['ru']).to.equal('Russian')
-  })
-  it('Should list video privacies', async function () {
-    const res = await getVideoPrivacies(server.url)
-    const privacies = res.body
-    expect(Object.keys(privacies)).to.have.length.at.least(3)
-    expect(privacies[3]).to.equal('Private')
-  })
-  it('Should not have videos', async function () {
-    const res = await getVideosList(server.url)
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data.length).to.equal(0)
-  })
-  it('Should upload the video', async function () {
+  function runSuite (mode: 'legacy' | 'resumable') {
-    this.timeout(10000)
+    let server: ServerInfo = null
+    let videoId = -1
+    let videoId2 = -1
+    let videoUUID = ''
+    let videosListBase: any[] = null
-    const videoAttributes = {
+    const getCheckAttributes = () => ({
      name: 'my super name',
      category: 2,
-      nsfw: true,
      licence: 6,
-      tags: [ 'tag1', 'tag2', 'tag3' ]
+      language: 'zh',
-    }
+      nsfw: true,
-    const res = await uploadVideo(server.url, server.accessToken, videoAttributes)
+      description: 'my super description',
-    expect(res.body.video).to.not.be.undefined
+      support: 'my super support text',
-    expect(res.body.video.id).to.equal(1)
+      account: {
-    expect(res.body.video.uuid).to.have.length.above(5)
+        name: 'root',
+        host: 'localhost:' + server.port
-    videoId = res.body.video.id
+      },
-    videoUUID = res.body.video.uuid
+      isLocal: true,
-  })
+      duration: 5,
+      tags: [ 'tag1', 'tag2', 'tag3' ],
-  it('Should get and seed the uploaded video', async function () {
+      privacy: VideoPrivacy.PUBLIC,
-    this.timeout(5000)
+      commentsEnabled: true,
+      downloadEnabled: true,
-    const res = await getVideosList(server.url)
+      channel: {
+        displayName: 'Main root channel',
-    expect(res.body.total).to.equal(1)
+        name: 'root_channel',
-    expect(res.body.data).to.be.an('array')
+        description: '',
-    expect(res.body.data.length).to.equal(1)
+        isLocal: true
+      },
-    const video = res.body.data[0]
+      fixture: 'video_short.webm',
-    await completeVideoCheck(server.url, video, getCheckAttributes())
+      files: [
-  })
+        {
+          resolution: 720,
+          size: 218910
+        }
+      ]
+    })
+    const updateCheckAttributes = () => ({
+      name: 'my super video updated',
+      category: 4,
+      licence: 2,
+      language: 'ar',
+      nsfw: false,
+      description: 'my super description updated',
+      support: 'my super support text updated',
+      account: {
+        name: 'root',
+        host: 'localhost:' + server.port
+      },
+      isLocal: true,
+      tags: [ 'tagup1', 'tagup2' ],
+      privacy: VideoPrivacy.PUBLIC,
+      duration: 5,
+      commentsEnabled: false,
+      downloadEnabled: false,
+      channel: {
+        name: 'root_channel',
+        displayName: 'Main root channel',
+        description: '',
+        isLocal: true
+      },
+      fixture: 'video_short3.webm',
+      files: [
+        {
+          resolution: 720,
+          size: 292677
+        }
+      ]
+    })
-  it('Should get the video by UUID', async function () {
+    before(async function () {
-    this.timeout(5000)
+      this.timeout(30000)
-    const res = await getVideo(server.url, videoUUID)
+      server = await flushAndRunServer(1)
-    const video = res.body
+      await setAccessTokensToServers([ server ])
-    await completeVideoCheck(server.url, video, getCheckAttributes())
+    })
-  })
-  it('Should have the views updated', async function () {
+    it('Should list video categories', async function () {
-    this.timeout(20000)
+      const res = await getVideoCategories(server.url)
-    await viewVideo(server.url, videoId)
+      const categories = res.body
-    await viewVideo(server.url, videoId)
+      expect(Object.keys(categories)).to.have.length.above(10)
-    await viewVideo(server.url, videoId)
-    await wait(1500)
+      expect(categories[11]).to.equal('News & Politics')
+    })
-    await viewVideo(server.url, videoId)
+    it('Should list video licences', async function () {
-    await viewVideo(server.url, videoId)
+      const res = await getVideoLicences(server.url)
-    await wait(1500)
+      const licences = res.body
+      expect(Object.keys(licences)).to.have.length.above(5)
-    await viewVideo(server.url, videoId)
+      expect(licences[3]).to.equal('Attribution - No Derivatives')
-    await viewVideo(server.url, videoId)
+    })
-    // Wait the repeatable job
+    it('Should list video languages', async function () {
-    await wait(8000)
+      const res = await getVideoLanguages(server.url)
-    const res = await getVideo(server.url, videoId)
+      const languages = res.body
+      expect(Object.keys(languages)).to.have.length.above(5)
-    const video = res.body
+      expect(languages['ru']).to.equal('Russian')
-    expect(video.views).to.equal(3)
+    })
-  })
-  it('Should remove the video', async function () {
+    it('Should list video privacies', async function () {
-    await removeVideo(server.url, server.accessToken, videoId)
+      const res = await getVideoPrivacies(server.url)
-    await checkVideoFilesWereRemoved(videoUUID, 1)
+      const privacies = res.body
-  })
+      expect(Object.keys(privacies)).to.have.length.at.least(3)
-  it('Should not have videos', async function () {
+      expect(privacies[3]).to.equal('Private')
-    const res = await getVideosList(server.url)
+    })
-    expect(res.body.total).to.equal(0)
+    it('Should not have videos', async function () {
-    expect(res.body.data).to.be.an('array')
+      const res = await getVideosList(server.url)
-    expect(res.body.data).to.have.lengthOf(0)
-  })
-  it('Should upload 6 videos', async function () {
+      expect(res.body.total).to.equal(0)
-    this.timeout(25000)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
+    })
-    const videos = new Set([
+    it('Should upload the video', async function () {
-      'video_short.mp4', 'video_short.ogv', 'video_short.webm',
+      this.timeout(10000)
-      'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
-    ])
-    for (const video of videos) {
      const videoAttributes = {
-        name: video + ' name',
+        name: 'my super name',
-        description: video + ' description',
        category: 2,
-        licence: 1,
-        language: 'en',
        nsfw: true,
-        tags: [ 'tag1', 'tag2', 'tag3' ],
+        licence: 6,
-        fixture: video
+        tags: [ 'tag1', 'tag2', 'tag3' ]
      }
+      const res = await uploadVideo(server.url, server.accessToken, videoAttributes, HttpStatusCode.OK_200, mode)
+      expect(res.body.video).to.not.be.undefined
+      expect(res.body.video.id).to.equal(1)
+      expect(res.body.video.uuid).to.have.length.above(5)
-      await uploadVideo(server.url, server.accessToken, videoAttributes)
+      videoId = res.body.video.id
-    }
+      videoUUID = res.body.video.uuid
-  })
+    })
-  it('Should have the correct durations', async function () {
+    it('Should get and seed the uploaded video', async function () {
-    const res = await getVideosList(server.url)
+      this.timeout(5000)
-    expect(res.body.total).to.equal(6)
-    const videos = res.body.data
-    expect(videos).to.be.an('array')
-    expect(videos).to.have.lengthOf(6)
-    const videosByName = keyBy<{ duration: number }>(videos, 'name')
-    expect(videosByName['video_short.mp4 name'].duration).to.equal(5)
-    expect(videosByName['video_short.ogv name'].duration).to.equal(5)
-    expect(videosByName['video_short.webm name'].duration).to.equal(5)
-    expect(videosByName['video_short1.webm name'].duration).to.equal(10)
-    expect(videosByName['video_short2.webm name'].duration).to.equal(5)
-    expect(videosByName['video_short3.webm name'].duration).to.equal(5)
-  })
-  it('Should have the correct thumbnails', async function () {
+      const res = await getVideosList(server.url)
-    const res = await getVideosList(server.url)
-    const videos = res.body.data
+      expect(res.body.total).to.equal(1)
-    // For the next test
+      expect(res.body.data).to.be.an('array')
-    videosListBase = videos
+      expect(res.body.data.length).to.equal(1)
-    for (const video of videos) {
+      const video = res.body.data[0]
-      const videoName = video.name.replace(' name', '')
+      await completeVideoCheck(server.url, video, getCheckAttributes())
-      await testImage(server.url, videoName, video.thumbnailPath)
+    })
-    }
-  })
-  it('Should list only the two first videos', async function () {
+    it('Should get the video by UUID', async function () {
-    const res = await getVideosListPagination(server.url, 0, 2, 'name')
+      this.timeout(5000)
-    const videos = res.body.data
+      const res = await getVideo(server.url, videoUUID)
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(2)
-    expect(videos[0].name).to.equal(videosListBase[0].name)
-    expect(videos[1].name).to.equal(videosListBase[1].name)
-  })
-  it('Should list only the next three videos', async function () {
+      const video = res.body
-    const res = await getVideosListPagination(server.url, 2, 3, 'name')
+      await completeVideoCheck(server.url, video, getCheckAttributes())
+    })
-    const videos = res.body.data
+    it('Should have the views updated', async function () {
-    expect(res.body.total).to.equal(6)
+      this.timeout(20000)
-    expect(videos.length).to.equal(3)
-    expect(videos[0].name).to.equal(videosListBase[2].name)
-    expect(videos[1].name).to.equal(videosListBase[3].name)
-    expect(videos[2].name).to.equal(videosListBase[4].name)
-  })
-  it('Should list the last video', async function () {
+      await viewVideo(server.url, videoId)
-    const res = await getVideosListPagination(server.url, 5, 6, 'name')
+      await viewVideo(server.url, videoId)
+      await viewVideo(server.url, videoId)
-    const videos = res.body.data
+      await wait(1500)
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(1)
-    expect(videos[0].name).to.equal(videosListBase[5].name)
-  })
-  it('Should not have the total field', async function () {
+      await viewVideo(server.url, videoId)
-    const res = await getVideosListPagination(server.url, 5, 6, 'name', true)
+      await viewVideo(server.url, videoId)
-    const videos = res.body.data
+      await wait(1500)
-    expect(res.body.total).to.not.exist
-    expect(videos.length).to.equal(1)
-    expect(videos[0].name).to.equal(videosListBase[5].name)
-  })
-  it('Should list and sort by name in descending order', async function () {
+      await viewVideo(server.url, videoId)
-    const res = await getVideosListSort(server.url, '-name')
+      await viewVideo(server.url, videoId)
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(6)
-    expect(videos[0].name).to.equal('video_short.webm name')
-    expect(videos[1].name).to.equal('video_short.ogv name')
-    expect(videos[2].name).to.equal('video_short.mp4 name')
-    expect(videos[3].name).to.equal('video_short3.webm name')
-    expect(videos[4].name).to.equal('video_short2.webm name')
-    expect(videos[5].name).to.equal('video_short1.webm name')
-    videoId = videos[3].uuid
-    videoId2 = videos[5].uuid
-  })
-  it('Should list and sort by trending in descending order', async function () {
+      // Wait the repeatable job
-    const res = await getVideosListPagination(server.url, 0, 2, '-trending')
+      await wait(8000)
-    const videos = res.body.data
+      const res = await getVideo(server.url, videoId)
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(2)
-  })
-  it('Should list and sort by hotness in descending order', async function () {
+      const video = res.body
-    const res = await getVideosListPagination(server.url, 0, 2, '-hot')
+      expect(video.views).to.equal(3)
+    })
-    const videos = res.body.data
+    it('Should remove the video', async function () {
-    expect(res.body.total).to.equal(6)
+      await removeVideo(server.url, server.accessToken, videoId)
-    expect(videos.length).to.equal(2)
-  })
-  it('Should list and sort by best in descending order', async function () {
+      await checkVideoFilesWereRemoved(videoUUID, 1)
-    const res = await getVideosListPagination(server.url, 0, 2, '-best')
+    })
-    const videos = res.body.data
+    it('Should not have videos', async function () {
-    expect(res.body.total).to.equal(6)
+      const res = await getVideosList(server.url)
-    expect(videos.length).to.equal(2)
-  })
-  it('Should update a video', async function () {
+      expect(res.body.total).to.equal(0)
-    const attributes = {
+      expect(res.body.data).to.be.an('array')
-      name: 'my super video updated',
+      expect(res.body.data).to.have.lengthOf(0)
-      category: 4,
+    })
-      licence: 2,
-      language: 'ar',
-      nsfw: false,
-      description: 'my super description updated',
-      commentsEnabled: false,
-      downloadEnabled: false,
-      tags: [ 'tagup1', 'tagup2' ]
-    }
-    await updateVideo(server.url, server.accessToken, videoId, attributes)
-  })
-  it('Should filter by tags and category', async function () {
+    it('Should upload 6 videos', async function () {
-    const res1 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 4 ] })
+      this.timeout(25000)
-    expect(res1.body.total).to.equal(1)
-    expect(res1.body.data[0].name).to.equal('my super video updated')
-    const res2 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 3 ] })
+      const videos = new Set([
-    expect(res2.body.total).to.equal(0)
+        'video_short.mp4', 'video_short.ogv', 'video_short.webm',
-  })
+        'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
+      ])
-  it('Should have the video updated', async function () {
+      for (const video of videos) {
-    this.timeout(60000)
+        const videoAttributes = {
+          name: video + ' name',
+          description: video + ' description',
+          category: 2,
+          licence: 1,
+          language: 'en',
+          nsfw: true,
+          tags: [ 'tag1', 'tag2', 'tag3' ],
+          fixture: video
+        }
-    const res = await getVideo(server.url, videoId)
+        await uploadVideo(server.url, server.accessToken, videoAttributes, HttpStatusCode.OK_200, mode)
-    const video = res.body
+      }
+    })
+    it('Should have the correct durations', async function () {
+      const res = await getVideosList(server.url)
+      expect(res.body.total).to.equal(6)
+      const videos = res.body.data
+      expect(videos).to.be.an('array')
+      expect(videos).to.have.lengthOf(6)
+      const videosByName = keyBy<{ duration: number }>(videos, 'name')
+      expect(videosByName['video_short.mp4 name'].duration).to.equal(5)
+      expect(videosByName['video_short.ogv name'].duration).to.equal(5)
+      expect(videosByName['video_short.webm name'].duration).to.equal(5)
+      expect(videosByName['video_short1.webm name'].duration).to.equal(10)
+      expect(videosByName['video_short2.webm name'].duration).to.equal(5)
+      expect(videosByName['video_short3.webm name'].duration).to.equal(5)
+    })
+    it('Should have the correct thumbnails', async function () {
+      const res = await getVideosList(server.url)
+      const videos = res.body.data
+      // For the next test
+      videosListBase = videos
+      for (const video of videos) {
+        const videoName = video.name.replace(' name', '')
+        await testImage(server.url, videoName, video.thumbnailPath)
+      }
+    })
+    it('Should list only the two first videos', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, 'name')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+      expect(videos[0].name).to.equal(videosListBase[0].name)
+      expect(videos[1].name).to.equal(videosListBase[1].name)
+    })
+    it('Should list only the next three videos', async function () {
+      const res = await getVideosListPagination(server.url, 2, 3, 'name')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(3)
+      expect(videos[0].name).to.equal(videosListBase[2].name)
+      expect(videos[1].name).to.equal(videosListBase[3].name)
+      expect(videos[2].name).to.equal(videosListBase[4].name)
+    })
+    it('Should list the last video', async function () {
+      const res = await getVideosListPagination(server.url, 5, 6, 'name')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(1)
+      expect(videos[0].name).to.equal(videosListBase[5].name)
+    })
+    it('Should not have the total field', async function () {
+      const res = await getVideosListPagination(server.url, 5, 6, 'name', true)
+      const videos = res.body.data
+      expect(res.body.total).to.not.exist
+      expect(videos.length).to.equal(1)
+      expect(videos[0].name).to.equal(videosListBase[5].name)
+    })
+    it('Should list and sort by name in descending order', async function () {
+      const res = await getVideosListSort(server.url, '-name')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(6)
+      expect(videos[0].name).to.equal('video_short.webm name')
+      expect(videos[1].name).to.equal('video_short.ogv name')
+      expect(videos[2].name).to.equal('video_short.mp4 name')
+      expect(videos[3].name).to.equal('video_short3.webm name')
+      expect(videos[4].name).to.equal('video_short2.webm name')
+      expect(videos[5].name).to.equal('video_short1.webm name')
+      videoId = videos[3].uuid
+      videoId2 = videos[5].uuid
+    })
+    it('Should list and sort by trending in descending order', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, '-trending')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+    })
+    it('Should list and sort by hotness in descending order', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, '-hot')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+    })
+    it('Should list and sort by best in descending order', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, '-best')
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+    })
+    it('Should update a video', async function () {
+      const attributes = {
+        name: 'my super video updated',
+        category: 4,
+        licence: 2,
+        language: 'ar',
+        nsfw: false,
+        description: 'my super description updated',
+        commentsEnabled: false,
+        downloadEnabled: false,
+        tags: [ 'tagup1', 'tagup2' ]
+      }
+      await updateVideo(server.url, server.accessToken, videoId, attributes)
+    })
-    await completeVideoCheck(server.url, video, updateCheckAttributes())
+    it('Should filter by tags and category', async function () {
-  })
+      const res1 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 4 ] })
+      expect(res1.body.total).to.equal(1)
+      expect(res1.body.data[0].name).to.equal('my super video updated')
-  it('Should update only the tags of a video', async function () {
+      const res2 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 3 ] })
-    const attributes = {
+      expect(res2.body.total).to.equal(0)
-      tags: [ 'supertag', 'tag1', 'tag2' ]
+    })
-    }
-    await updateVideo(server.url, server.accessToken, videoId, attributes)
-    const res = await getVideo(server.url, videoId)
+    it('Should have the video updated', async function () {
-    const video = res.body
+      this.timeout(60000)
-    await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes(), attributes))
+      const res = await getVideo(server.url, videoId)
-  })
+      const video = res.body
-  it('Should update only the description of a video', async function () {
+      await completeVideoCheck(server.url, video, updateCheckAttributes())
-    const attributes = {
+    })
-      description: 'hello everybody'
-    }
-    await updateVideo(server.url, server.accessToken, videoId, attributes)
-    const res = await getVideo(server.url, videoId)
+    it('Should update only the tags of a video', async function () {
-    const video = res.body
+      const attributes = {
+        tags: [ 'supertag', 'tag1', 'tag2' ]
+      }
+      await updateVideo(server.url, server.accessToken, videoId, attributes)
-    const expectedAttributes = Object.assign(updateCheckAttributes(), { tags: [ 'supertag', 'tag1', 'tag2' ] }, attributes)
+      const res = await getVideo(server.url, videoId)
-    await completeVideoCheck(server.url, video, expectedAttributes)
+      const video = res.body
-  })
-  it('Should like a video', async function () {
+      await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes(), attributes))
-    await rateVideo(server.url, server.accessToken, videoId, 'like')
+    })
-    const res = await getVideo(server.url, videoId)
+    it('Should update only the description of a video', async function () {
-    const video = res.body
+      const attributes = {
+        description: 'hello everybody'
+      }
+      await updateVideo(server.url, server.accessToken, videoId, attributes)
-    expect(video.likes).to.equal(1)
+      const res = await getVideo(server.url, videoId)
-    expect(video.dislikes).to.equal(0)
+      const video = res.body
-  })
-  it('Should dislike the same video', async function () {
+      const expectedAttributes = Object.assign(updateCheckAttributes(), { tags: [ 'supertag', 'tag1', 'tag2' ] }, attributes)
-    await rateVideo(server.url, server.accessToken, videoId, 'dislike')
+      await completeVideoCheck(server.url, video, expectedAttributes)
+    })
-    const res = await getVideo(server.url, videoId)
+    it('Should like a video', async function () {
-    const video = res.body
+      await rateVideo(server.url, server.accessToken, videoId, 'like')
-    expect(video.likes).to.equal(0)
+      const res = await getVideo(server.url, videoId)
-    expect(video.dislikes).to.equal(1)
+      const video = res.body
-  })
-  it('Should sort by originallyPublishedAt', async function () {
+      expect(video.likes).to.equal(1)
-    {
+      expect(video.dislikes).to.equal(0)
+    })
+    it('Should dislike the same video', async function () {
+      await rateVideo(server.url, server.accessToken, videoId, 'dislike')
+      const res = await getVideo(server.url, videoId)
+      const video = res.body
+      expect(video.likes).to.equal(0)
+      expect(video.dislikes).to.equal(1)
+    })
+    it('Should sort by originallyPublishedAt', async function () {
      {
        const now = new Date()
        const attributes = { originallyPublishedAt: now.toISOString() }
@@ -483,10 +485,18 @@ describe('Test a single server', function () {
        expect(names[4]).to.equal('video_short.ogv name')
        expect(names[5]).to.equal('video_short.mp4 name')
      }
-    }
+    })
+    after(async function () {
+      await cleanupTests([ server ])
+    })
+  }
+  describe('Legacy upload', function () {
+    runSuite('legacy')
  })
-  after(async function () {
+  describe('Resumable upload', function () {
-    await cleanupTests([ server ])
+    runSuite('resumable')
  })
 })
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index d12d58e75..7e7ad028c 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -3,6 +3,7 @@
 import 'mocha'
 import * as chai from 'chai'
 import { basename } from 'path'
+import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 import {
  cleanupTests,
  createUser,
@@ -13,6 +14,7 @@ import {
  getVideo,
  getVideoChannel,
  getVideoChannelVideos,
+  setDefaultVideoChannel,
  testImage,
  updateVideo,
  updateVideoChannelImage,
@@ -33,7 +35,6 @@ import {
 } from '../../../../shared/extra-utils/index'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { User, Video, VideoChannel, VideoDetails } from '../../../../shared/index'
-import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 const expect = chai.expect
@@ -47,9 +48,10 @@ async function findChannel (server: ServerInfo, channelId: number) {
 describe('Test video channels', function () {
  let servers: ServerInfo[]
  let userInfo: User
-  let firstVideoChannelId: number
  let secondVideoChannelId: number
+  let totoChannel: number
  let videoUUID: string
+  let accountName: string
  before(async function () {
    this.timeout(60000)
@@ -57,16 +59,9 @@ describe('Test video channels', function () {
    servers = await flushAndRunMultipleServers(2)
    await setAccessTokensToServers(servers)
-    await doubleFollow(servers[0], servers[1])
+    await setDefaultVideoChannel(servers)
-    {
-      const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
-      const user: User = res.body
-      firstVideoChannelId = user.videoChannels[0].id
-    }
-    await waitJobs(servers)
+    await doubleFollow(servers[0], servers[1])
  })
  it('Should have one video channel (created with root)', async () => {
@@ -116,12 +111,14 @@ describe('Test video channels', function () {
    expect(videoChannels[1].displayName).to.equal('second video channel')
    expect(videoChannels[1].description).to.equal('super video channel description')
    expect(videoChannels[1].support).to.equal('super video channel support text')
+    accountName = userInfo.account.name + '@' + userInfo.account.host
  })
  it('Should have two video channels when getting account channels on server 1', async function () {
    const res = await getAccountVideoChannelsList({
      url: servers[0].url,
-      accountName: userInfo.account.name + '@' + userInfo.account.host
+      accountName
    })
    expect(res.body.total).to.equal(2)
@@ -142,7 +139,7 @@ describe('Test video channels', function () {
    {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        start: 0,
        count: 1,
        sort: 'createdAt'
@@ -158,7 +155,7 @@ describe('Test video channels', function () {
    {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        start: 0,
        count: 1,
        sort: '-createdAt'
@@ -174,7 +171,7 @@ describe('Test video channels', function () {
    {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        start: 1,
        count: 1,
        sort: '-createdAt'
@@ -191,7 +188,7 @@ describe('Test video channels', function () {
  it('Should have one video channel when getting account channels on server 2', async function () {
    const res = await getAccountVideoChannelsList({
      url: servers[1].url,
-      accountName: userInfo.account.name + '@' + userInfo.account.host
+      accountName
    })
    expect(res.body.total).to.equal(1)
@@ -379,7 +376,7 @@ describe('Test video channels', function () {
  it('Should change the video channel of a video', async function () {
    this.timeout(10000)
-    await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: firstVideoChannelId })
+    await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: servers[0].videoChannel.id })
    await waitJobs(servers)
  })
@@ -419,7 +416,8 @@ describe('Test video channels', function () {
  it('Should create the main channel with an uuid if there is a conflict', async function () {
    {
      const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' }
-      await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+      const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+      totoChannel = res.body.videoChannel.id
    }
    {
@@ -438,7 +436,7 @@ describe('Test video channels', function () {
    {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        withStats: true
      })
@@ -456,7 +454,7 @@ describe('Test video channels', function () {
    }
    {
-      // video has been posted on channel firstVideoChannelId since last update
+      // video has been posted on channel servers[0].videoChannel.id since last update
      await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.1,127.0.0.1')
      await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.2,127.0.0.1')
@@ -465,10 +463,10 @@ describe('Test video channels', function () {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        withStats: true
      })
-      const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === firstVideoChannelId)
+      const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === servers[0].videoChannel.id)
      expect(channelWithView.viewsPerDay.slice(-1)[0].views).to.equal(2)
    }
  })
@@ -476,7 +474,7 @@ describe('Test video channels', function () {
  it('Should report correct videos count', async function () {
    const res = await getAccountVideoChannelsList({
      url: servers[0].url,
-      accountName: userInfo.account.name + '@' + userInfo.account.host,
+      accountName,
      withStats: true
    })
    const channels: VideoChannel[] = res.body.data
@@ -492,7 +490,7 @@ describe('Test video channels', function () {
    {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        search: 'root'
      })
      expect(res.body.total).to.equal(1)
@@ -504,7 +502,7 @@ describe('Test video channels', function () {
    {
      const res = await getAccountVideoChannelsList({
        url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
        search: 'does not exist'
      })
      expect(res.body.total).to.equal(0)
@@ -514,6 +512,40 @@ describe('Test video channels', function () {
    }
  })
+  it('Should list channels by updatedAt desc if a video has been uploaded', async function () {
+    this.timeout(30000)
+    await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: totoChannel })
+    await waitJobs(servers)
+    for (const server of servers) {
+      const res = await getAccountVideoChannelsList({
+        url: server.url,
+        accountName,
+        sort: '-updatedAt'
+      })
+      const channels: VideoChannel[] = res.body.data
+      expect(channels[0].name).to.equal('toto_channel')
+      expect(channels[1].name).to.equal('root_channel')
+    }
+    await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: servers[0].videoChannel.id })
+    await waitJobs(servers)
+    for (const server of servers) {
+      const res = await getAccountVideoChannelsList({
+        url: server.url,
+        accountName,
+        sort: '-updatedAt'
+      })
+      const channels: VideoChannel[] = res.body.data
+      expect(channels[0].name).to.equal('root_channel')
+      expect(channels[1].name).to.equal('toto_channel')
+    }
+  })
  after(async function () {
    await cleanupTests(servers)
  })
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 1c99f26df..ea5ffd239 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -361,106 +361,117 @@ describe('Test video transcoding', function () {
  describe('Audio upload', function () {
-    before(async function () {
+    function runSuite (mode: 'legacy' | 'resumable') {
-      await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
-        transcoding: {
+      before(async function () {
-          hls: { enabled: true },
+        await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
-          webtorrent: { enabled: true },
+          transcoding: {
-          resolutions: {
+            hls: { enabled: true },
-            '0p': false,
+            webtorrent: { enabled: true },
-            '240p': false,
+            resolutions: {
-            '360p': false,
+              '0p': false,
-            '480p': false,
+              '240p': false,
-            '720p': false,
+              '360p': false,
-            '1080p': false,
+              '480p': false,
-            '1440p': false,
+              '720p': false,
-            '2160p': false
+              '1080p': false,
+              '1440p': false,
+              '2160p': false
+            }
          }
-        }
+        })
      })
-    })
-    it('Should merge an audio file with the preview file', async function () {
-      this.timeout(60_000)
-      const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
-      await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
-      await waitJobs(servers)
+      it('Should merge an audio file with the preview file', async function () {
+        this.timeout(60_000)
-      for (const server of servers) {
+        const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
-        const res = await getVideosList(server.url)
+        await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg, HttpStatusCode.OK_200, mode)
-        const video = res.body.data.find(v => v.name === 'audio_with_preview')
+        await waitJobs(servers)
-        const res2 = await getVideo(server.url, video.id)
-        const videoDetails: VideoDetails = res2.body
-        expect(videoDetails.files).to.have.lengthOf(1)
+        for (const server of servers) {
+          const res = await getVideosList(server.url)
-        await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          const video = res.body.data.find(v => v.name === 'audio_with_preview')
-        await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          const res2 = await getVideo(server.url, video.id)
+          const videoDetails: VideoDetails = res2.body
-        const magnetUri = videoDetails.files[0].magnetUri
+          expect(videoDetails.files).to.have.lengthOf(1)
-        expect(magnetUri).to.contain('.mp4')
-      }
-    })
-    it('Should upload an audio file and choose a default background image', async function () {
+          await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
-      this.timeout(60_000)
+          await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
-      const videoAttributesArg = { name: 'audio_without_preview', fixture: 'sample.ogg' }
+          const magnetUri = videoDetails.files[0].magnetUri
-      await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
+          expect(magnetUri).to.contain('.mp4')
+        }
+      })
-      await waitJobs(servers)
+      it('Should upload an audio file and choose a default background image', async function () {
+        this.timeout(60_000)
-      for (const server of servers) {
+        const videoAttributesArg = { name: 'audio_without_preview', fixture: 'sample.ogg' }
-        const res = await getVideosList(server.url)
+        await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg, HttpStatusCode.OK_200, mode)
-        const video = res.body.data.find(v => v.name === 'audio_without_preview')
+        await waitJobs(servers)
-        const res2 = await getVideo(server.url, video.id)
-        const videoDetails = res2.body
-        expect(videoDetails.files).to.have.lengthOf(1)
+        for (const server of servers) {
+          const res = await getVideosList(server.url)
-        await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          const video = res.body.data.find(v => v.name === 'audio_without_preview')
-        await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          const res2 = await getVideo(server.url, video.id)
+          const videoDetails = res2.body
-        const magnetUri = videoDetails.files[0].magnetUri
+          expect(videoDetails.files).to.have.lengthOf(1)
-        expect(magnetUri).to.contain('.mp4')
-      }
-    })
-    it('Should upload an audio file and create an audio version only', async function () {
+          await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
-      this.timeout(60_000)
+          await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
-      await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
+          const magnetUri = videoDetails.files[0].magnetUri
-        transcoding: {
+          expect(magnetUri).to.contain('.mp4')
-          hls: { enabled: true },
-          webtorrent: { enabled: true },
-          resolutions: {
-            '0p': true,
-            '240p': false,
-            '360p': false
-          }
        }
      })
-      const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
+      it('Should upload an audio file and create an audio version only', async function () {
-      const resVideo = await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
+        this.timeout(60_000)
+        await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
+          transcoding: {
+            hls: { enabled: true },
+            webtorrent: { enabled: true },
+            resolutions: {
+              '0p': true,
+              '240p': false,
+              '360p': false
+            }
+          }
+        })
-      await waitJobs(servers)
+        const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
+        const resVideo = await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg, HttpStatusCode.OK_200, mode)
-      for (const server of servers) {
+        await waitJobs(servers)
-        const res2 = await getVideo(server.url, resVideo.body.video.id)
-        const videoDetails: VideoDetails = res2.body
+        for (const server of servers) {
+          const res2 = await getVideo(server.url, resVideo.body.video.id)
+          const videoDetails: VideoDetails = res2.body
-        for (const files of [ videoDetails.files, videoDetails.streamingPlaylists[0].files ]) {
+          for (const files of [ videoDetails.files, videoDetails.streamingPlaylists[0].files ]) {
-          expect(files).to.have.lengthOf(2)
+            expect(files).to.have.lengthOf(2)
-          expect(files.find(f => f.resolution.id === 0)).to.not.be.undefined
+            expect(files.find(f => f.resolution.id === 0)).to.not.be.undefined
+          }
        }
-      }
-      await updateConfigForTranscoding(servers[1])
+        await updateConfigForTranscoding(servers[1])
+      })
+    }
+    describe('Legacy upload', function () {
+      runSuite('legacy')
+    })
+    describe('Resumable upload', function () {
+      runSuite('resumable')
    })
  })
diff --git a/server/tests/fixtures/peertube-plugin-test-four/main.js b/server/tests/fixtures/peertube-plugin-test-four/main.js
index 6ed0c20d2..b9b207b81 100644
--- a/server/tests/fixtures/peertube-plugin-test-four/main.js
+++ b/server/tests/fixtures/peertube-plugin-test-four/main.js
@@ -88,8 +88,8 @@ async function register ({
      return res.json({ routerRoute })
    })
-    router.get('/user', (req, res) => {
+    router.get('/user', async (req, res) => {
-      const user = peertubeHelpers.user.getAuthUser(res)
+      const user = await peertubeHelpers.user.getAuthUser(res)
      if (!user) return res.sendStatus(404)
      const isAdmin = user.role === 0
@@ -98,6 +98,7 @@ async function register ({
      return res.json({
        username: user.username,
+        displayName: user.Account.name,
        isAdmin,
        isModerator,
        isUser
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts
index ac958c5f5..cf1dd0854 100644
--- a/server/tests/plugins/filter-hooks.ts
+++ b/server/tests/plugins/filter-hooks.ts
@@ -55,7 +55,7 @@ describe('Test plugin filter hooks', function () {
  let threadId: number
  before(async function () {
-    this.timeout(30000)
+    this.timeout(60000)
    servers = await flushAndRunMultipleServers(2)
    await setAccessTokensToServers(servers)
diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts
index 20020ec41..f72de8229 100644
--- a/server/tests/plugins/plugin-helpers.ts
+++ b/server/tests/plugins/plugin-helpers.ts
@@ -133,6 +133,7 @@ describe('Test plugin helpers', function () {
      })
      expect(res.body.username).to.equal('root')
+      expect(res.body.displayName).to.equal('root')
      expect(res.body.isAdmin).to.be.true
      expect(res.body.isModerator).to.be.false
      expect(res.body.isUser).to.be.false
diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index 08e8cd713..c8a576844 100644
--- a/server/tools/peertube-plugins.ts
+++ b/server/tools/peertube-plugins.ts
@@ -24,7 +24,7 @@ program
  .option('-p, --password <token>', 'Password')
  .option('-t, --only-themes', 'List themes only')
  .option('-P, --only-plugins', 'List plugins only')
-  .action(() => pluginsListCLI())
+  .action((options, command) => pluginsListCLI(command, options))
 program
  .command('install')
@@ -61,12 +61,10 @@ if (!process.argv.slice(2).length) {
 program.parse(process.argv)
-const options = program.opts()
 // ----------------------------------------------------------------------------
-async function pluginsListCLI () {
+async function pluginsListCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
-  const { url, username, password } = await getServerCredentials(program)
+  const { url, username, password } = await getServerCredentials(command)
  const accessToken = await getAdminTokenOrDie(url, username, password)
  let pluginType: PluginType
diff --git a/server/types/models/account/actor.ts b/server/types/models/account/actor.ts
index 8f3f30074..0b620872e 100644
--- a/server/types/models/account/actor.ts
+++ b/server/types/models/account/actor.ts
@@ -150,7 +150,7 @@ export type MActorSummaryFormattable =
 export type MActorFormattable =
  MActorSummaryFormattable &
-  Pick<MActor, 'id' | 'followingCount' | 'followersCount' | 'createdAt' | 'updatedAt' | 'bannerId' | 'avatarId'> &
+  Pick<MActor, 'id' | 'followingCount' | 'followersCount' | 'createdAt' | 'updatedAt' | 'remoteCreatedAt' | 'bannerId' | 'avatarId'> &
  Use<'Server', MServerHost & Partial<Pick<MServer, 'redundancyAllowed'>>> &
  UseOpt<'Banner', MActorImageFormattable>
diff --git a/server/types/plugins/register-server-option.model.ts b/server/types/plugins/register-server-option.model.ts
index 4af476ed2..2432b7ac4 100644
--- a/server/types/plugins/register-server-option.model.ts
+++ b/server/types/plugins/register-server-option.model.ts
@@ -70,13 +70,13 @@ export type PeerTubeHelpers = {
  user: {
    // PeerTube >= 3.2
-    getAuthUser: (response: Response) => {
+    getAuthUser: (response: Response) => Promise<{
      id?: string
      username: string
      email: string
      blocked: boolean
      role: UserRole
-    } | undefined
+    } | undefined>
  }
 }
diff --git a/server/typings/express/index.d.ts b/server/typings/express/index.d.ts
index cf3e7ae34..55b6e0039 100644
--- a/server/typings/express/index.d.ts
+++ b/server/typings/express/index.d.ts
@@ -19,6 +19,9 @@ import { MPlugin, MServer, MServerBlocklist } from '@server/types/models/server'
 import { MVideoImportDefault } from '@server/types/models/video/video-import'
 import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element'
 import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate'
+import { HttpMethod } from '@shared/core-utils/miscs/http-methods'
+import { VideoCreate } from '@shared/models'
+import { File as UploadXFile, Metadata } from '@uploadx/core'
 import { RegisteredPlugin } from '../../lib/plugins/plugin-manager'
 import {
  MAccountDefault,
@@ -37,86 +40,125 @@ import {
  MVideoThumbnail,
  MVideoWithRights
 } from '../../types/models'
 declare module 'express' {
  export interface Request {
    query: any
+    method: HttpMethod
  }
-  interface Response {
-    locals: PeerTubeLocals
+  // Upload using multer or uploadx middleware
+  export type MulterOrUploadXFile = UploadXFile | Express.Multer.File
+  export type UploadFiles = {
+    [fieldname: string]: MulterOrUploadXFile[]
+  } | MulterOrUploadXFile[]
+  // Partial object used by some functions to check the file mimetype/extension
+  export type UploadFileForCheck = {
+    originalname: string
+    mimetype: string
  }
-}
-interface PeerTubeLocals {
+  export type UploadFilesForCheck = {
-  videoAll?: MVideoFullLight
+    [fieldname: string]: UploadFileForCheck[]
-  onlyImmutableVideo?: MVideoImmutable
+  } | UploadFileForCheck[]
-  onlyVideo?: MVideoThumbnail
-  onlyVideoWithRights?: MVideoWithRights
-  videoId?: MVideoIdThumbnail
-  videoLive?: MVideoLive
+  // Upload file with a duration added by our middleware
+  export type VideoUploadFile = Pick<Express.Multer.File, 'path' | 'filename' | 'size'> & {
+    duration: number
+  }
-  videoShare?: MVideoShareActor
+  // Extends Metadata property of UploadX object
+  export type UploadXFileMetadata = Metadata & VideoCreate & {
+    previewfile: Express.Multer.File[]
+    thumbnailfile: Express.Multer.File[]
+  }
-  videoFile?: MVideoFile
+  // Our custom UploadXFile object using our custom metadata
+  export type CustomUploadXFile <T extends Metadata> = UploadXFile & { metadata: T }
-  videoImport?: MVideoImportDefault
+  export type EnhancedUploadXFile = CustomUploadXFile<UploadXFileMetadata> & {
+    duration: number
+    path: string
+    filename: string
+  }
-  videoBlacklist?: MVideoBlacklist
+  // Extends locals property from Response
+  interface Response {
+    locals: {
+      videoAll?: MVideoFullLight
+      onlyImmutableVideo?: MVideoImmutable
+      onlyVideo?: MVideoThumbnail
+      onlyVideoWithRights?: MVideoWithRights
+      videoId?: MVideoIdThumbnail
-  videoCaption?: MVideoCaptionVideo
+      videoLive?: MVideoLive
-  abuse?: MAbuseReporter
+      videoShare?: MVideoShareActor
-  abuseMessage?: MAbuseMessage
-  videoStreamingPlaylist?: MStreamingPlaylist
+      videoFile?: MVideoFile
-  videoChannel?: MChannelBannerAccountDefault
+      videoFileResumable?: EnhancedUploadXFile
-  videoPlaylistFull?: MVideoPlaylistFull
+      videoImport?: MVideoImportDefault
-  videoPlaylistSummary?: MVideoPlaylistFullSummary
-  videoPlaylistElement?: MVideoPlaylistElement
+      videoBlacklist?: MVideoBlacklist
-  videoPlaylistElementAP?: MVideoPlaylistElementVideoUrlPlaylistPrivacy
-  accountVideoRate?: MAccountVideoRateAccountVideo
+      videoCaption?: MVideoCaptionVideo
-  videoCommentFull?: MCommentOwnerVideoReply
+      abuse?: MAbuseReporter
-  videoCommentThread?: MComment
+      abuseMessage?: MAbuseMessage
-  follow?: MActorFollowActorsDefault
+      videoStreamingPlaylist?: MStreamingPlaylist
-  subscription?: MActorFollowActorsDefaultSubscription
-  nextOwner?: MAccountDefault
+      videoChannel?: MChannelBannerAccountDefault
-  videoChangeOwnership?: MVideoChangeOwnershipFull
-  account?: MAccountDefault
+      videoPlaylistFull?: MVideoPlaylistFull
+      videoPlaylistSummary?: MVideoPlaylistFullSummary
-  actorUrl?: MActorUrl
+      videoPlaylistElement?: MVideoPlaylistElement
-  actorFull?: MActorFull
+      videoPlaylistElementAP?: MVideoPlaylistElementVideoUrlPlaylistPrivacy
-  user?: MUserDefault
+      accountVideoRate?: MAccountVideoRateAccountVideo
-  server?: MServer
+      videoCommentFull?: MCommentOwnerVideoReply
+      videoCommentThread?: MComment
-  videoRedundancy?: MVideoRedundancyVideo
+      follow?: MActorFollowActorsDefault
+      subscription?: MActorFollowActorsDefaultSubscription
-  accountBlock?: MAccountBlocklist
+      nextOwner?: MAccountDefault
-  serverBlock?: MServerBlocklist
+      videoChangeOwnership?: MVideoChangeOwnershipFull
-  oauth?: {
+      account?: MAccountDefault
-    token: MOAuthTokenUser
-  }
-  signature?: {
+      actorUrl?: MActorUrl
-    actor: MActorAccountChannelId
+      actorFull?: MActorFull
-  }
+      user?: MUserDefault
+      server?: MServer
+      videoRedundancy?: MVideoRedundancyVideo
-  authenticated?: boolean
+      accountBlock?: MAccountBlocklist
+      serverBlock?: MServerBlocklist
-  registeredPlugin?: RegisteredPlugin
+      oauth?: {
+        token: MOAuthTokenUser
+      }
-  externalAuth?: RegisterServerAuthExternalOptions
+      signature?: {
+        actor: MActorAccountChannelId
+      }
-  plugin?: MPlugin
+      authenticated?: boolean
+      registeredPlugin?: RegisteredPlugin
+      externalAuth?: RegisterServerAuthExternalOptions
+      plugin?: MPlugin
+    }
+  }
 }
diff --git a/shared/core-utils/miscs/http-methods.ts b/shared/core-utils/miscs/http-methods.ts
new file mode 100644
index 000000000..1cfa458b9
--- /dev/null
+++ b/shared/core-utils/miscs/http-methods.ts
@@ -0,0 +1,21 @@
+/** HTTP request method to indicate the desired action to be performed for a given resource. */
+export enum HttpMethod {
+  /** The CONNECT method establishes a tunnel to the server identified by the target resource. */
+  CONNECT = 'CONNECT',
+  /** The DELETE method deletes the specified resource. */
+  DELETE = 'DELETE',
+  /** The GET method requests a representation of the specified resource. Requests using GET should only retrieve data. */
+  GET = 'GET',
+  /** The HEAD method asks for a response identical to that of a GET request, but without the response body. */
+  HEAD = 'HEAD',
+  /** The OPTIONS method is used to describe the communication options for the target resource. */
+  OPTIONS = 'OPTIONS',
+  /** The PATCH method is used to apply partial modifications to a resource. */
+  PATCH = 'PATCH',
+  /** The POST method is used to submit an entity to the specified resource */
+  POST = 'POST',
+  /** The PUT method replaces all current representations of the target resource with the request payload. */
+  PUT = 'PUT',
+  /** The TRACE method performs a message loop-back test along the path to the target resource. */
+  TRACE = 'TRACE'
+}
diff --git a/shared/core-utils/miscs/index.ts b/shared/core-utils/miscs/index.ts
index 898fd4791..251df1de2 100644
--- a/shared/core-utils/miscs/index.ts
+++ b/shared/core-utils/miscs/index.ts
@@ -2,3 +2,4 @@ export * from './date'
 export * from './miscs'
 export * from './types'
 export * from './http-error-codes'
+export * from './http-methods'
diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts
index 026a5e61c..b70110852 100644
--- a/shared/extra-utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -223,6 +223,18 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
  return updateCustomConfig(url, token, updateParams)
 }
+function getCustomConfigResolutions (enabled: boolean) {
+  return {
+    '240p': enabled,
+    '360p': enabled,
+    '480p': enabled,
+    '720p': enabled,
+    '1080p': enabled,
+    '1440p': enabled,
+    '2160p': enabled
+  }
+}
 function deleteCustomConfig (url: string, token: string, statusCodeExpected = HttpStatusCode.OK_200) {
  const path = '/api/v1/config/custom'
@@ -242,5 +254,6 @@ export {
  updateCustomConfig,
  getAbout,
  deleteCustomConfig,
-  updateCustomSubConfig
+  updateCustomSubConfig,
+  getCustomConfigResolutions
 }
diff --git a/shared/extra-utils/server/debug.ts b/shared/extra-utils/server/debug.ts
index 5cf80a5fb..f196812b7 100644
--- a/shared/extra-utils/server/debug.ts
+++ b/shared/extra-utils/server/debug.ts
@@ -1,5 +1,6 @@
-import { makeGetRequest } from '../requests/requests'
+import { makeGetRequest, makePostBodyRequest } from '../requests/requests'
 import { HttpStatusCode } from '../../core-utils/miscs/http-error-codes'
+import { SendDebugCommand } from '@shared/models'
 function getDebug (url: string, token: string) {
  const path = '/api/v1/server/debug'
@@ -12,8 +13,21 @@ function getDebug (url: string, token: string) {
  })
 }
+function sendDebugCommand (url: string, token: string, body: SendDebugCommand) {
+  const path = '/api/v1/server/debug/run-command'
+  return makePostBodyRequest({
+    url,
+    path,
+    token,
+    fields: body,
+    statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+  })
+}
 // ---------------------------------------------------------------------------
 export {
-  getDebug
+  getDebug,
+  sendDebugCommand
 }
diff --git a/shared/extra-utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts
index 704929bd4..763374e03 100644
--- a/shared/extra-utils/server/jobs.ts
+++ b/shared/extra-utils/server/jobs.ts
@@ -55,7 +55,7 @@ function getJobsListPaginationAndSort (options: {
 async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
  const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT
    ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10)
-    : 500
+    : 250
  let servers: ServerInfo[]
@@ -115,7 +115,7 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
    }
    if (pendingRequests) {
-      await wait(1000)
+      await wait(pendingJobWait)
    }
  } while (pendingRequests)
 }
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 779a3cc36..479f08e12 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -274,7 +274,7 @@ async function reRunServer (server: ServerInfo, configOverride?: any) {
 }
 async function checkTmpIsEmpty (server: ServerInfo) {
-  await checkDirectoryIsEmpty(server, 'tmp', [ 'plugins-global.css', 'hls' ])
+  await checkDirectoryIsEmpty(server, 'tmp', [ 'plugins-global.css', 'hls', 'resumable-uploads' ])
  if (await pathExists(join('test' + server.internalServerNumber, 'tmp', 'hls'))) {
    await checkDirectoryIsEmpty(server, 'tmp/hls')
diff --git a/shared/extra-utils/users/users.ts b/shared/extra-utils/users/users.ts
index 6040dd9c0..0f15962ad 100644
--- a/shared/extra-utils/users/users.ts
+++ b/shared/extra-utils/users/users.ts
@@ -1,5 +1,6 @@
 import { omit } from 'lodash'
 import * as request from 'supertest'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 import { UserUpdateMe } from '../../models/users'
 import { UserAdminFlag } from '../../models/users/user-flag.model'
 import { UserRegister } from '../../models/users/user-register.model'
@@ -7,9 +8,8 @@ import { UserRole } from '../../models/users/user-role'
 import { makeGetRequest, makePostBodyRequest, makePutBodyRequest, updateImageRequest } from '../requests/requests'
 import { ServerInfo } from '../server/servers'
 import { userLogin } from './login'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-type CreateUserArgs = {
+function createUser (parameters: {
  url: string
  accessToken: string
  username: string
@@ -19,8 +19,7 @@ type CreateUserArgs = {
  role?: UserRole
  adminFlags?: UserAdminFlag
  specialStatus?: number
-}
+}) {
-function createUser (parameters: CreateUserArgs) {
  const {
    url,
    accessToken,
@@ -52,6 +51,21 @@ function createUser (parameters: CreateUserArgs) {
          .expect(specialStatus)
 }
+async function generateUser (server: ServerInfo, username: string) {
+  const password = 'my super password'
+  const resCreate = await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
+  const token = await userLogin(server, { username, password })
+  const resMe = await getMyUserInformation(server.url, token)
+  return {
+    token,
+    userId: resCreate.body.user.id,
+    userChannelId: resMe.body.videoChannels[0].id
+  }
+}
 async function generateUserAccessToken (server: ServerInfo, username: string) {
  const password = 'my super password'
  await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
@@ -393,6 +407,7 @@ export {
  resetPassword,
  renewUserScopedTokens,
  updateMyAvatar,
+  generateUser,
  askSendVerifyEmail,
  generateUserAccessToken,
  verifyEmail,
diff --git a/shared/extra-utils/videos/video-channels.ts b/shared/extra-utils/videos/video-channels.ts
index d0dfb5856..0aab93e52 100644
--- a/shared/extra-utils/videos/video-channels.ts
+++ b/shared/extra-utils/videos/video-channels.ts
@@ -5,7 +5,7 @@ import { VideoChannelUpdate } from '../../models/videos/channel/video-channel-up
 import { VideoChannelCreate } from '../../models/videos/channel/video-channel-create.model'
 import { makeDeleteRequest, makeGetRequest, updateImageRequest } from '../requests/requests'
 import { ServerInfo } from '../server/servers'
-import { User } from '../../models/users/user.model'
+import { MyUser, User } from '../../models/users/user.model'
 import { getMyUserInformation } from '../users/users'
 import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
@@ -170,6 +170,12 @@ function setDefaultVideoChannel (servers: ServerInfo[]) {
  return Promise.all(tasks)
 }
+async function getDefaultVideoChannel (url: string, token: string) {
+  const res = await getMyUserInformation(url, token)
+  return (res.body as MyUser).videoChannels[0].id
+}
 // ---------------------------------------------------------------------------
 export {
@@ -181,5 +187,6 @@ export {
  deleteVideoChannel,
  getVideoChannel,
  setDefaultVideoChannel,
-  deleteVideoChannelImage
+  deleteVideoChannelImage,
+  getDefaultVideoChannel
 }
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts
index a0143b0ef..e88256ac0 100644
--- a/shared/extra-utils/videos/videos.ts
+++ b/shared/extra-utils/videos/videos.ts
@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
 import { expect } from 'chai'
-import { pathExists, readdir, readFile } from 'fs-extra'
+import { createReadStream, pathExists, readdir, readFile, stat } from 'fs-extra'
+import got, { Response as GotResponse } from 'got/dist/source'
 import * as parseTorrent from 'parse-torrent'
 import { extname, join } from 'path'
 import * as request from 'supertest'
@@ -42,6 +43,7 @@ type VideoAttributes = {
  channelId?: number
  privacy?: VideoPrivacy
  fixture?: string
+  support?: string
  thumbnailfile?: string
  previewfile?: string
  scheduleUpdate?: {
@@ -364,8 +366,13 @@ async function checkVideoFilesWereRemoved (
  }
 }
-async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = HttpStatusCode.OK_200) {
+async function uploadVideo (
-  const path = '/api/v1/videos/upload'
+  url: string,
+  accessToken: string,
+  videoAttributesArg: VideoAttributes,
+  specialStatus = HttpStatusCode.OK_200,
+  mode: 'legacy' | 'resumable' = 'legacy'
+) {
  let defaultChannelId = '1'
  try {
@@ -391,74 +398,170 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg
    fixture: 'video_short.webm'
  }, videoAttributesArg)
+  const res = mode === 'legacy'
+    ? await buildLegacyUpload(url, accessToken, attributes, specialStatus)
+    : await buildResumeUpload(url, accessToken, attributes, specialStatus)
+  // Wait torrent generation
+  if (specialStatus === HttpStatusCode.OK_200) {
+    let video: VideoDetails
+    do {
+      const resVideo = await getVideoWithToken(url, accessToken, res.body.video.uuid)
+      video = resVideo.body
+      await wait(50)
+    } while (!video.files[0].torrentUrl)
+  }
+  return res
+}
+function checkUploadVideoParam (
+  url: string,
+  token: string,
+  attributes: Partial<VideoAttributes>,
+  specialStatus = HttpStatusCode.OK_200,
+  mode: 'legacy' | 'resumable' = 'legacy'
+) {
+  return mode === 'legacy'
+    ? buildLegacyUpload(url, token, attributes, specialStatus)
+    : buildResumeUpload(url, token, attributes, specialStatus)
+}
+async function buildLegacyUpload (url: string, token: string, attributes: VideoAttributes, specialStatus = HttpStatusCode.OK_200) {
+  const path = '/api/v1/videos/upload'
  const req = request(url)
              .post(path)
              .set('Accept', 'application/json')
-              .set('Authorization', 'Bearer ' + accessToken)
+              .set('Authorization', 'Bearer ' + token)
-              .field('name', attributes.name)
-              .field('nsfw', JSON.stringify(attributes.nsfw))
-              .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled))
-              .field('downloadEnabled', JSON.stringify(attributes.downloadEnabled))
-              .field('waitTranscoding', JSON.stringify(attributes.waitTranscoding))
-              .field('privacy', attributes.privacy.toString())
-              .field('channelId', attributes.channelId)
-  if (attributes.support !== undefined) {
-    req.field('support', attributes.support)
-  }
-  if (attributes.description !== undefined) {
+  buildUploadReq(req, attributes)
-    req.field('description', attributes.description)
-  }
-  if (attributes.language !== undefined) {
-    req.field('language', attributes.language.toString())
-  }
-  if (attributes.category !== undefined) {
-    req.field('category', attributes.category.toString())
-  }
-  if (attributes.licence !== undefined) {
-    req.field('licence', attributes.licence.toString())
-  }
-  const tags = attributes.tags || []
+  if (attributes.fixture !== undefined) {
-  for (let i = 0; i < tags.length; i++) {
+    req.attach('videofile', buildAbsoluteFixturePath(attributes.fixture))
-    req.field('tags[' + i + ']', attributes.tags[i])
  }
-  if (attributes.thumbnailfile !== undefined) {
+  return req.expect(specialStatus)
-    req.attach('thumbnailfile', buildAbsoluteFixturePath(attributes.thumbnailfile))
+}
-  }
-  if (attributes.previewfile !== undefined) {
-    req.attach('previewfile', buildAbsoluteFixturePath(attributes.previewfile))
-  }
-  if (attributes.scheduleUpdate) {
+async function buildResumeUpload (url: string, token: string, attributes: VideoAttributes, specialStatus = HttpStatusCode.OK_200) {
-    req.field('scheduleUpdate[updateAt]', attributes.scheduleUpdate.updateAt)
+  let size = 0
+  let videoFilePath: string
+  let mimetype = 'video/mp4'
-    if (attributes.scheduleUpdate.privacy) {
+  if (attributes.fixture) {
-      req.field('scheduleUpdate[privacy]', attributes.scheduleUpdate.privacy)
+    videoFilePath = buildAbsoluteFixturePath(attributes.fixture)
+    size = (await stat(videoFilePath)).size
+    if (videoFilePath.endsWith('.mkv')) {
+      mimetype = 'video/x-matroska'
+    } else if (videoFilePath.endsWith('.webm')) {
+      mimetype = 'video/webm'
    }
  }
-  if (attributes.originallyPublishedAt !== undefined) {
+  const initializeSessionRes = await prepareResumableUpload({ url, token, attributes, size, mimetype })
-    req.field('originallyPublishedAt', attributes.originallyPublishedAt)
+  const initStatus = initializeSessionRes.status
+  if (videoFilePath && initStatus === HttpStatusCode.CREATED_201) {
+    const locationHeader = initializeSessionRes.header['location']
+    expect(locationHeader).to.not.be.undefined
+    const pathUploadId = locationHeader.split('?')[1]
+    return sendResumableChunks({ url, token, pathUploadId, videoFilePath, size, specialStatus })
  }
-  const res = await req.attach('videofile', buildAbsoluteFixturePath(attributes.fixture))
+  const expectedInitStatus = specialStatus === HttpStatusCode.OK_200
-            .expect(specialStatus)
+    ? HttpStatusCode.CREATED_201
+    : specialStatus
-  // Wait torrent generation
+  expect(initStatus).to.equal(expectedInitStatus)
-  if (specialStatus === HttpStatusCode.OK_200) {
-    let video: VideoDetails
-    do {
-      const resVideo = await getVideoWithToken(url, accessToken, res.body.video.uuid)
-      video = resVideo.body
-      await wait(50)
+  return initializeSessionRes
-    } while (!video.files[0].torrentUrl)
+}
+async function prepareResumableUpload (options: {
+  url: string
+  token: string
+  attributes: VideoAttributes
+  size: number
+  mimetype: string
+}) {
+  const { url, token, attributes, size, mimetype } = options
+  const path = '/api/v1/videos/upload-resumable'
+  const req = request(url)
+              .post(path)
+              .set('Authorization', 'Bearer ' + token)
+              .set('X-Upload-Content-Type', mimetype)
+              .set('X-Upload-Content-Length', size.toString())
+  buildUploadReq(req, attributes)
+  if (attributes.fixture) {
+    req.field('filename', attributes.fixture)
  }
-  return res
+  return req
+}
+function sendResumableChunks (options: {
+  url: string
+  token: string
+  pathUploadId: string
+  videoFilePath: string
+  size: number
+  specialStatus?: HttpStatusCode
+  contentLength?: number
+  contentRangeBuilder?: (start: number, chunk: any) => string
+}) {
+  const { url, token, pathUploadId, videoFilePath, size, specialStatus, contentLength, contentRangeBuilder } = options
+  const expectedStatus = specialStatus || HttpStatusCode.OK_200
+  const path = '/api/v1/videos/upload-resumable'
+  let start = 0
+  const readable = createReadStream(videoFilePath, { highWaterMark: 8 * 1024 })
+  return new Promise<GotResponse>((resolve, reject) => {
+    readable.on('data', async function onData (chunk) {
+      readable.pause()
+      const headers = {
+        'Authorization': 'Bearer ' + token,
+        'Content-Type': 'application/octet-stream',
+        'Content-Range': contentRangeBuilder
+          ? contentRangeBuilder(start, chunk)
+          : `bytes ${start}-${start + chunk.length - 1}/${size}`,
+        'Content-Length': contentLength ? contentLength + '' : chunk.length + ''
+      }
+      const res = await got({
+        url,
+        method: 'put',
+        headers,
+        path: path + '?' + pathUploadId,
+        body: chunk,
+        responseType: 'json',
+        throwHttpErrors: false
+      })
+      start += chunk.length
+      if (res.statusCode === expectedStatus) {
+        return resolve(res)
+      }
+      if (res.statusCode !== HttpStatusCode.PERMANENT_REDIRECT_308) {
+        readable.off('data', onData)
+        return reject(new Error('Incorrect transient behaviour sending intermediary chunks'))
+      }
+      readable.resume()
+    })
+  })
 }
 function updateVideo (
@@ -749,11 +852,13 @@ export {
  getVideoWithToken,
  getVideosList,
  removeAllVideos,
+  checkUploadVideoParam,
  getVideosListPagination,
  getVideosListSort,
  removeVideo,
  getVideosListWithToken,
  uploadVideo,
+  sendResumableChunks,
  getVideosWithFilters,
  uploadRandomVideoOnServers,
  updateVideo,
@@ -767,5 +872,50 @@ export {
  getMyVideosWithFilter,
  uploadVideoAndGetId,
  getLocalIdByUUID,
-  getVideoIdFromUUID
+  getVideoIdFromUUID,
+  prepareResumableUpload
+}
+// ---------------------------------------------------------------------------
+function buildUploadReq (req: request.Test, attributes: VideoAttributes) {
+  for (const key of [ 'name', 'support', 'channelId', 'description', 'originallyPublishedAt' ]) {
+    if (attributes[key] !== undefined) {
+      req.field(key, attributes[key])
+    }
+  }
+  for (const key of [ 'nsfw', 'commentsEnabled', 'downloadEnabled', 'waitTranscoding' ]) {
+    if (attributes[key] !== undefined) {
+      req.field(key, JSON.stringify(attributes[key]))
+    }
+  }
+  for (const key of [ 'language', 'privacy', 'category', 'licence' ]) {
+    if (attributes[key] !== undefined) {
+      req.field(key, attributes[key].toString())
+    }
+  }
+  const tags = attributes.tags || []
+  for (let i = 0; i < tags.length; i++) {
+    req.field('tags[' + i + ']', attributes.tags[i])
+  }
+  for (const key of [ 'thumbnailfile', 'previewfile' ]) {
+    if (attributes[key] !== undefined) {
+      req.attach(key, buildAbsoluteFixturePath(attributes[key]))
+    }
+  }
+  if (attributes.scheduleUpdate) {
+    if (attributes.scheduleUpdate.updateAt) {
+      req.field('scheduleUpdate[updateAt]', attributes.scheduleUpdate.updateAt)
+    }
+    if (attributes.scheduleUpdate.privacy) {
+      req.field('scheduleUpdate[privacy]', attributes.scheduleUpdate.privacy)
+    }
+  }
 }
diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts
index c59be3f3b..09d4f7402 100644
--- a/shared/models/activitypub/activitypub-actor.ts
+++ b/shared/models/activitypub/activitypub-actor.ts
@@ -29,4 +29,6 @@ export interface ActivityPubActor {
  icon?: ActivityIconObject
  image?: ActivityIconObject
+  published?: string
 }
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
index 120dec271..f2138077e 100644
--- a/shared/models/actors/account.model.ts
+++ b/shared/models/actors/account.model.ts
@@ -5,6 +5,8 @@ export interface Account extends Actor {
  displayName: string
  description: string
+  updatedAt: Date | string
  userId?: number
 }
diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts
index 7d9f35b10..fd0662331 100644
--- a/shared/models/actors/actor.model.ts
+++ b/shared/models/actors/actor.model.ts
@@ -8,6 +8,5 @@ export interface Actor {
  followingCount: number
  followersCount: number
  createdAt: Date | string
-  updatedAt: Date | string
  avatar?: ActorImage
 }
diff --git a/shared/models/search/boolean-both-query.model.ts b/shared/models/search/boolean-both-query.model.ts
index 57b0e8d44..d6a438249 100644
--- a/shared/models/search/boolean-both-query.model.ts
+++ b/shared/models/search/boolean-both-query.model.ts
@@ -1 +1,2 @@
 export type BooleanBothQuery = 'true' | 'false' | 'both'
+export type BooleanQuery = 'true' | 'false'
diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts
index 61cba6518..7ceff9137 100644
--- a/shared/models/server/debug.model.ts
+++ b/shared/models/server/debug.model.ts
@@ -1,3 +1,7 @@
 export interface Debug {
  ip: string
 }
+export interface SendDebugCommand {
+  command: 'remove-dandling-resumable-uploads'
+}
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 56517972d..5393f924d 100644
--- a/shared/models/videos/channel/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -11,6 +11,9 @@ export interface VideoChannel extends Actor {
  description: string
  support: string
  isLocal: boolean
+  updatedAt: Date | string
  ownerAccount?: Account
  videosCount?: number
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index d4fe15664..4fbf5b055 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -12,8 +12,6 @@ info:
    url: 'https://joinpeertube.org/img/brand.png'
    altText: PeerTube Project Homepage
  description: |
-    # Introduction
    The PeerTube API is built on HTTP(S) and is RESTful. You can use your favorite
    HTTP/REST library for your programming language to use PeerTube. The spec API is fully compatible with
    [openapi-generator](https://github.com/OpenAPITools/openapi-generator/wiki/API-client-generator-HOWTO)
@@ -23,13 +21,14 @@ info:
    - [Go](https://framagit.org/framasoft/peertube/clients/go)
    - [Kotlin](https://framagit.org/framasoft/peertube/clients/kotlin)
-    See the [Quick Start guide](https://docs.joinpeertube.org/api-rest-getting-started) so you can play with the PeerTube API.
+    See the [REST API quick start](https://docs.joinpeertube.org/api-rest-getting-started) for a few
+    examples of using with the PeerTube API.
    # Authentication
-    When you sign up for an account, you are given the possibility to generate
+    When you sign up for an account on a PeerTube instance, you are given the possibility
-    sessions, and authenticate using this session token. One session token can
+    to generate sessions on it, and authenticate there using a session token. Only __one
-    currently be used at a time.
+    session token can currently be used at a time__.
    ## Roles
@@ -48,6 +47,30 @@ info:
      "error": "Token is invalid." // example exposed error message
    }
    ```
+    # Rate limits
+    We are rate-limiting all endpoints of PeerTube's API. Custom values can be set by administrators:
+    | Endpoint                | Calls            | Time frame                |
+    |-------------------------|------------------|---------------------------|
+    | `/*`                    | 50               | 10 seconds                |
+    | `POST /users/token`     | 15               | 5 minutes                 |
+    | `POST /users/register`  | 2¹               | 5 minutes                 |
+    | `POST /users/ask-send-verify-email` | 3    | 5 minutes                 |
+    Depending on the endpoint, ¹failed requests are not taken into account. A service
+    limit is announced by a `429 Too Many Requests` status code.
+    You can get details about the current state of your rate limit by reading the
+    following headers:
+    | Header                  | Description                                                |
+    |-------------------------|------------------------------------------------------------|
+    | X-RateLimit-Limit       | Number of max requests allowed in the current time period  |
+    | X-RateLimit-Remaining   | Number of remaining requests in the current time period    |
+    | X-RateLimit-Reset       | Timestamp of end of current time period as UNIX timestamp  |
+    | Retry-After             | Seconds to delay after the first `429` is received         |
 externalDocs:
  url: https://docs.joinpeertube.org/api-rest-reference.html
 tags:
@@ -101,7 +124,7 @@ tags:
      Redundancy is part of the inter-server solidarity that PeerTube fosters.
      Manage the list of instances you wish to help by seeding their videos according
      to the policy of video selection of your choice. Note that you have a similar functionality
-      to mirror individual videos, see `Video Mirroring`.
+      to mirror individual videos, see [video mirroring](#tag/Video-Mirroring).
    externalDocs:
      url: https://docs.joinpeertube.org/admin-following-instances?id=instances-redundancy
  - name: Plugins
@@ -115,6 +138,50 @@ tags:
  - name: Video
    description: |
      Operations dealing with listing, uploading, fetching or modifying videos.
+  - name: Video Upload
+    description: |
+      Operations dealing with adding video or audio. PeerTube supports two upload modes, and three import modes.
+      ### Upload
+      - [_legacy_](#operation/uploadLegacy), where the video file is sent in a single request
+      - [_resumable_](#operation/uploadResumableInit), where the video file is sent in chunks
+      You can upload videos more reliably by using the resumable variant. Its protocol lets
+      you resume an upload operation after a network interruption or other transmission failure,
+      saving time and bandwidth in the event of network failures.
+      Favor using resumable uploads in any of the following cases:
+      - You are transferring large files
+      - The likelihood of a network interruption is high
+      - Uploads are originating from a device with a low-bandwidth or unstable Internet connection,
+        such as a mobile device
+      ### Import
+      - _URL_-based: where the URL points to any service supported by [youtube-dl](https://ytdl-org.github.io/youtube-dl/)
+      - _magnet_-based: where the URI resolves to a BitTorrent ressource containing a single supported video file
+      - _torrent_-based: where the metainfo file resolves to a BitTorrent ressource containing a single supported video file
+      The import function is practical when the desired video/audio is available online. It makes PeerTube
+      download it for you, saving you as much bandwidth and avoiding any instability or limitation your network might have.
+  - name: Video Captions
+    description: Operations dealing with listing, adding and removing closed captions of a video.
+  - name: Video Channels
+    description: Operations dealing with the creation, modification and listing of videos within a channel.
+  - name: Video Comments
+    description: >
+      Operations dealing with comments to a video. Comments are organized in threads: adding a
+      comment in response to the video starts a thread, adding a reply to a comment adds it to
+      its root comment thread.
+  - name: Video Blocks
+    description: Operations dealing with blocking videos (removing them from view and preventing interactions).
+  - name: Video Rates
+    description: Like/dislike a video.
+  - name: Video Playlists
+    description: Operations dealing with playlists of videos. Playlists are bound to users and/or channels.
+  - name: Feeds
+    description: Server syndication feeds
  - name: Search
    description: |
      The search helps to find _videos_ or _channels_ from within the instance and beyond.
@@ -124,27 +191,11 @@ tags:
      Administrators can also enable the use of a remote search system, indexing
      videos and channels not could be not federated by the instance.
-  - name: Video Comments
+  - name: Video Mirroring
-    description: >
+    description: |
-      Operations dealing with comments to a video. Comments are organized in
+      PeerTube instances can mirror videos from one another, and help distribute some videos.
-      threads.
-  - name: Video Playlists
+      For importing videos as your own, refer to [video imports](#tag/Video-Upload/paths/~1videos~1imports/post).
-    description: >
-      Operations dealing with playlists of videos. Playlists are bound to users
-      and/or channels.
-  - name: Video Channels
-    description: >
-      Operations dealing with the creation, modification and listing of videos within a channel.
-  - name: Video Blocks
-    description: >
-      Operations dealing with blocking videos (removing them from view and
-      preventing interactions).
-  - name: Video Rates
-    description: >
-      Like/dislike a video.
-  - name: Feeds
-    description: >
-      Server syndication feeds
 x-tagGroups:
  - name: Accounts
    tags:
@@ -157,6 +208,7 @@ x-tagGroups:
  - name: Videos
    tags:
      - Video
+      - Video Upload
      - Video Captions
      - Video Channels
      - Video Comments
@@ -228,7 +280,7 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/VideoListResponse'
-      x-code-samples:
+      x-codeSamples:
        - lang: JavaScript
          source: |
            fetch('https://peertube2.cpy.re/api/v1/accounts/{name}/videos')
@@ -292,6 +344,9 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/ServerConfig'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/api/v1/config
  /config/about:
    get:
      summary: Get instance "About" information
@@ -304,6 +359,9 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/ServerConfigAbout'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/api/v1/config/about
  /config/custom:
    get:
      summary: Get instance runtime configuration
@@ -566,13 +624,24 @@ paths:
      tags:
        - Users
      operationId: getUserId
+      parameters:
+        - name: withStats
+          in: query
+          description: include statistics about the user (only available as a moderator/admin)
+          schema:
+            type: boolean
      responses:
        '200':
-          description: successful operation
+          x-summary: successful operation
+          description: |
+            As an admin/moderator, you can request a response augmented with statistics about the user's
+            moderation relations and videos usage, by using the `withStats` parameter.
          content:
            application/json:
              schema:
-                $ref: '#/components/schemas/User'
+                oneOf:
+                  - $ref: '#/components/schemas/User'
+                  - $ref: '#/components/schemas/UserWithStats'
    put:
      summary: Update a user
      security:
@@ -655,7 +724,7 @@ paths:
          content:
            application/json:
              schema:
-                $ref: '#/components/schemas/VideoImport'
+                $ref: '#/components/schemas/VideoImportsList'
  /users/me/video-quota-used:
    get:
      summary: Get my user used quota
@@ -670,7 +739,14 @@ paths:
          content:
            application/json:
              schema:
-                type: number
+                type: object
+                properties:
+                  videoQuotaUsed:
+                    type: number
+                    example: 16810141515
+                  videoQuotaUsedDaily:
+                    type: number
+                    example: 1681014151
  '/users/me/videos/{videoId}/rating':
    get:
      summary: Get rate of my user for a video
@@ -728,6 +804,10 @@ paths:
      responses:
        '200':
          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VideoChannelList'
    post:
      tags:
        - My Subscriptions
@@ -1109,6 +1189,7 @@ paths:
  /videos/categories:
    get:
      summary: List available video categories
+      operationId: getCategories
      tags:
        - Video
      responses:
@@ -1126,6 +1207,7 @@ paths:
  /videos/licences:
    get:
      summary: List available video licences
+      operationId: getLicences
      tags:
        - Video
      responses:
@@ -1143,6 +1225,7 @@ paths:
  /videos/languages:
    get:
      summary: List available video languages
+      operationId: getLanguages
      tags:
        - Video
      responses:
@@ -1159,7 +1242,8 @@ paths:
                  externalValue: https://peertube2.cpy.re/api/v1/videos/languages
  /videos/privacies:
    get:
-      summary: List available video privacies
+      summary: List available video privacy policies
+      operationId: getPrivacyPolicies
      tags:
        - Video
      responses:
@@ -1201,16 +1285,11 @@ paths:
                  type: string
                  format: binary
                category:
-                  description: Video category
+                  $ref: '#/components/schemas/VideoCategorySet'
-                  type: integer
-                  example: 4
                licence:
-                  description: Video licence
+                  $ref: '#/components/schemas/VideoLicenceSet'
-                  type: integer
-                  example: 2
                language:
-                  description: Video language
+                  $ref: '#/components/schemas/VideoLanguageSet'
-                  type: string
                privacy:
                  $ref: '#/components/schemas/VideoPrivacySet'
                description:
@@ -1323,10 +1402,13 @@ paths:
  /videos/upload:
    post:
      summary: Upload a video
+      description: Uses a single request to upload a video.
+      operationId: uploadLegacy
      security:
        - OAuth2: []
      tags:
        - Video
+        - Video Upload
      responses:
        '200':
          description: successful operation
@@ -1356,80 +1438,7 @@ paths:
        content:
          multipart/form-data:
            schema:
-              type: object
+              $ref: '#/components/schemas/VideoUploadRequestLegacy'
-              properties:
-                videofile:
-                  description: Video file
-                  type: string
-                  format: binary
-                channelId:
-                  description: Channel id that will contain this video
-                  type: integer
-                thumbnailfile:
-                  description: Video thumbnail file
-                  type: string
-                  format: binary
-                previewfile:
-                  description: Video preview file
-                  type: string
-                  format: binary
-                privacy:
-                  $ref: '#/components/schemas/VideoPrivacySet'
-                category:
-                  description: Video category
-                  type: integer
-                  example: 4
-                licence:
-                  description: Video licence
-                  type: integer
-                  example: 2
-                language:
-                  description: Video language
-                  type: string
-                description:
-                  description: Video description
-                  type: string
-                waitTranscoding:
-                  description: Whether or not we wait transcoding before publish the video
-                  type: boolean
-                support:
-                  description: A text tell the audience how to support the video creator
-                  example: Please support my work on <insert crowdfunding plateform>! <3
-                  type: string
-                nsfw:
-                  description: Whether or not this video contains sensitive content
-                  type: boolean
-                name:
-                  description: Video name
-                  type: string
-                  minLength: 3
-                  maxLength: 120
-                tags:
-                  description: Video tags (maximum 5 tags each between 2 and 30 characters)
-                  type: array
-                  minItems: 1
-                  maxItems: 5
-                  uniqueItems: true
-                  items:
-                    type: string
-                    minLength: 2
-                    maxLength: 30
-                commentsEnabled:
-                  description: Enable or disable comments for this video
-                  type: boolean
-                downloadEnabled:
-                  description: Enable or disable downloading for this video
-                  type: boolean
-                originallyPublishedAt:
-                  description: Date when the content was originally published
-                  type: string
-                  format: date-time
-                scheduleUpdate:
-                  $ref: '#/components/schemas/VideoScheduledUpdate'
-              required:
-                - videofile
-                - channelId
-                - name
            encoding:
              videofile:
                contentType: video/mp4, video/webm, video/ogg, video/avi, video/quicktime, video/x-msvideo, video/x-flv, video/x-matroska, application/octet-stream
@@ -1437,7 +1446,7 @@ paths:
                contentType: image/jpeg
              previewfile:
                contentType: image/jpeg
-      x-code-samples:
+      x-codeSamples:
        - lang: Shell
          source: |
            ## DEPENDENCIES: jq
@@ -1466,14 +1475,177 @@ paths:
              --form videofile=@"$FILE_PATH" \
              --form channelId=$CHANNEL_ID \
              --form name="$NAME"
+  /videos/upload-resumable:
+    post:
+      summary: Initialize the resumable upload of a video
+      description: Uses [a resumable protocol](https://github.com/kukhariev/node-uploadx/blob/master/proto.md) to initialize the upload of a video
+      operationId: uploadResumableInit
+      security:
+        - OAuth2: []
+      tags:
+        - Video
+        - Video Upload
+      parameters:
+        - name: X-Upload-Content-Length
+          in: header
+          schema:
+            type: number
+            example: 2469036
+          required: true
+          description: Number of bytes that will be uploaded in subsequent requests. Set this value to the size of the file you are uploading.
+        - name: X-Upload-Content-Type
+          in: header
+          schema:
+            type: string
+            format: mimetype
+            example: video/mp4
+          required: true
+          description: MIME type of the file that you are uploading. Depending on your instance settings, acceptable values might vary.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/VideoUploadRequestResumable'
+      responses:
+        '200':
+          description: file already exists, send a [`resume`](https://github.com/kukhariev/node-uploadx/blob/master/proto.md) request instead
+        '201':
+          description: created
+          headers:
+            Location:
+              schema:
+                type: string
+                format: url
+                example: /api/v1/videos/upload-resumable?upload_id=471e97554f21dec3b8bb5d4602939c51
+            Content-Length:
+              schema:
+                type: number
+                example: 0
+        '400':
+          description: invalid file field, schedule date or parameter
+        '413':
+          description: video file too large, due to quota, absolute max file size or concurrent partial upload limit
+        '415':
+          description: video type unsupported
+    put:
+      summary: Send chunk for the resumable upload of a video
+      description: Uses [a resumable protocol](https://github.com/kukhariev/node-uploadx/blob/master/proto.md) to continue, pause or resume the upload of a video
+      operationId: uploadResumable
+      security:
+        - OAuth2: []
+      tags:
+        - Video
+        - Video Upload
+      parameters:
+        - name: upload_id
+          in: path
+          required: true
+          description: |
+            Created session id to proceed with. If you didn't send chunks in the last 12 hours, it is
+            not valid anymore and you need to initialize a new upload.
+          schema:
+            type: string
+        - name: Content-Range
+          in: header
+          schema:
+            type: string
+            example: bytes 0-262143/2469036
+          required: true
+          description: |
+            Specifies the bytes in the file that the request is uploading.
+            For example, a value of `bytes 0-262143/1000000` shows that the request is sending the first
+            262144 bytes (256 x 1024) in a 2,469,036 byte file.
+        - name: Content-Length
+          in: header
+          schema:
+            type: number
+            example: 262144
+          required: true
+          description: |
+            Size of the chunk that the request is sending.
+            The chunk size __must be a multiple of 256 KB__, and unlike [Google Resumable](https://developers.google.com/youtube/v3/guides/using_resumable_upload_protocol)
+            doesn't mandate for chunks to have the same size throughout the upload sequence.
+            Remember that larger chunks are more efficient. PeerTube's web client uses chunks varying from
+            1048576 bytes (~1MB) and increases or reduces size depending on connection health.
+      requestBody:
+        content:
+          application/octet-stream:
+            schema:
+              type: string
+              format: binary
+      responses:
+        '200':
+          description: last chunk received
+          headers:
+            Content-Length:
+              schema:
+                type: number
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VideoUploadResponse'
+        '308':
+          description: resume incomplete
+          headers:
+            Range:
+              schema:
+                type: string
+                example: bytes=0-262143
+            Content-Length:
+              schema:
+                type: number
+                example: 0
+        '403':
+          description: video didn't pass upload filter
+        '413':
+          description: video file too large, due to quota or max body size limit set by the reverse-proxy
+        '422':
+          description: video unreadable
+    delete:
+      summary: Cancel the resumable upload of a video, deleting any data uploaded so far
+      description: Uses [a resumable protocol](https://github.com/kukhariev/node-uploadx/blob/master/proto.md) to cancel the upload of a video
+      operationId: uploadResumableCancel
+      security:
+        - OAuth2: []
+      tags:
+        - Video
+        - Video Upload
+      parameters:
+        - name: upload_id
+          in: path
+          required: true
+          description: |
+            Created session id to proceed with. If you didn't send chunks in the last 12 hours, it is
+            not valid anymore and the upload session has already been deleted with its data ;-)
+          schema:
+            type: string
+        - name: Content-Length
+          in: header
+          required: true
+          schema:
+            type: number
+            example: 0
+      responses:
+        '204':
+          description: upload cancelled
+          headers:
+            Content-Length:
+              schema:
+                type: number
+                example: 0
  /videos/imports:
    post:
      summary: Import a video
      description: Import a torrent or magnetURI or HTTP resource (if enabled by the instance administrator)
+      operationId: importVideo
      security:
        - OAuth2: []
      tags:
        - Video
+        - Video Upload
      requestBody:
        content:
          multipart/form-data:
@@ -1504,16 +1676,11 @@ paths:
                privacy:
                  $ref: '#/components/schemas/VideoPrivacySet'
                category:
-                  description: Video category
+                  $ref: '#/components/schemas/VideoCategorySet'
-                  type: integer
-                  example: 4
                licence:
-                  description: Video licence
+                  $ref: '#/components/schemas/VideoLicenceSet'
-                  type: integer
-                  example: 2
                language:
-                  description: Video language
+                  $ref: '#/components/schemas/VideoLanguageSet'
-                  type: string
                description:
                  description: Video description
                  type: string
@@ -1576,6 +1743,7 @@ paths:
  /videos/live:
    post:
      summary: Create a live
+      operationId: createLive
      security:
        - OAuth2: []
      tags:
@@ -1615,14 +1783,11 @@ paths:
                privacy:
                  $ref: '#/components/schemas/VideoPrivacySet'
                category:
-                  description: Live video/replay category
+                  $ref: '#/components/schemas/VideoCategorySet'
-                  type: string
                licence:
-                  description: Live video/replay licence
+                  $ref: '#/components/schemas/VideoLicenceSet'
-                  type: string
                language:
-                  description: Live video/replay language
+                  $ref: '#/components/schemas/VideoLanguageSet'
-                  type: string
                description:
                  description: Live video/replay description
                  type: string
@@ -1664,7 +1829,8 @@ paths:
  /videos/live/{id}:
    get:
-      summary: Get a live information
+      summary: Get information about a live
+      operationId: getLiveId
      security:
        - OAuth2: []
      tags:
@@ -1680,7 +1846,8 @@ paths:
              schema:
                $ref: '#/components/schemas/LiveVideoResponse'
    put:
-      summary: Update a live information
+      summary: Update information about a live
+      operationId: updateLiveId
      security:
        - OAuth2: []
      tags:
@@ -1704,6 +1871,7 @@ paths:
  /users/me/abuses:
    get:
      summary: List my abuses
+      operationId: getMyAbuses
      security:
        - OAuth2: []
      tags:
@@ -1719,22 +1887,29 @@ paths:
          in: query
          schema:
            $ref: '#/components/schemas/AbuseStateSet'
+        - $ref: '#/components/parameters/abusesSort'
        - $ref: '#/components/parameters/start'
        - $ref: '#/components/parameters/count'
-        - $ref: '#/components/parameters/abusesSort'
      responses:
        '200':
          description: successful operation
          content:
            application/json:
              schema:
-                type: array
+                type: object
-                items:
+                properties:
-                  $ref: '#/components/schemas/Abuse'
+                  total:
+                    type: integer
+                    example: 1
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/Abuse'
  /abuses:
    get:
      summary: List abuses
+      operationId: getAbuses
      security:
        - OAuth2:
          - admin
@@ -1807,9 +1982,15 @@ paths:
          content:
            application/json:
              schema:
-                type: array
+                type: object
-                items:
+                properties:
-                  $ref: '#/components/schemas/Abuse'
+                  total:
+                    type: integer
+                    example: 1
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/Abuse'
    post:
      summary: Report an abuse
@@ -2124,15 +2305,7 @@ paths:
          content:
            application/json:
              schema:
-                type: object
+                $ref: '#/components/schemas/VideoChannelList'
-                properties:
-                  total:
-                    type: integer
-                    example: 1
-                  data:
-                    type: array
-                    items:
-                      $ref: '#/components/schemas/VideoChannel'
    post:
      summary: Create a video channel
      security:
@@ -2324,7 +2497,8 @@ paths:
  /video-playlists/privacies:
    get:
-      summary: List available playlist privacies
+      summary: List available playlist privacy policies
+      operationId: getPlaylistPrivacyPolicies
      tags:
        - Video Playlists
      responses:
@@ -2343,6 +2517,7 @@ paths:
  /video-playlists:
    get:
      summary: List video playlists
+      operationId: getPlaylists
      tags:
        - Video Playlists
      parameters:
@@ -2367,6 +2542,7 @@ paths:
    post:
      summary: Create a video playlist
      description: 'If the video playlist is set as public, the videoChannelId is mandatory.'
+      operationId: createPlaylist
      security:
        - OAuth2: []
      tags:
@@ -2666,14 +2842,7 @@ paths:
          content:
            application/json:
              schema:
-                properties:
+                $ref: '#/components/schemas/VideoChannelList'
-                  total:
-                    type: integer
-                    example: 1
-                  data:
-                    type: array
-                    items:
-                      $ref: '#/components/schemas/VideoChannel'
  '/accounts/{name}/ratings':
    get:
      summary: List ratings of an account
@@ -2931,9 +3100,7 @@ paths:
          content:
            application/json:
              schema:
-                type: array
+                $ref: '#/components/schemas/VideoChannelList'
-                items:
-                  $ref: '#/components/schemas/VideoChannel'
        '500':
          description: search index unavailable
  /blocklist/accounts:
@@ -3168,13 +3335,6 @@ paths:
      tags:
        - Feeds
      summary: List comments on videos
-      servers:
-        - url: 'https://peertube2.cpy.re'
-          description: Live Test Server (live data - latest nightly version)
-        - url: 'https://peertube3.cpy.re'
-          description: Live Test Server (live data - latest RC version)
-        - url: 'https://peertube.cpy.re'
-          description: Live Test Server (live data - stable version)
      parameters:
        - name: format
          in: path
@@ -3227,18 +3387,33 @@ paths:
            application/xml:
              schema:
                $ref: '#/components/schemas/VideoCommentsForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/video-comments.xml?filter=local
            application/rss+xml:
              schema:
                $ref: '#/components/schemas/VideoCommentsForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/video-comments.rss?filter=local
            text/xml:
              schema:
                $ref: '#/components/schemas/VideoCommentsForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/video-comments.xml?filter=local
            application/atom+xml:
              schema:
                $ref: '#/components/schemas/VideoCommentsForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/video-comments.atom?filter=local
            application/json:
              schema:
                type: object
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/video-comments.json?filter=local
        '400':
          x-summary: field inconsistencies
          description: >
@@ -3253,13 +3428,6 @@ paths:
      tags:
        - Feeds
      summary: List videos
-      servers:
-        - url: 'https://peertube2.cpy.re'
-          description: Live Test Server (live data - latest nightly version)
-        - url: 'https://peertube3.cpy.re'
-          description: Live Test Server (live data - latest RC version)
-        - url: 'https://peertube.cpy.re'
-          description: Live Test Server (live data - stable version)
      parameters:
        - name: format
          in: path
@@ -3316,19 +3484,93 @@ paths:
            application/rss+xml:
              schema:
                $ref: '#/components/schemas/VideosForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/videos.rss?filter=local
            text/xml:
              schema:
                $ref: '#/components/schemas/VideosForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/videos.xml?filter=local
            application/atom+xml:
              schema:
                $ref: '#/components/schemas/VideosForXML'
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/videos.atom?filter=local
            application/json:
              schema:
                type: object
+              examples:
+                nightly:
+                  externalValue: https://peertube2.cpy.re/feeds/videos.json?filter=local
        '404':
          description: video channel or account not found
        '406':
          description: accept header unsupported
+  '/feeds/subscriptions.{format}':
+    get:
+      tags:
+        - Feeds
+        - Account
+      summary: List videos of subscriptions tied to a token
+      parameters:
+        - name: format
+          in: path
+          required: true
+          description: 'format expected (we focus on making `rss` the most featureful ; it serves [Media RSS](https://www.rssboard.org/media-rss))'
+          schema:
+            type: string
+            enum:
+              - xml
+              - rss
+              - rss2
+              - atom
+              - atom1
+              - json
+              - json1
+        - name: accountId
+          in: query
+          description: limit listing to a specific account
+          schema:
+            type: string
+          required: true
+        - name: token
+          in: query
+          description: private token allowing access
+          schema:
+            type: string
+          required: true
+        - $ref: '#/components/parameters/sort'
+        - $ref: '#/components/parameters/nsfw'
+        - $ref: '#/components/parameters/filter'
+      responses:
+        '204':
+          description: successful operation
+          headers:
+            Cache-Control:
+              schema:
+                type: string
+                default: 'max-age=900' # 15 min cache
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/VideosForXML'
+            application/rss+xml:
+              schema:
+                $ref: '#/components/schemas/VideosForXML'
+            text/xml:
+              schema:
+                $ref: '#/components/schemas/VideosForXML'
+            application/atom+xml:
+              schema:
+                $ref: '#/components/schemas/VideosForXML'
+            application/json:
+              schema:
+                type: object
+        '406':
+          description: accept header unsupported
  /plugins:
    get:
      tags:
@@ -3823,7 +4065,7 @@ components:
      name: categoryOneOf
      in: query
      required: false
-      description: category id of the video (see [/videos/categories](#tag/Video/paths/~1videos~1categories/get))
+      description: category id of the video (see [/videos/categories](#operation/getCategories))
      schema:
        oneOf:
        - type: integer
@@ -3841,6 +4083,7 @@ components:
        oneOf:
        - type: string
        - type: array
+          maxItems: 5
          items:
            type: string
      style: form
@@ -3862,7 +4105,7 @@ components:
      name: languageOneOf
      in: query
      required: false
-      description: language id of the video (see [/videos/languages](#tag/Video/paths/~1videos~1languages/get)). Use `_unknown` to filter on videos that don't have a video language
+      description: language id of the video (see [/videos/languages](#operation/getLanguages)). Use `_unknown` to filter on videos that don't have a video language
      schema:
        oneOf:
        - type: string
@@ -3875,7 +4118,7 @@ components:
      name: licenceOneOf
      in: query
      required: false
-      description: licence id of the video (see [/videos/licences](#tag/Video/paths/~1videos~1licences/get))
+      description: licence id of the video (see [/videos/licences](#operation/getLicences))
      schema:
        oneOf:
        - type: integer
@@ -3959,19 +4202,16 @@ components:
          - video-live-ending
  securitySchemes:
    OAuth2:
-      description: >
+      description: |
-        In the header: *Authorization: Bearer <token\>*
        Authenticating via OAuth requires the following steps:
+        - Have an activated account
-        - Have an account with sufficient authorization levels
        - [Generate](https://docs.joinpeertube.org/api-rest-getting-started) a
-        Bearer Token
+        Bearer Token for that account at `/api/v1/users/token`
+        - Make authenticated requests, putting *Authorization: Bearer <token\>*
+        - Profit, depending on the role assigned to the account
-        - Make Authenticated Requests
+        Note that the __access token is valid for 1 day__ and, and is given
+        along with a __refresh token valid for 2 weeks__.
      type: oauth2
      flows:
        password:
@@ -3991,25 +4231,33 @@ components:
      minLength: 36
      maxLength: 36
+    VideoCategorySet:
+      type: integer
+      description: category id of the video (see [/videos/categories](#operation/getCategories))
    VideoConstantNumber-Category:
      properties:
        id:
-          type: integer
+          $ref: '#/components/schemas/VideoCategorySet'
-          description: category id of the video (see [/videos/categories](#tag/Video/paths/~1videos~1categories/get))
        label:
          type: string
+    VideoLicenceSet:
+      type: integer
+      description: licence id of the video (see [/videos/licences](#operation/getLicences))
    VideoConstantNumber-Licence:
      properties:
        id:
-          type: integer
+          $ref: '#/components/schemas/VideoLicenceSet'
-          description: licence id of the video (see [/videos/licences](#tag/Video/paths/~1videos~1licences/get))
        label:
          type: string
+    
+    VideoLanguageSet:
+      type: string
+      description: language id of the video (see [/videos/languages](#operation/getLanguages))
    VideoConstantString-Language:
      properties:
        id:
-          type: string
+          $ref: '#/components/schemas/VideoLanguageSet'
-          description: language id of the video (see [/videos/languages](#tag/Video/paths/~1videos~1languages/get))
        label:
          type: string
@@ -4019,7 +4267,7 @@ components:
        - 1
        - 2
        - 3
-      description: 'The video playlist privacy (Public = `1`, Unlisted = `2`, Private = `3`)'
+      description: Video playlist privacy policy (see [/video-playlists/privacies])
    VideoPlaylistPrivacyConstant:
      properties:
        id:
@@ -4032,7 +4280,7 @@ components:
      enum:
        - 1
        - 2
-      description: 'The video playlist type (Regular = `1`, Watch Later = `2`)'
+      description: The video playlist type (Regular = `1`, Watch Later = `2`)
    VideoPlaylistTypeConstant:
      properties:
        id:
@@ -4047,7 +4295,7 @@ components:
        - 2
        - 3
        - 4
-      description: 'The video privacy (Public = `1`, Unlisted = `2`, Private = `3`, Internal = `4`)'
+      description: privacy id of the video (see [/videos/privacies](#operation/getPrivacyPolicies))
    VideoPrivacyConstant:
      properties:
        id:
@@ -4118,12 +4366,17 @@ components:
        - captions
      example: [spamOrMisleading]
+    VideoResolutionSet:
+      type: integer
+      description: |
+        Video resolution (`0`, `240`, `360`, `720`, `1080`, `1440` or `2160`)
+        `0` is used as a special value for stillimage videos dedicated to audio, a.k.a. audio-only videos.
+      example: 240
    VideoResolutionConstant:
      properties:
        id:
-          type: integer
+          $ref: '#/components/schemas/VideoResolutionSet'
-          description: 'Video resolution (240, 360, 720, 1080, 1440 or 2160)'
-          example: 240
        label:
          type: string
          example: 240p
@@ -4507,6 +4760,16 @@ components:
          format: date-time
        video:
          $ref: '#/components/schemas/Video'
+    VideoImportsList:
+      properties:
+        total:
+          type: integer
+          example: 1
+        data:
+          type: array
+          maxItems: 100
+          items:
+            $ref: '#/components/schemas/VideoImport'
    Abuse:
      properties:
        id:
@@ -4540,7 +4803,7 @@ components:
        message:
          type: string
          minLength: 2
-          maxLength: 3000 
+          maxLength: 3000
        byModerator:
          type: boolean
        createdAt:
@@ -4717,6 +4980,8 @@ components:
        host:
          type: string
          format: hostname
+        hostRedundancyAllowed:
+          type: boolean
        followingCount:
          type: integer
        followersCount:
@@ -4831,7 +5096,7 @@ components:
            enabledResolutions:
              type: array
              items:
-                type: integer
+                $ref: '#/components/schemas/VideoResolutionSet'
        import:
          type: object
          properties:
@@ -5032,6 +5297,7 @@ components:
              type: boolean
        user:
          type: object
+          description: Settings that apply to new users, if registration is enabled
          properties:
            videoQuota:
              type: integer
@@ -5039,18 +5305,34 @@ components:
              type: integer
        transcoding:
          type: object
+          description: Settings pertaining to transcoding jobs
          properties:
            enabled:
              type: boolean
            allowAdditionalExtensions:
              type: boolean
+              description: Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos
            allowAudioFiles:
              type: boolean
+              description: If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
            threads:
              type: integer
+              description: Amount of threads used by ffmpeg for 1 transcoding job
+            concurrency:
+              type: number
+              description: Amount of transcoding jobs to execute in parallel
+            profile:
+              type: string
+              enum:
+                - default
+              description: |
+                New profiles can be added by plugins ; available in core PeerTube: 'default'.
            resolutions:
              type: object
+              description: Resolutions to transcode _new videos_ to
              properties:
+                0p:
+                  type: boolean
                240p:
                  type: boolean
                360p:
@@ -5065,8 +5347,15 @@ components:
                  type: boolean
                2160p:
                  type: boolean
+            webtorrent:
+              type: object
+              description: WebTorrent-specific settings
+              properties:
+                enabled:
+                  type: boolean
            hls:
              type: object
+              description: HLS-specific settings
              properties:
                enabled:
                  type: boolean
@@ -5133,6 +5422,7 @@ components:
    PredefinedAbuseReasons:
      description: Reason categories that help triage reports
      type: array
+      maxItems: 8
      items:
        type: string
        enum:
@@ -5202,6 +5492,98 @@ components:
                id:
                  type: integer
                  example: 37
+    VideoUploadRequestCommon:
+      properties:
+        name:
+          description: Video name
+          type: string
+        channelId:
+          description: Channel id that will contain this video
+          type: integer
+        privacy:
+          $ref: '#/components/schemas/VideoPrivacySet'
+        category:
+          $ref: '#/components/schemas/VideoCategorySet'
+        licence:
+          $ref: '#/components/schemas/VideoLicenceSet'
+        language:
+          $ref: '#/components/schemas/VideoLanguageSet'
+        description:
+          description: Video description
+          type: string
+        waitTranscoding:
+          description: Whether or not we wait transcoding before publish the video
+          type: boolean
+        support:
+          description: A text tell the audience how to support the video creator
+          example: Please support my work on <insert crowdfunding plateform>! <3
+          type: string
+        nsfw:
+          description: Whether or not this video contains sensitive content
+          type: boolean
+        tags:
+          description: Video tags (maximum 5 tags each between 2 and 30 characters)
+          type: array
+          minItems: 1
+          maxItems: 5
+          uniqueItems: true
+          items:
+            type: string
+            minLength: 2
+            maxLength: 30
+        commentsEnabled:
+          description: Enable or disable comments for this video
+          type: boolean
+        downloadEnabled:
+          description: Enable or disable downloading for this video
+          type: boolean
+        originallyPublishedAt:
+          description: Date when the content was originally published
+          type: string
+          format: date-time
+        scheduleUpdate:
+          $ref: '#/components/schemas/VideoScheduledUpdate'
+        thumbnailfile:
+          description: Video thumbnail file
+          type: string
+          format: binary
+        previewfile:
+          description: Video preview file
+          type: string
+          format: binary
+      required:
+        - channelId
+        - name
+    VideoUploadRequestLegacy:
+      allOf:
+        - $ref: '#/components/schemas/VideoUploadRequestCommon'
+        - type: object
+          required:
+            - videofile
+          properties:
+            videofile:
+              description: Video file
+              type: string
+              format: binary
+    VideoUploadRequestResumable:
+      allOf:
+        - $ref: '#/components/schemas/VideoUploadRequestCommon'
+        - type: object
+          required:
+            - filename
+          properties:
+            filename:
+              description: Video filename including extension
+              type: string
+              format: filename
+            thumbnailfile:
+              description: Video thumbnail file
+              type: string
+              format: binary
+            previewfile:
+              description: Video preview file
+              type: string
+              format: binary
    VideoUploadResponse:
      properties:
        video:
@@ -5238,35 +5620,45 @@ components:
            $ref: '#/components/schemas/Video'
    User:
      properties:
-        id:
+        account:
-          type: integer
+          $ref: '#/components/schemas/Account'
-          readOnly: true
+        autoPlayNextVideo:
-        username:
+          type: boolean
+          description: Automatically start playing the upcoming video after the currently playing video
+        autoPlayNextVideoPlaylist:
+          type: boolean
+          description: Automatically start playing the video on the playlist after the currently playing video
+        autoPlayVideo:
+          type: boolean
+          description: Automatically start playing the video on the watch page
+        blocked:
+          type: boolean
+        blockedReason:
+          type: string
+        createdAt:
          type: string
-          description: The user username
-          minLength: 1
-          maxLength: 50
        email:
          type: string
          format: email
          description: The user email
+        emailVerified:
+          type: boolean
+          description: Has the user confirmed their email address?
+        id:
+          type: integer
+          readOnly: true
        pluginAuth:
          type: string
          description: Auth plugin to use to authenticate the user
-        theme:
+        lastLoginDate:
          type: string
-          description: Theme enabled by this user
+          format: date-time
-        emailVerified:
+        noInstanceConfigWarningModal:
+          type: boolean
+        noWelcomeModal:
          type: boolean
-          description: Has the user confirmed their email address?
        nsfwPolicy:
          $ref: '#/components/schemas/NSFWPolicy'
-        webtorrentEnabled:
-          type: boolean
-          description: Enable P2P in the player
-        autoPlayVideo:
-          type: boolean
-          description: Automatically start playing the video on the watch page
        role:
          $ref: '#/components/schemas/UserRole'
        roleLabel:
@@ -5275,38 +5667,49 @@ components:
            - User
            - Moderator
            - Administrator
-        videoQuota:
+        theme:
-          type: integer
-          description: The user video quota
-        videoQuotaDaily:
-          type: integer
-          description: The user daily video quota
-        videosCount:
-          type: integer
-        abusesCount:
-          type: integer
-        abusesAcceptedCount:
-          type: integer
-        abusesCreatedCount:
-          type: integer
-        videoCommentsCount:
-          type: integer
-        noInstanceConfigWarningModal:
-          type: boolean
-        noWelcomeModal:
-          type: boolean
-        blocked:
-          type: boolean
-        blockedReason:
          type: string
-        createdAt:
+          description: Theme enabled by this user
+        username:
          type: string
-        account:
+          description: The user username
-          $ref: '#/components/schemas/Account'
+          minLength: 1
+          maxLength: 50
        videoChannels:
          type: array
          items:
            $ref: '#/components/schemas/VideoChannel'
+        videoQuota:
+          type: integer
+          description: The user video quota in bytes
+          example: -1
+        videoQuotaDaily:
+          type: integer
+          description: The user daily video quota in bytes
+          example: -1
+        webtorrentEnabled:
+          type: boolean
+          description: Enable P2P in the player
+    UserWithStats:
+      allOf:
+        - $ref: '#/components/schemas/User'
+        - properties:
+            # optionally present fields: they require WITH_STATS scope
+            videosCount:
+              type: integer
+              description: Count of videos published 
+            abusesCount:
+              type: integer
+              description: Count of reports/abuses of which the user is a target
+            abusesAcceptedCount:
+              type: integer
+              description: Count of reports/abuses created by the user and accepted/acted upon by the moderation team
+            abusesCreatedCount:
+              type: integer
+              description: Count of reports/abuses created by the user
+            videoCommentsCount:
+              type: integer
+              description: Count of comments published
    AddUser:
      properties:
        username:
@@ -5314,6 +5717,7 @@ components:
          description: The user username
          minLength: 1
          maxLength: 50
+          pattern: '/^[a-z0-9._]{1,50}$/'
        password:
          type: string
          format: password
@@ -5333,6 +5737,7 @@ components:
        channelName:
          type: string
          description: The user default channel username
+          pattern: '/^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\\-_.:]+$/'
        role:
          $ref: '#/components/schemas/UserRole'
        adminFlags:
@@ -5406,7 +5811,11 @@ components:
          type: string
          description: Id of the video
        rating:
-          type: number
+          type: string
+          enum:
+            - like
+            - dislike
+            - none
          description: Rating of the video
      required:
        - id
@@ -5416,8 +5825,12 @@ components:
        video:
          $ref: '#/components/schemas/Video'
        rating:
-          type: number
+          type: string
-          description: 'Rating of the video'
+          enum:
+            - like
+            - dislike
+            - none
+          description: Rating of the video
      required:
        - video
        - rating
@@ -5495,6 +5908,17 @@ components:
            bulkVideosSupportUpdate:
              type: boolean
              description: 'Update the support field for all videos of this channel'
+    VideoChannelList:
+      properties:
+        total:
+          type: integer
+          example: 1
+        data:
+          type: array
+          items:
+            allOf:
+              - $ref: '#/components/schemas/VideoChannel'
+              - $ref: '#/components/schemas/Actor'
    MRSSPeerLink:
      type: object
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md
index 9666d72af..939772a9d 100644
--- a/support/doc/dependencies.md
+++ b/support/doc/dependencies.md
@@ -307,7 +307,7 @@ brew services run redis
 ```
 On macOS, the `postgresql` user can be `_postgres` instead of `postgres`.
-If `sudo -u postgres createuser -P peertube` gives you an error, you can try `sudo -u _postgres createuser -U peertube`.
+If `sudo -u postgres createuser -P peertube` gives you an `unknown user: postgres` error, you can try `sudo -u _postgres createuser -U peertube`.
 ## Gentoo
diff --git a/support/doc/plugins/guide.md b/support/doc/plugins/guide.md
index 53d53c26d..5b7d1cb31 100644
--- a/support/doc/plugins/guide.md
+++ b/support/doc/plugins/guide.md
@@ -261,8 +261,8 @@ function register ({
  router.get('/ping', (req, res) => res.json({ message: 'pong' }))
  // Users are automatically authenticated
-  router.get('/auth', (res, res) => {
+  router.get('/auth', async (res, res) => {
-    const user = peertubeHelpers.user.getAuthUser(res)
+    const user = await peertubeHelpers.user.getAuthUser(res)
    const isAdmin = user.role === 0
    const isModerator = user.role === 1
diff --git a/support/docker/production/Dockerfile.buster b/support/docker/production/Dockerfile.buster
index b3822964d..2ff0591f9 100644
--- a/support/docker/production/Dockerfile.buster
+++ b/support/docker/production/Dockerfile.buster
@@ -7,7 +7,7 @@ ARG NPM_RUN_BUILD_OPTS
 # Install dependencies
 RUN apt update \
- && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential \
+ && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential curl \
 && gosu nobody true \
 && rm /var/lib/apt/lists/* -fR
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 00ce1d0dc..d03f14613 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -78,6 +78,15 @@ server {
    try_files /dev/null @api;
  }
+  location = /api/v1/videos/upload-resumable {
+    if ($request_method = 'PUT') {
+      client_max_body_size    0;
+      proxy_request_buffering off;
+    }
+    try_files /dev/null @api;
+  }
  location = /api/v1/videos/upload {
    limit_except POST HEAD { deny all; }
diff --git a/yarn.lock b/yarn.lock
index 3ce730fbd..adfb8c912 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,9 +12,9 @@
    js-yaml "^3.13.1"
 "@apidevtools/openapi-schemas@^2.0.4":
-  version "2.0.4"
+  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@apidevtools/openapi-schemas/-/openapi-schemas-2.0.4.tgz#bae1cef77ebb2b3705c7cc6911281da5153c1ab3"
+  resolved "https://registry.yarnpkg.com/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz#9fa08017fb59d80538812f03fc7cac5992caaa17"
-  integrity sha512-ob5c4UiaMYkb24pNhvfSABShAwpREvUGCkqjiz/BX9gKZ32y/S22M+ALIHftTAuv9KsFVSpVdIDzi9ZzFh5TCA==
+  integrity sha512-Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==
 "@apidevtools/swagger-cli@4.0.4":
  version "4.0.4"
@@ -62,39 +62,38 @@
  dependencies:
    "@babel/highlight" "^7.12.13"
-"@babel/helper-validator-identifier@^7.12.11":
+"@babel/helper-validator-identifier@^7.14.0":
-  version "7.12.11"
+  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
-  version "7.13.10"
+  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
    chalk "^2.0.0"
    js-tokens "^4.0.0"
 "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
-  version "7.13.15"
+  version "7.14.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47"
-  integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
+  integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==
 "@babel/runtime@^7.7.2":
-  version "7.13.10"
+  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
-  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
  dependencies:
    regenerator-runtime "^0.13.4"
 "@babel/types@^7.6.1", "@babel/types@^7.9.6":
-  version "7.13.14"
+  version "7.14.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
-  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
+  integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==
  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
-    lodash "^4.17.19"
    to-fast-properties "^2.0.0"
 "@dabh/diagnostics@^2.0.2":
@@ -138,9 +137,9 @@
    "@hapi/hoek" "9.x.x"
 "@hapi/hoek@9.x.x":
-  version "9.1.1"
+  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.1.tgz#9daf5745156fd84b8e9889a2dc721f0c58e894aa"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131"
-  integrity sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==
+  integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==
 "@jimp/bmp@^0.16.1":
  version "0.16.1"
@@ -456,9 +455,9 @@
    tlds "^1.218.0"
 "@mapbox/node-pre-gyp@^1.0.0":
-  version "1.0.3"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.3.tgz#c740c23ec1007b9278d4c28f767b6e843a88c3d3"
+  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.4.tgz#6c76e7a40138eac39e1a4dc869a083e43e236c00"
-  integrity sha512-9dTIfQW8HVCxLku5QrJ/ysS/b2MdYngs9+/oPrOTLvp3TrggdANYVW2h8FGJGDf0J7MYfp44W+c90cVJx+ASuA==
+  integrity sha512-M669Qo4nRT7iDmQEjQYC7RU8Z6dpz9UmSbkJ1OFEja3uevCdLKh7IZZki7L1TZj02kRyl82snXFY8QqkyfowrQ==
  dependencies:
    detect-libc "^1.0.3"
    https-proxy-agent "^5.0.0"
@@ -524,14 +523,14 @@
    node-fetch "^2.6.1"
 "@openapitools/openapi-generator-cli@^2.1.4":
-  version "2.2.5"
+  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.2.5.tgz#363611ae37d21fabf15ed297dfd5fe82a013faba"
+  resolved "https://registry.yarnpkg.com/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.2.6.tgz#024314000616895edeada87ddf98d53ba8e1e4f0"
-  integrity sha512-8eTiw9U5PWYZx41RDIrJ6iZ4XCteD6ljupbJS6/ichZEUwa1Pv78y14QSLVfky+1KpJsq/RlqrgjnPm6yMHo6g==
+  integrity sha512-TFKHY1lcknzg6IhPe9f8wWUO11PeKBPnrM40jZjZNUHlQRvh7WLsW6vNlbGcm78eBYTcyY0cKqr1QXUpB9Ez2Q==
  dependencies:
    "@nestjs/common" "7.6.15"
    "@nestjs/core" "7.6.15"
    "@nuxtjs/opencollective" "0.3.2"
-    chalk "4.1.0"
+    chalk "4.1.1"
    commander "6.2.1"
    compare-versions "3.6.0"
    concurrently "5.3.0"
@@ -550,9 +549,9 @@
  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 "@sindresorhus/is@^4.0.0":
-  version "4.0.0"
+  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.0.tgz#2ff674e9611b45b528896d820d3d7a812de2f0e4"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.1.tgz#d26729db850fa327b7cacc5522252194404226f5"
-  integrity sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==
+  integrity sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==
 "@szmarczak/http-timer@^1.1.2":
  version "1.1.2"
@@ -597,10 +596,10 @@
  dependencies:
    "@types/node" "*"
-"@types/bluebird@3.5.33":
+"@types/bluebird@^3.5.33":
-  version "3.5.33"
+  version "3.5.34"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.33.tgz#d79c020f283bd50bd76101d7d300313c107325fc"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.34.tgz#0e9f1f4f5dfab98a421fb973b5f5690d22411893"
-  integrity sha512-ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ==
+  integrity sha512-QMc57Pf067Rr78l6f4FftvuIXPYxu0VYFRKrZk1Clv+LWy7gN2fTBiAiv68askFHEHZcTLPFd01kNlpKOiSPgQ==
 "@types/body-parser@*", "@types/body-parser@^1.16.3":
  version "1.19.0"
@@ -610,10 +609,10 @@
    "@types/connect" "*"
    "@types/node" "*"
-"@types/bull@3.15.0":
+"@types/bull@^3.15.0":
-  version "3.15.0"
+  version "3.15.1"
-  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.0.tgz#69c518d4e7a53056f287cebcc4ef4ffe91aaf201"
+  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.1.tgz#3c3fd665b43ef383ca95a91b8d1448461fae0898"
-  integrity sha512-54Y1RYkJt6i+4dH45w4gZOP6fyhksTvOImfgBYAxgq/nt5ZrES4xFWwOzt2bxAgSR7FMH9fwvaiJN/pripPzag==
+  integrity sha512-thZyjxikoyuDa/ptZEqtTEPUjwlDenkpPigpIyad1X5UMp7U0fXTLiDHJjZ/5yXmVPuWx0cXFXj3drmva/UJRA==
  dependencies:
    "@types/ioredis" "*"
@@ -652,9 +651,9 @@
    "@types/chai" "*"
 "@types/chai@*", "@types/chai@^4.0.4":
-  version "4.2.16"
+  version "4.2.17"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.16.tgz#f09cc36e18d28274f942e7201147cce34d97e8c8"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.17.tgz#85f9f0610f514b22a94125d441f73eef65bde5cc"
-  integrity sha512-vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw==
+  integrity sha512-LaiwWNnYuL8xJlQcE91QB2JoswWZckq9A4b+nMPq8dt8AP96727Nb3X4e74u+E3tm4NLTILNI9MYFsyVc30wSA==
 "@types/component-emitter@^1.2.10":
  version "1.2.10"
@@ -744,9 +743,9 @@
  integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==
 "@types/ioredis@*":
-  version "4.22.3"
+  version "4.26.1"
-  resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.22.3.tgz#72762efa0374c4a2e879ef697c6c3e4a47f9d641"
+  resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.26.1.tgz#761f1812c48a3ecfbd9d9ecd35c49849f8693e2e"
-  integrity sha512-V23g0XZUmkm0Hp/GsQYV5Wz12ynm6h6lyi5v/o63iyqFV7+8t3k5YxCnFWVWFEjO6mvRI7V6f7YxNVxIjPsSUw==
+  integrity sha512-k9f+bda6y0ZNrwUMNYI9mqIPqjPZ4Jqc+jTRTUyhFz8aD8cHQBk+uenTKCZj9RhdfrU4sSqrot5sn5LqkAHODw==
  dependencies:
    "@types/node" "*"
@@ -832,10 +831,15 @@
  dependencies:
    "@types/express" "*"
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.14.28", "@types/node@^14.14.31":
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@^15.0.1":
-  version "14.14.37"
+  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
-  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
+  integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
+"@types/node@^14.14.31":
+  version "14.14.44"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215"
+  integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==
 "@types/nodemailer@^6.2.0":
  version "6.4.1"
@@ -936,9 +940,9 @@
    "@types/node" "*"
 "@types/superagent@*":
-  version "4.1.10"
+  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.10.tgz#5e2cc721edf58f64fe9b819f326ee74803adee86"
+  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.11.tgz#4822bc64a82a0f579261a77097dbca276556c20e"
-  integrity sha512-xAgkb2CMWUMCyVc/3+7iQfOEBE75NvuZeezvmixbUw3nmENf2tCnQkW5yQLTYqvXUQ+R6EXxdqKKbal2zM5V/g==
+  integrity sha512-cZkWBXZI+jESnUTp8RDGBmk1Zn2MkScP4V5bjD7DyqB7L0WNWpblh4KX5K/6aTqxFZMhfo1bhi2cwoAEDVBBJw==
  dependencies:
    "@types/cookiejar" "*"
    "@types/node" "*"
@@ -976,19 +980,19 @@
    "@types/simple-peer" "*"
 "@types/ws@^7.2.1":
-  version "7.4.1"
+  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.1.tgz#49eacb15a0534663d53a36fbf5b4d98f5ae9a73a"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.2.tgz#bfe739b5f8b3a39742605fbe415ae7e88ee614c8"
-  integrity sha512-ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q==
+  integrity sha512-PbeN0Eydl7LQl4OIav29YmkO2LxbVuz3nZD/kb19lOS+wLgIkRbWMNmU/QQR7ABpOJ7D7xDOU8co7iohObewrw==
  dependencies:
    "@types/node" "*"
 "@typescript-eslint/eslint-plugin@^4.8.1":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.21.0.tgz#3fce2bfa76d95c00ac4f33dff369cb593aab8878"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
-  integrity sha512-FPUyCPKZbVGexmbCFI3EQHzCZdy2/5f+jv6k2EDljGdXSRc0cKvbndd2nHZkSLqCNOPk0jB6lGzwIkglXcYVsQ==
+  integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
  dependencies:
-    "@typescript-eslint/experimental-utils" "4.21.0"
+    "@typescript-eslint/experimental-utils" "4.22.1"
-    "@typescript-eslint/scope-manager" "4.21.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
    debug "^4.1.1"
    functional-red-black-tree "^1.0.1"
    lodash "^4.17.15"
@@ -996,60 +1000,60 @@
    semver "^7.3.2"
    tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@4.21.0":
+"@typescript-eslint/experimental-utils@4.22.1":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz#0b0bb7c15d379140a660c003bdbafa71ae9134b6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
-  integrity sha512-cEbgosW/tUFvKmkg3cU7LBoZhvUs+ZPVM9alb25XvR0dal4qHL3SiUqHNrzoWSxaXA9gsifrYrS1xdDV6w/gIA==
+  integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
  dependencies:
    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.21.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
-    "@typescript-eslint/types" "4.21.0"
+    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/typescript-estree" "4.21.0"
+    "@typescript-eslint/typescript-estree" "4.22.1"
    eslint-scope "^5.0.0"
    eslint-utils "^2.0.0"
 "@typescript-eslint/parser@^4.0.0":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.21.0.tgz#a227fc2af4001668c3e3f7415d4feee5093894c1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
-  integrity sha512-eyNf7QmE5O/l1smaQgN0Lj2M/1jOuNg2NrBm1dqqQN0sVngTLyw8tdCbih96ixlhbF1oINoN8fDCyEH9SjLeIA==
+  integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
  dependencies:
-    "@typescript-eslint/scope-manager" "4.21.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
-    "@typescript-eslint/types" "4.21.0"
+    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/typescript-estree" "4.21.0"
+    "@typescript-eslint/typescript-estree" "4.22.1"
    debug "^4.1.1"
-"@typescript-eslint/scope-manager@4.21.0":
+"@typescript-eslint/scope-manager@4.22.1":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.21.0.tgz#c81b661c4b8af1ec0c010d847a8f9ab76ab95b4d"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
-  integrity sha512-kfOjF0w1Ix7+a5T1knOw00f7uAP9Gx44+OEsNQi0PvvTPLYeXJlsCJ4tYnDj5PQEYfpcgOH5yBlw7K+UEI9Agw==
+  integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
  dependencies:
-    "@typescript-eslint/types" "4.21.0"
+    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/visitor-keys" "4.21.0"
+    "@typescript-eslint/visitor-keys" "4.22.1"
-"@typescript-eslint/types@4.21.0":
+"@typescript-eslint/types@4.22.1":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.21.0.tgz#abdc3463bda5d31156984fa5bc316789c960edef"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
-  integrity sha512-+OQaupjGVVc8iXbt6M1oZMwyKQNehAfLYJJ3SdvnofK2qcjfor9pEM62rVjBknhowTkh+2HF+/KdRAc/wGBN2w==
+  integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
-"@typescript-eslint/typescript-estree@4.21.0":
+"@typescript-eslint/typescript-estree@4.22.1":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz#3817bd91857beeaeff90f69f1f112ea58d350b0a"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
-  integrity sha512-ZD3M7yLaVGVYLw4nkkoGKumb7Rog7QID9YOWobFDMQKNl+vPxqVIW/uDk+MDeGc+OHcoG2nJ2HphwiPNajKw3w==
+  integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
  dependencies:
-    "@typescript-eslint/types" "4.21.0"
+    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/visitor-keys" "4.21.0"
+    "@typescript-eslint/visitor-keys" "4.22.1"
    debug "^4.1.1"
    globby "^11.0.1"
    is-glob "^4.0.1"
    semver "^7.3.2"
    tsutils "^3.17.1"
-"@typescript-eslint/visitor-keys@4.21.0":
+"@typescript-eslint/visitor-keys@4.22.1":
-  version "4.21.0"
+  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz#990a9acdc124331f5863c2cf21c88ba65233cd8d"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
-  integrity sha512-dH22dROWGi5Z6p+Igc8bLVLmwy7vEe8r+8c+raPQU0LxgogPUrRAtRGtvBWmlr9waTu3n+QLt/qrS/hWzk1x5w==
+  integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
  dependencies:
-    "@typescript-eslint/types" "4.21.0"
+    "@typescript-eslint/types" "4.22.1"
    eslint-visitor-keys "^2.0.0"
 "@ungap/promise-all-settled@1.1.2":
@@ -1057,6 +1061,15 @@
  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+"@uploadx/core@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@uploadx/core/-/core-4.4.0.tgz#27ea2b0d28125e81a6bdd65637dc5c7829306cc7"
+  integrity sha512-dU0oDURYR5RvuAzf63EL9e/fCY4OOQKOs237UTbZDulbRbiyxwEZR+IpRYYr3hKRjjij03EF/Y5j54VGkebAKg==
+  dependencies:
+    bytes "^3.1.0"
+    debug "^4.3.1"
+    multiparty "^4.2.2"
 abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1120,9 +1133,9 @@ ajv@^6.10.0, ajv@^6.12.4:
    uri-js "^4.2.2"
 ajv@^8.0.1:
-  version "8.1.0"
+  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.1.0.tgz#45d5d3d36c7cdd808930cc3e603cf6200dbeb736"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
-  integrity sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==
+  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
  dependencies:
    fast-deep-equal "^3.1.1"
    json-schema-traverse "^1.0.0"
@@ -1370,9 +1383,9 @@ at-least-node@^1.0.0:
  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 autocannon@^7.0.4:
-  version "7.0.5"
+  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/autocannon/-/autocannon-7.0.5.tgz#7c195ba09ae3b299d6f7532950d1e07041538b29"
+  resolved "https://registry.yarnpkg.com/autocannon/-/autocannon-7.2.0.tgz#63b6f5321c8d26cf8360d9931dbcde6e61494121"
-  integrity sha512-VMOfWf0e9EB5Crr7/snXTb64oC7I3lofpAjBcPWvHGet94DKjHCsbj05iIt2WTenPKub++6PETb/H9qleV9yJg==
+  integrity sha512-yMXnHdGcHiz+dk/VHsgIXHBn7qK5hIaRS5yKbLzGTvn3REbEJA37xFI7+KkCEAtSOGnMLhd6VTZ69g9GReCClQ==
  dependencies:
    chalk "^4.1.0"
    char-spinner "^1.0.1"
@@ -1387,13 +1400,13 @@ autocannon@^7.0.4:
    http-parser-js "^0.5.2"
    hyperid "^2.0.3"
    manage-path "^2.0.0"
-    minimist "^1.2.0"
    on-net-listen "^1.1.1"
    pretty-bytes "^5.4.1"
    progress "^2.0.3"
    reinterval "^1.1.0"
    retimer "^3.0.0"
    semver "^7.3.2"
+    subarg "^1.0.0"
    timestring "^6.0.0"
 axios@0.21.1:
@@ -1579,9 +1592,9 @@ bittorrent-protocol@^3.2.0:
    unordered-array-remove "^1.0.2"
 bittorrent-tracker@^9.0.0:
-  version "9.16.1"
+  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/bittorrent-tracker/-/bittorrent-tracker-9.16.1.tgz#8eff88dcf8180fe2b5c57943127d1fdef5918ee7"
+  resolved "https://registry.yarnpkg.com/bittorrent-tracker/-/bittorrent-tracker-9.17.0.tgz#8b4b6f6a49efa9023267c3ca22e1a5f63216fc1f"
-  integrity sha512-JjegXwpWK8xRTHd5sqKTVqPhlhzAqJrR37gSiciTa1UkSSM6SWKVUDq7ZiGS3d8FhqonDSuPLQ9wUOC2q2jeIA==
+  integrity sha512-ErpOx8AAUW8eLwxnEHp15vs0LDJECLADHISEBM+HXclG3J2/9kMBJ31IjwlB8kUNigknSwm8odAThjJEeyL1yA==
  dependencies:
    bencode "^2.0.1"
    bittorrent-peerid "^1.3.2"
@@ -1751,7 +1764,7 @@ buffer@^5.2.0:
    base64-js "^1.3.1"
    ieee754 "^1.1.13"
-buffer@^6.0.2:
+buffer@^6.0.3:
  version "6.0.3"
  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
@@ -1767,9 +1780,9 @@ bufferutil@^4.0.1:
    node-gyp-build "^4.2.0"
 bull@^3.4.2:
-  version "3.22.0"
+  version "3.22.4"
-  resolved "https://registry.yarnpkg.com/bull/-/bull-3.22.0.tgz#fb04b68189bd49e56155f4366df96330c059868c"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-3.22.4.tgz#1bda418d2aebdf892413d0c45d75c8ea5e0fc984"
-  integrity sha512-csQTIuvoKnVuW6gbZmIe9mVkLy2DzvRodywjXN7cfYlvXKme3156FIc1Zssn5IRKpDKyyq0++AYsLO4mdtnf0Q==
+  integrity sha512-CV78TuSKyDj3SuZvySTOFXqZBtHxebhctLTq2Ff9Jrn51XOaxkEDioIDzq2LIUKEhTW8l3rFK5bIWNwweY0LXQ==
  dependencies:
    cron-parser "^2.13.0"
    debuglog "^1.0.0"
@@ -1790,7 +1803,7 @@ busboy@^0.2.11:
    dicer "0.2.5"
    readable-stream "1.1.x"
-bytes@3.1.0, bytes@^3.0.0:
+bytes@3.1.0, bytes@^3.0.0, bytes@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
@@ -1905,10 +1918,10 @@ chai@^4.1.1:
    pathval "^1.1.1"
    type-detect "^4.0.5"
-chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0:
+chalk@4.1.1, chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
+  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
  dependencies:
    ansi-styles "^4.1.0"
    supports-color "^7.1.0"
@@ -1963,15 +1976,15 @@ check-error@^1.0.2:
  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 cheerio-select@^1.3.0:
-  version "1.3.0"
+  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.3.0.tgz#26a50968260b7e4281238c1e7da7ed2766652f3b"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz#3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"
-  integrity sha512-mLgqdHxVOQyhOIkG5QnRkDg7h817Dkf0dAvlCio2TJMmR72cJKH0bF28SHXvLkVrGcGOiub0/Bs/CMnPeQO7qw==
+  integrity sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew==
  dependencies:
-    css-select "^4.0.0"
+    css-select "^4.1.2"
    css-what "^5.0.0"
    domelementtype "^2.2.0"
-    domhandler "^4.1.0"
+    domhandler "^4.2.0"
-    domutils "^2.5.2"
+    domutils "^2.6.0"
 cheerio@^1.0.0-rc.3:
  version "1.0.0-rc.6"
@@ -2299,13 +2312,13 @@ concurrently@5.3.0:
    yargs "^13.3.0"
 concurrently@^6.0.0:
-  version "6.0.1"
+  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.0.1.tgz#b472efd9398bd9f5b117e22f72c3e50bf0a8a651"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.0.2.tgz#4ecdfc78a72a6f626a3a5d3c2a7a81962f3663e3"
-  integrity sha512-YCF/Wf31a910hXu7eGN9/SyHKD/usw3Shw4IPYuqIsxxC39v92engYlIlOs/zXnBJtX/6aVuhgzfhZeGJkhU4w==
+  integrity sha512-u+1Q0dJG5BidgUTpz9CU16yoHTt/oApFDQ3mbvHwSDgMjU7aGqy0q8ZQyaZyaNxdwRKTD872Ux3Twc6//sWA+Q==
  dependencies:
    chalk "^4.1.0"
    date-fns "^2.16.1"
-    lodash "^4.17.20"
+    lodash "^4.17.21"
    read-pkg "^5.2.0"
    rxjs "^6.6.3"
    spawn-command "^0.0.2-1"
@@ -2507,15 +2520,15 @@ crypto-random-string@^2.0.0:
  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-css-select@^4.0.0:
+css-select@^4.1.2:
-  version "4.0.0"
+  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.0.0.tgz#9b7b53bd82e4b348a6e0924ce37645e5db43af8e"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz#8b52b6714ed3a80d8221ec971c543f3b12653286"
-  integrity sha512-I7favumBlDP/nuHBKLfL5RqvlvRdn/W29evvWJ+TaoGPm7QD+xSIN5eY2dyGjtkUmemh02TZrqJb4B8DWo6PoQ==
+  integrity sha512-nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw==
  dependencies:
    boolbase "^1.0.0"
    css-what "^5.0.0"
-    domhandler "^4.1.0"
+    domhandler "^4.2.0"
-    domutils "^2.5.1"
+    domutils "^2.6.0"
    nth-check "^2.0.0"
 css-what@^5.0.0:
@@ -2556,9 +2569,9 @@ data-uri-to-buffer@^3.0.1:
  integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
 date-fns@^2.0.1, date-fns@^2.16.1:
-  version "2.20.2"
+  version "2.21.2"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.20.2.tgz#7f05d1275e1e43c3bdde5998201920098e19c6a1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.2.tgz#9db92305cf00626e9122e56c72195b17725594aa"
-  integrity sha512-QS0Z8SD/ALhKFvhtU4Fhz+1crsI7fPzBquXmdWay33KJPEU7btro2hnmmErpQRmt2D624B1lbjXQKDUMLnQTmQ==
+  integrity sha512-FMkG7pIPx64mGIpS2LOb3Wp3O606H/hatoiz7G0oiYWai1izdM4tF1dd7QABv2NogkIDI4wxsfLLFQSuVvDHgA==
 dateformat@^3.0.3:
  version "3.0.3"
@@ -2811,21 +2824,21 @@ domhandler@^3.0.0:
  dependencies:
    domelementtype "^2.0.1"
-domhandler@^4.0.0, domhandler@^4.1.0:
+domhandler@^4.0.0, domhandler@^4.1.0, domhandler@^4.2.0:
-  version "4.1.0"
+  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.1.0.tgz#c1d8d494d5ec6db22de99e46a149c2a4d23ddd43"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
-  integrity sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
  dependencies:
    domelementtype "^2.2.0"
-domutils@^2.0.0, domutils@^2.5.1, domutils@^2.5.2:
+domutils@^2.0.0, domutils@^2.5.2, domutils@^2.6.0:
-  version "2.5.2"
+  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.5.2.tgz#37ef8ba087dff1a17175e7092e8a042e4b050e6c"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
-  integrity sha512-MHTthCb1zj8f1GVfRpeZUbohQf/HdBos0oX5gZcQFepOZPLLRyj6Wn7XS7EMnY7CVpwv8863u2vyE83Hfu28HQ==
+  integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==
  dependencies:
    dom-serializer "^1.0.1"
    domelementtype "^2.2.0"
-    domhandler "^4.1.0"
+    domhandler "^4.2.0"
 dot-prop@^5.2.0:
  version "5.3.0"
@@ -3013,10 +3026,10 @@ entities@~2.1.0:
  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-err-code@^2.0.3:
+err-code@^3.0.1:
-  version "2.0.3"
+  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+  integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA==
 error-ex@^1.2.0, error-ex@^1.3.1:
  version "1.3.2"
@@ -3226,14 +3239,14 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
+  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 eslint@^7.2.0:
-  version "7.24.0"
+  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
-  integrity sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==
+  integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
  dependencies:
    "@babel/code-frame" "7.12.11"
    "@eslint/eslintrc" "^0.4.0"
@@ -3378,11 +3391,11 @@ express-rate-limit@^5.0.0:
  integrity sha512-nE96xaxGfxiS5jP3tD3kIW1Jg9yQgX0rXCs3rCkZtmbWHEGyotwaezkLj7bnB41Z0uaOLM8W4AX6qHao4IZ2YA==
 express-validator@^6.4.0:
-  version "6.10.0"
+  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.10.0.tgz#66f70f73d04fb55c227401c75fe3713879c9cb70"
+  resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.10.1.tgz#0ec71a2e472d85158fede76f0199054034b06e7c"
-  integrity sha512-gDtepU94EpUzgFvKO/8JzjZ4uqIF4xHekjYtcNgFDiBK6Hob3MQhPU8s/c3NaWd1xi5e5nA0oVmOJ0b0ZBO36Q==
+  integrity sha512-joYSJdkUyKMZ2gAUvyQNmqJ7x1vhrC/IHCKWauhKfoXNF83j65KnlqEEXXynBnJRd0QrNZ/aXw9uIhS6ptG0Cg==
  dependencies:
-    lodash "^4.17.20"
+    lodash "^4.17.21"
    validator "^13.5.2"
 express@^4.12.4, express@^4.16.4, express@^4.17.1:
@@ -3507,9 +3520,9 @@ fecha@^4.2.0:
  integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==
 fetch-blob@^2.1.1:
-  version "2.1.1"
+  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-2.1.1.tgz#a54ab0d5ed7ccdb0691db77b6674308b23fb2237"
+  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-2.1.2.tgz#a7805db1361bd44c1ef62bb57fb5fe8ea173ef3c"
-  integrity sha512-Uf+gxPCe1hTOFXwkxYyckn8iUSk6CFXGy5VENZKifovUTZC9eUODWSBhOBS7zICGrAetKzdwLMr85KhIcePMAQ==
+  integrity sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==
 figures@^3.0.0:
  version "3.2.0"
@@ -3627,9 +3640,9 @@ fn.name@1.x.x:
  integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 follow-redirects@^1.10.0:
-  version "1.13.3"
+  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe"
-  integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
+  integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==
 for-each@^0.3.3:
  version "0.3.3"
@@ -3697,7 +3710,7 @@ fs-chunk-store@^2.0.2:
    run-parallel "^1.1.2"
    thunky "^1.0.1"
-fs-extra@9.1.0, fs-extra@^9.0.0:
+fs-extra@9.1.0:
  version "9.1.0"
  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -3707,6 +3720,15 @@ fs-extra@9.1.0, fs-extra@^9.0.0:
    jsonfile "^6.0.1"
    universalify "^2.0.0"
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
 fs-minipass@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -3748,7 +3770,7 @@ gauge@~2.7.3:
    strip-ansi "^3.0.1"
    wide-align "^1.1.0"
-get-browser-rtc@^1.0.2:
+get-browser-rtc@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz#d1494e299b00f33fc8e9d6d3343ba4ba99711a2c"
  integrity sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==
@@ -3804,9 +3826,9 @@ get-stream@^5.1.0:
    pump "^3.0.0"
 get-stream@^6.0.0:
-  version "6.0.0"
+  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 getpass@^0.1.1:
  version "0.1.7"
@@ -4001,9 +4023,9 @@ he@1.2.0, he@^1.2.0:
  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 helmet@^4.1.0:
-  version "4.4.1"
+  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/helmet/-/helmet-4.4.1.tgz#a17e1444d81d7a83ddc6e6f9bc6e2055b994efe7"
+  resolved "https://registry.yarnpkg.com/helmet/-/helmet-4.6.0.tgz#579971196ba93c5978eb019e4e8ec0e50076b4df"
-  integrity sha512-G8tp0wUMI7i8wkMk2xLcEvESg5PiCitFMYgGRc/PwULB0RVhTP5GFdxOwvJwp9XVha8CuS8mnhmE8I/8dx/pbw==
+  integrity sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==
 hh-mm-ss@~1.2.0:
  version "1.2.0"
@@ -4085,6 +4107,17 @@ http-errors@~1.7.2:
    statuses ">= 1.5.0 < 2"
    toidentifier "1.0.0"
+http-errors@~1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507"
+  integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 "http-node@github:feross/http-node#webtorrent":
  version "1.2.0"
  resolved "https://codeload.github.com/feross/http-node/tar.gz/342ef8624495343ffd050bd0808b3750cf0e3974"
@@ -4292,9 +4325,9 @@ inquirer@7.3.3:
    through "^2.3.6"
 ioredis@^4.22.0:
-  version "4.26.0"
+  version "4.27.2"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.26.0.tgz#dbbfb5e5da085fc2b1de8174db50fa42f9fed66a"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.27.2.tgz#6a79bca05164482da796f8fa010bccefd3bf4811"
-  integrity sha512-nh39okWezWWZ35/RxXXzHksMFt4WCaev8SNO2kozRDeVdEAJj16EarqPP3JeHz8IEjEXN5CiVtbWMk62Z0eveQ==
+  integrity sha512-7OpYymIthonkC2Jne5uGWXswdhlua1S1rWGAERaotn0hGJWTSURvxdHA9G6wNbT/qKCloCja/FHsfKXW8lpTmg==
  dependencies:
    cluster-key-slot "^1.1.0"
    debug "^4.3.1"
@@ -4360,9 +4393,9 @@ is-ascii@^1.0.0:
  integrity sha1-8CrQJZoJIc0Zn/Ic4bCeD2tOOSk=
 is-bigint@^1.0.1:
-  version "1.0.1"
+  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
-  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
 is-binary-path@~2.1.0:
  version "2.1.0"
@@ -4403,9 +4436,9 @@ is-cidr@^4.0.0:
    cidr-regex "^3.1.1"
 is-core-module@^2.2.0:
-  version "2.2.0"
+  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
  dependencies:
    has "^1.0.3"
@@ -4650,7 +4683,7 @@ js-tokens@^4.0.0:
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@4.0.0, js-yaml@^4.0.0:
+js-yaml@4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
@@ -4665,6 +4698,13 @@ js-yaml@^3.13.1, js-yaml@^3.14.0:
    argparse "^1.0.7"
    esprima "^4.0.0"
+js-yaml@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
 jsbn@~0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -5077,10 +5117,18 @@ lru@^3.1.0:
  dependencies:
    inherits "^2.0.1"
+lt_donthave@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lt_donthave/-/lt_donthave-1.0.1.tgz#a160e08bdf15b9e092172063688855a6c031d8b3"
+  integrity sha512-PfOXfDN9GnUjlNHjjxKQuMxPC8s12iSrnmg+Ff1BU1uLn7S1BFAKzpZCu6Gwg3WsCUvTZrZoDSHvy6B/j+N4/Q==
+  dependencies:
+    debug "^4.2.0"
+    unordered-array-remove "^1.0.2"
 magnet-uri@^6.0.0, magnet-uri@^6.1.0:
-  version "6.1.0"
+  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/magnet-uri/-/magnet-uri-6.1.0.tgz#fe73026ba1ee77c955097a4979d1003f4fb7ecf7"
+  resolved "https://registry.yarnpkg.com/magnet-uri/-/magnet-uri-6.1.1.tgz#e05de8db0224436ae4e8eb3d1085bec9b488347e"
-  integrity sha512-731qLviHaqN/Ni96wm6gNKuvoip+QHWTznjHNz/4qDlsHh3/CWJoL8fZ18IIRhGJgnWoKJp8RVE5lZvQ60Khhw==
+  integrity sha512-TUyzaLB36TqqIHzgvkMrlZUPN6mfoLX/+2do5YJH3gjBQL2auEtivT+99npIiA77YepJ6pYA/AzWhboXTAAm0w==
  dependencies:
    bep53-range "^1.0.0"
    thirty-two "^1.0.2"
@@ -5180,10 +5228,10 @@ markdown-it-emoji@^2.0.0:
  resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.0.tgz#3164ad4c009efd946e98274f7562ad611089a231"
  integrity sha512-39j7/9vP/CPCKbEI44oV8yoPJTpvfeReTn/COgRhSpNrjWF3PfP/JUxxB0hxV6ynOY8KH8Y8aX9NMDdo6z+6YQ==
-markdown-it@12.0.4:
+markdown-it@^12.0.4:
-  version "12.0.4"
+  version "12.0.6"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.4.tgz#eec8247d296327eac3ba9746bdeec9cfcc751e33"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.6.tgz#adcc8e5fe020af292ccbdf161fe84f1961516138"
-  integrity sha512-34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q==
+  integrity sha512-qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w==
  dependencies:
    argparse "^2.0.1"
    entities "~2.1.0"
@@ -5539,6 +5587,15 @@ multimatch@^5.0.0:
    arrify "^2.0.1"
    minimatch "^3.0.4"
+multiparty@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz#bee5fb5737247628d39dab4979ffd6d57bf60ef6"
+  integrity sha512-NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q==
+  dependencies:
+    http-errors "~1.8.0"
+    safe-buffer "5.2.1"
+    uid-safe "2.1.5"
 multistream@^4.0.1, multistream@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8"
@@ -5653,7 +5710,7 @@ nodemailer@5.0.0:
  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-5.0.0.tgz#bcb409eca613114e85de42646d0ce7f1fa70b716"
  integrity sha512-XI4PI5L7GYcJyHkPcHlvPyRrYohNYBNRNbt1tU8PXNU3E1ADJC84a13V0vbL9AM431OP+ETacaGXAF8fGn1JvA==
-nodemailer@6.5.0, nodemailer@^6.0.0, nodemailer@^6.5.0:
+nodemailer@6.5.0:
  version "6.5.0"
  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.5.0.tgz#d12c28d8d48778918e25f1999d97910231b175d9"
  integrity sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==
@@ -5663,6 +5720,11 @@ nodemailer@^3.1.1:
  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-3.1.8.tgz#febfaccb4bd273678473a309c6cb4b4a2f3c48e3"
  integrity sha1-/r+sy0vSc2eEc6MJxstLSi88SOM=
+nodemailer@^6.0.0, nodemailer@^6.5.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.0.tgz#ed47bb572b48d9d0dca3913fdc156203f438f427"
+  integrity sha512-ikSMDU1nZqpo2WUPE0wTTw/NGGImTkwpJKDIFPZT+YvvR9Sj+ze5wzu95JHkBMglQLoG2ITxU21WukCC/XsFkg==
 nodemon@^2.0.1:
  version "2.0.7"
  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.7.tgz#6f030a0a0ebe3ea1ba2a38f71bf9bab4841ced32"
@@ -5777,9 +5839,9 @@ object-hash@2.1.1:
  integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==
 object-inspect@^1.9.0:
-  version "1.9.0"
+  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+  integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
 object-keys@^1.0.12, object-keys@^1.1.1:
  version "1.1.1"
@@ -5896,9 +5958,9 @@ p-cancelable@^1.0.0:
  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 p-cancelable@^2.0.0:
-  version "2.1.0"
+  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.0.tgz#4d51c3b91f483d02a0d300765321fca393d758dd"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
-  integrity sha512-HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ==
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 p-finally@^1.0.0:
  version "1.0.0"
@@ -6213,25 +6275,25 @@ pfeed@1.1.11:
    lodash "^4.17.15"
    xml "^1.0.1"
-pg-connection-string@^2.4.0:
+pg-connection-string@^2.5.0:
-  version "2.4.0"
+  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
-  integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==
+  integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
 pg-int8@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-pg-pool@^3.2.2:
+pg-pool@^3.3.0:
-  version "3.2.2"
+  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz#a560e433443ed4ad946b84d774b3f22452694dff"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.3.0.tgz#12d5c7f65ea18a6e99ca9811bd18129071e562fc"
-  integrity sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==
+  integrity sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==
-pg-protocol@^1.4.0:
+pg-protocol@^1.5.0:
-  version "1.4.0"
+  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz#43a71a92f6fe3ac559952555aa3335c8cb4908be"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0"
-  integrity sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==
+  integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==
 pg-types@^2.1.0:
  version "2.2.0"
@@ -6245,15 +6307,15 @@ pg-types@^2.1.0:
    postgres-interval "^1.1.0"
 pg@^8.2.1:
-  version "8.5.1"
+  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz#34dcb15f6db4a29c702bf5031ef2e1e25a06a120"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.6.0.tgz#e222296b0b079b280cce106ea991703335487db2"
-  integrity sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==
+  integrity sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==
  dependencies:
    buffer-writer "2.0.0"
    packet-reader "1.0.0"
-    pg-connection-string "^2.4.0"
+    pg-connection-string "^2.5.0"
-    pg-pool "^3.2.2"
+    pg-pool "^3.3.0"
-    pg-protocol "^1.4.0"
+    pg-protocol "^1.5.0"
    pg-types "^2.1.0"
    pgpass "1.x"
@@ -6314,9 +6376,9 @@ pngjs@^3.0.0, pngjs@^3.3.3:
  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 postcss@^8.0.2:
-  version "8.2.10"
+  version "8.2.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f"
-  integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==
+  integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==
  dependencies:
    colorette "^1.2.2"
    nanoid "^3.1.22"
@@ -6593,7 +6655,7 @@ qs@^6.9.4, qs@^6.9.6:
  dependencies:
    side-channel "^1.0.4"
-queue-microtask@^1.2.0, queue-microtask@^1.2.2:
+queue-microtask@^1.2.0, queue-microtask@^1.2.2, queue-microtask@^1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
@@ -6623,6 +6685,11 @@ random-access-storage@^1.1.1:
  dependencies:
    inherits "^2.0.3"
+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+  integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=
 random-iterate@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/random-iterate/-/random-iterate-1.0.1.tgz#f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"
@@ -6821,9 +6888,9 @@ redis-parser@^3.0.0:
    redis-errors "^1.0.0"
 redis@^3.0.2:
-  version "3.1.0"
+  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-3.1.0.tgz#39daec130d74b78decca93513c61db0af5d86ce6"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-3.1.2.tgz#766851117e80653d23e0ed536254677ab647638c"
-  integrity sha512-//lAOcEtNIKk2ekZibes5oyWKYUVWMvMB71lyD/hS9KRePNkB7AU3nXGkArX6uDKEb2N23EyJBthAv6pagD0uw==
+  integrity sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==
  dependencies:
    denque "^1.5.0"
    redis-commands "^1.7.0"
@@ -6891,9 +6958,9 @@ require-main-filename@^2.0.0:
  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 resolve-alpn@^1.0.0:
-  version "1.1.1"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.1.1.tgz#4a006a7d533c81a5dd04681612090fde227cd6e1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.1.2.tgz#30b60cfbb0c0b8dc897940fe13fe255afcdd4d28"
-  integrity sha512-0KbFjFPR2bnJhNx1t8Ad6RqVc8+QPJC4y561FYyC/Q/6OzB3fhUzB5PEgitYhPK6aifwR5gXBSnDMllaDWixGQ==
+  integrity sha512-8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==
 resolve-from@^4.0.0:
  version "4.0.0"
@@ -7007,7 +7074,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -7153,6 +7220,11 @@ setprototypeof@1.1.1:
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 shebang-command@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -7206,15 +7278,15 @@ simple-get@^4.0.0:
    simple-concat "^1.0.0"
 simple-peer@^9.7.1, simple-peer@^9.9.3:
-  version "9.10.0"
+  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/simple-peer/-/simple-peer-9.10.0.tgz#f458444300f635e6fcc2f5a5166c45d71eafb57f"
+  resolved "https://registry.yarnpkg.com/simple-peer/-/simple-peer-9.11.0.tgz#e8d27609c7a610c3ddd75767da868e8daab67571"
-  integrity sha512-sKrKtca1UdmwdZIbvuT3iEL05tDGt/xdLP6+ej8rh1ADgtDk44yLaEZjIyPJ6c34zsSih46Ou7zUIT7e4hPK7g==
+  integrity sha512-qvdNu/dGMHBm2uQ7oLhQBMhYlrOZC1ywXNCH/i8I4etxR1vrjCnU6ZSQBptndB1gcakjo2+w4OHo7Sjza1SHxg==
  dependencies:
-    buffer "^6.0.2"
+    buffer "^6.0.3"
-    debug "^4.2.0"
+    debug "^4.3.1"
-    err-code "^2.0.3"
+    err-code "^3.0.1"
-    get-browser-rtc "^1.0.2"
+    get-browser-rtc "^1.1.0"
-    queue-microtask "^1.2.0"
+    queue-microtask "^1.2.3"
    randombytes "^2.1.0"
    readable-stream "^3.6.0"
@@ -7244,12 +7316,12 @@ simple-websocket@^9.0.0:
    readable-stream "^3.6.0"
    ws "^7.4.2"
-sitemap@^6.1.0:
+sitemap@^7.0.0:
-  version "6.4.0"
+  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/sitemap/-/sitemap-6.4.0.tgz#b4bc4edf36de742405a7572bc3e467ba484b852e"
+  resolved "https://registry.yarnpkg.com/sitemap/-/sitemap-7.0.0.tgz#022bef4df8cba42e38e1fe77039f234cab0372b6"
-  integrity sha512-DoPKNc2/apQZTUnfiOONWctwq7s6dZVspxAZe2VPMNtoqNq7HgXRvlRnbIpKjf+8+piQdWncwcy+YhhTGY5USQ==
+  integrity sha512-Ud0jrRQO2k7fEtPAM+cQkBKoMvxQyPKNXKDLn8tRVHxRCsdDQ2JZvw+aZ5IRYYQVAV9iGxEar6boTwZzev+x3g==
  dependencies:
-    "@types/node" "^14.14.28"
+    "@types/node" "^15.0.1"
    "@types/sax" "^1.2.1"
    arg "^5.0.0"
    sax "^1.2.4"
@@ -7688,6 +7760,13 @@ strip-json-comments@~2.0.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+subarg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
+  integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI=
+  dependencies:
+    minimist "^1.1.0"
 superagent@^6.1.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/superagent/-/superagent-6.1.0.tgz#09f08807bc41108ef164cfb4be293cebd480f4a6"
@@ -7749,19 +7828,17 @@ swagger-cli@^4.0.2:
    "@apidevtools/swagger-cli" "4.0.4"
 table@^6.0.4:
-  version "6.0.9"
+  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.0.9.tgz#790a12bf1e09b87b30e60419bafd6a1fd85536fb"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
-  integrity sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==
+  integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
  dependencies:
    ajv "^8.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
    lodash.clonedeep "^4.5.0"
    lodash.flatten "^4.4.0"
    lodash.truncate "^4.4.2"
    slice-ansi "^4.0.0"
    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 tar@^6.1.0:
  version "6.1.0"
@@ -7862,11 +7939,16 @@ titleize@^2.1.0:
  resolved "https://registry.yarnpkg.com/titleize/-/titleize-2.1.0.tgz#5530de07c22147a0488887172b5bd94f5b30a48f"
  integrity sha512-m+apkYlfiQTKLW+sI4vqUkwMEzfgEUEYSqljx1voUE3Wz/z1ZsxyzSxvH2X8uKVrOp7QkByWt0rA6+gvhCKy6g==
-tlds@1.219.0, tlds@^1.218.0:
+tlds@1.219.0:
  version "1.219.0"
  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.219.0.tgz#7e636062386a1f3c9184356de93d40842ffe91d9"
  integrity sha512-o4g9c8kXCmTDwUnK/9HpTT9o/GNH85KCvs+S5SgUw5yILdECvMmTGzK7ngoWMp97P5tfYr8fZeF16YhgV/l90A==
+tlds@^1.218.0:
+  version "1.221.1"
+  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.221.1.tgz#6cf6bff5eaf30c5618c5801c3f425a6dc61ca0ad"
+  integrity sha512-N1Afn/SLeOQRpxMwHBuNFJ3GvGrdtY4XPXKPFcx8he0U9Jg9ZkvTKE1k3jQDtCmlFn44UxjVtouF6PT4rEGd3Q==
 tmp@0.0.x, tmp@^0.0.33:
  version "0.0.33"
  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -8096,6 +8178,13 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+uid-safe@2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
+  dependencies:
+    random-bytes "~1.0.0"
 uint64be@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/uint64be/-/uint64be-2.0.2.tgz#ef4a179752fe8f9ddaa29544ecfc13490031e8e5"
@@ -8218,9 +8307,9 @@ ut_pex@^2.0.1:
    string2compact "^1.2.5"
 utf-8-validate@^5.0.2:
-  version "5.0.4"
+  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz#72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8"
+  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.5.tgz#dd32c2e82c72002dc9f02eb67ba6761f43456ca1"
-  integrity sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q==
+  integrity sha512-+pnxRYsS/axEpkrrEpzYfNZGXp0IjC/9RIxwM5gntY4Koi8SHmUGSfxfWqxZdRxrtaoVstuOzUp/rbs3JSPELQ==
  dependencies:
    node-gyp-build "^4.2.0"
@@ -8327,9 +8416,9 @@ validator@^12.0.0:
  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
 validator@^13.0.0, validator@^13.5.2:
-  version "13.5.2"
+  version "13.6.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.5.2.tgz#c97ae63ed4224999fb6f42c91eaca9567fe69a46"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059"
-  integrity sha512-mD45p0rvHVBlY2Zuy3F3ESIe1h5X58GPfAtslBjY7EtTqGquZTj+VX/J4RnHWN8FKq0C9WRVt1oWAcytWRuYLQ==
+  integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==
 vary@^1, vary@~1.1.2:
  version "1.1.2"
@@ -8388,10 +8477,10 @@ webfinger.js@^2.6.6:
  dependencies:
    xhr2 "^0.1.4"
-webtorrent@^0.116.1:
+webtorrent@^0.118.0:
-  version "0.116.1"
+  version "0.118.0"
-  resolved "https://registry.yarnpkg.com/webtorrent/-/webtorrent-0.116.1.tgz#db8e884e9ecfd5775dcadfec01bccd3b5e57b2af"
+  resolved "https://registry.yarnpkg.com/webtorrent/-/webtorrent-0.118.0.tgz#9e0a75a2e270e27a818cb7395b53c89fa7532c6f"
-  integrity sha512-xCmA9U8RviUbGD2Gv8pAPEGaPzGw8ZXseuUb5bbNrTg7zseRw4SrRvhPM17ri3yKN7+jWPeDvVXPPsNY9scFHw==
+  integrity sha512-xXwwM2P+vtDsMRx9eRPNQqHD+6E7Zz7OTZqWAr2XDXg3TWGCf9HmwpgV53+F9H0oqw+l4j7vR9DRjAjChPQpZA==
  dependencies:
    addr-to-ip-port "^1.5.1"
    bitfield "^4.0.0"
@@ -8408,6 +8497,7 @@ webtorrent@^0.116.1:
    http-node "github:feross/http-node#webtorrent"
    immediate-chunk-store "^2.1.1"
    load-ip-set "^2.1.2"
+    lt_donthave "^1.0.1"
    memory-chunk-store "^1.3.1"
    mime "^2.5.0"
    multistream "^4.1.0"
@@ -8598,9 +8688,9 @@ ws@^5.2.2:
    async-limiter "~1.0.0"
 ws@^7.0.0, ws@^7.3.0, ws@^7.4.2, ws@~7.4.2:
-  version "7.4.4"
+  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
-  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
+  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
 ws@~6.1.0:
  version "6.1.4"