10 files changed, 45 insertions, 5 deletions

diff --git a/shared/models/plugins/client/client-hook.model.ts b/shared/models/plugins/client/client-hook.model.ts
index e6313b60e..20e019304 100644
--- a/shared/models/plugins/client/client-hook.model.ts
+++ b/shared/models/plugins/client/client-hook.model.ts
@@ -88,7 +88,10 @@ export const clientFilterHookObject = {
   'filter:share.video-playlist-url.build.result': true,
 
   // Filter videojs options built for PeerTube player
-  'filter:internal.player.videojs.options.result': true
+  'filter:internal.player.videojs.options.result': true,
+
+  // Filter p2p media loader options built for PeerTube player
+  'filter:internal.player.p2p-media-loader.options.result': true
 }
 
 export type ClientFilterHookName = keyof typeof clientFilterHookObject
diff --git a/shared/models/plugins/server/server-hook.model.ts b/shared/models/plugins/server/server-hook.model.ts
index 5bf01c4b4..f11d2050b 100644
--- a/shared/models/plugins/server/server-hook.model.ts
+++ b/shared/models/plugins/server/server-hook.model.ts
@@ -103,7 +103,9 @@ export const serverFilterHookObject = {
   'filter:job-queue.process.result': true,
 
   'filter:transcoding.manual.resolutions-to-transcode.result': true,
-  'filter:transcoding.auto.resolutions-to-transcode.result': true
+  'filter:transcoding.auto.resolutions-to-transcode.result': true,
+
+  'filter:activity-pub.remote-video-comment.create.accept.result': true
 }
 
 export type ServerFilterHookName = keyof typeof serverFilterHookObject
diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts
index 1c4597b8b..41f2109af 100644
--- a/shared/models/server/debug.model.ts
+++ b/shared/models/server/debug.model.ts
@@ -8,4 +8,5 @@ export interface SendDebugCommand {
   | 'process-video-views-buffer'
   | 'process-video-viewers'
   | 'process-video-channel-sync-latest'
+  | 'process-update-videos-scheduler'
 }
diff --git a/shared/models/users/index.ts b/shared/models/users/index.ts
index b25978587..32f7a441c 100644
--- a/shared/models/users/index.ts
+++ b/shared/models/users/index.ts
@@ -1,3 +1,4 @@
+export * from './two-factor-enable-result.model'
 export * from './user-create-result.model'
 export * from './user-create.model'
 export * from './user-flag.model'
diff --git a/shared/models/users/two-factor-enable-result.model.ts b/shared/models/users/two-factor-enable-result.model.ts
new file mode 100644
index 000000000..1fc801f0a
--- /dev/null
+++ b/shared/models/users/two-factor-enable-result.model.ts
@@ -0,0 +1,7 @@
+export interface TwoFactorEnableResult {
+  otpRequest: {
+    requestToken: string
+    secret: string
+    uri: string
+  }
+}
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index 63c5c8a92..761a2edba 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -28,8 +28,10 @@ export interface User {
   videosHistoryEnabled: boolean
   videoLanguages: string[]
 
-  role: UserRole
-  roleLabel: string
+  role: {
+    id: UserRole
+    label: string
+  }
 
   videoQuota: number
   videoQuotaDaily: number
@@ -62,6 +64,8 @@ export interface User {
   pluginAuth: string | null
 
   lastLoginDate: Date | null
+
+  twoFactorEnabled: boolean
 }
 
 export interface MyUserSpecialPlaylist {
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index f8e6976d3..4c1790228 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -33,6 +33,8 @@ export * from './video-storage.enum'
 export * from './video-streaming-playlist.model'
 export * from './video-streaming-playlist.type'
 
+export * from './video-token.model'
+
 export * from './video-update.model'
 export * from './video-view.model'
 export * from './video.model'
diff --git a/shared/models/videos/playlist/video-exist-in-playlist.model.ts b/shared/models/videos/playlist/video-exist-in-playlist.model.ts
index fc979c8c0..bc803a99c 100644
--- a/shared/models/videos/playlist/video-exist-in-playlist.model.ts
+++ b/shared/models/videos/playlist/video-exist-in-playlist.model.ts
@@ -1,10 +1,18 @@
 export type VideosExistInPlaylists = {
   [videoId: number ]: VideoExistInPlaylist[]
 }
+export type CachedVideosExistInPlaylists = {
+  [videoId: number ]: CachedVideoExistInPlaylist[]
+}
 
-export type VideoExistInPlaylist = {
+export type CachedVideoExistInPlaylist = {
   playlistElementId: number
   playlistId: number
   startTimestamp?: number
   stopTimestamp?: number
 }
+
+export type VideoExistInPlaylist = CachedVideoExistInPlaylist & {
+  playlistDisplayName: string
+  playlistShortUUID: string
+}
diff --git a/shared/models/videos/video-token.model.ts b/shared/models/videos/video-token.model.ts
new file mode 100644
index 000000000..aefea565f
--- /dev/null
+++ b/shared/models/videos/video-token.model.ts
@@ -0,0 +1,6 @@
+export interface VideoToken {
+  files: {
+    token: string
+    expires: string | Date
+  }
+}
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index d9765dbd6..06ffb327c 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -20,7 +20,11 @@ export interface Video {
   licence: VideoConstant<number>
   language: VideoConstant<string>
   privacy: VideoConstant<VideoPrivacy>
+
+  // Deprecated in 5.0 in favour of truncatedDescription
   description: string
+  truncatedDescription: string
+
   duration: number
   isLocal: boolean
   name: string
@@ -70,7 +74,9 @@ export interface Video {
 }
 
 export interface VideoDetails extends Video {
+  // Deprecated in 5.0
   descriptionPath: string
+
   support: string
   channel: VideoChannel
   account: Account