6 files changed, 26 insertions, 5 deletions

diff --git a/shared/core-utils/i18n/i18n.ts b/shared/core-utils/i18n/i18n.ts
index f0fcb5af7..07f0bdeb7 100644
--- a/shared/core-utils/i18n/i18n.ts
+++ b/shared/core-utils/i18n/i18n.ts
@@ -33,6 +33,7 @@ export const I18N_LOCALES = {
   'nb-NO': 'norsk bokmål',
   'th-TH': 'ไทย',
   'vi-VN': 'Tiếng Việt',
+  'tok': 'Toki Pona',
   'zh-Hans-CN': '简体中文（中国）',
   'zh-Hant-TW': '繁體中文（台灣）'
 }
diff --git a/shared/models/plugins/client/client-hook.model.ts b/shared/models/plugins/client/client-hook.model.ts
index bb55e92d5..04d42d591 100644
--- a/shared/models/plugins/client/client-hook.model.ts
+++ b/shared/models/plugins/client/client-hook.model.ts
@@ -108,16 +108,16 @@ export const clientActionHookObject = {
   // Fired when the admin plugin settings page is being initialized
   'action:admin-plugin-settings.init': true,
 
-  // Fired when the video upload page is being initalized
+  // Fired when the video upload page is being initialized
   'action:video-upload.init': true,
-  // Fired when the video import by URL page is being initalized
+  // Fired when the video import by URL page is being initialized
   'action:video-url-import.init': true,
-  // Fired when the video import by torrent/magnet URI page is being initalized
+  // Fired when the video import by torrent/magnet URI page is being initialized
   'action:video-torrent-import.init': true,
-  // Fired when the "Go Live" page is being initalized
+  // Fired when the "Go Live" page is being initialized
   'action:go-live.init': true,
 
-  // Fired when the user explicitely logged in/logged out
+  // Fired when the user explicitly logged in/logged out
   'action:auth-user.logged-in': true,
   'action:auth-user.logged-out': true,
   // Fired when the application loaded user information (using tokens from the local storage or after a successful login)
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 58b60c177..68e2f9c4c 100644
--- a/shared/models/videos/channel/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -18,6 +18,7 @@ export interface VideoChannel extends Actor {
 
   videosCount?: number
   viewsPerDay?: ViewsPerDate[] // chronologically ordered
+  totalViews?: number
 
   banners: ActorImage[]
 
diff --git a/shared/models/videos/video-sort-field.type.ts b/shared/models/videos/video-sort-field.type.ts
index 5073848b8..7fa07fa73 100644
--- a/shared/models/videos/video-sort-field.type.ts
+++ b/shared/models/videos/video-sort-field.type.ts
@@ -2,6 +2,7 @@ export type VideoSortField =
   'name' | '-name' |
   'duration' | '-duration' |
   'publishedAt' | '-publishedAt' |
+  'originallyPublishedAt' | '-originallyPublishedAt' |
   'createdAt' | '-createdAt' |
   'views' | '-views' |
   'likes' | '-likes' |
diff --git a/shared/models/videos/video-source.ts b/shared/models/videos/video-source.ts
new file mode 100644
index 000000000..57e54fc7f
--- /dev/null
+++ b/shared/models/videos/video-source.ts
@@ -0,0 +1,3 @@
+export interface VideoSource {
+  filename: string
+}
diff --git a/shared/server-commands/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts
index 1cceb58db..e952c9777 100644
--- a/shared/server-commands/videos/videos-command.ts
+++ b/shared/server-commands/videos/videos-command.ts
@@ -23,6 +23,7 @@ import {
 import { unwrapBody } from '../requests'
 import { waitJobs } from '../server'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
+import { VideoSource } from '@shared/models/videos/video-source'
 
 export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile'>> & {
   fixture?: string
@@ -150,6 +151,20 @@ export class VideosCommand extends AbstractCommand {
     })
   }
 
+  getSource (options: OverrideCommandOptions & {
+    id: number | string
+  }) {
+    const path = '/api/v1/videos/' + options.id + '/source'
+
+    return this.getRequestBody<VideoSource>({
+      ...options,
+
+      path,
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    })
+  }
+
   async getId (options: OverrideCommandOptions & {
     uuid: number | string
   }) {