10 files changed, 49 insertions, 8 deletions

diff --git a/shared/models/plugins/client/index.ts b/shared/models/plugins/client/index.ts
index c500185c9..f3e3fcbcf 100644
--- a/shared/models/plugins/client/index.ts
+++ b/shared/models/plugins/client/index.ts
@@ -4,4 +4,5 @@ export * from './plugin-element-placeholder.type'
 export * from './plugin-selector-id.type'
 export * from './register-client-form-field.model'
 export * from './register-client-hook.model'
+export * from './register-client-route.model'
 export * from './register-client-settings-script.model'
diff --git a/shared/models/plugins/client/plugin-selector-id.type.ts b/shared/models/plugins/client/plugin-selector-id.type.ts
index b74dffbef..8d23314b5 100644
--- a/shared/models/plugins/client/plugin-selector-id.type.ts
+++ b/shared/models/plugins/client/plugin-selector-id.type.ts
@@ -1 +1,10 @@
-export type PluginSelectorId = 'login-form'
+export type PluginSelectorId =
+  'login-form' |
+  'menu-user-dropdown-language-item' |
+  'about-instance-features' |
+  'about-instance-statistics' |
+  'about-instance-moderation' |
+  'about-menu-instance' |
+  'about-menu-peertube' |
+  'about-menu-network' |
+  'about-instance-other-information'
diff --git a/shared/models/plugins/client/register-client-form-field.model.ts b/shared/models/plugins/client/register-client-form-field.model.ts
index 2df071337..153c4a6ea 100644
--- a/shared/models/plugins/client/register-client-form-field.model.ts
+++ b/shared/models/plugins/client/register-client-form-field.model.ts
@@ -16,8 +16,15 @@ export type RegisterClientFormFieldOptions = {
 
   // Not supported by plugin setting registration, use registerSettingsScript instead
   hidden?: (options: any) => boolean
+
+  // Return undefined | null if there is no error or return a string with the detailed error
+  // Not supported by plugin setting registration
+  error?: (options: any) => Promise<{ error: boolean, text?: string }>
 }
 
 export interface RegisterClientVideoFieldOptions {
   type: 'update' | 'upload' | 'import-url' | 'import-torrent' | 'go-live'
+
+  // Default to 'plugin-settings'
+  tab?: 'main' | 'plugin-settings'
 }
diff --git a/shared/models/plugins/client/register-client-route.model.ts b/shared/models/plugins/client/register-client-route.model.ts
new file mode 100644
index 000000000..271b67834
--- /dev/null
+++ b/shared/models/plugins/client/register-client-route.model.ts
@@ -0,0 +1,7 @@
+export interface RegisterClientRouteOptions {
+  route: string
+
+  onMount (options: {
+    rootEl: HTMLElement
+  }): void
+}
diff --git a/shared/models/plugins/client/register-client-settings-script.model.ts b/shared/models/plugins/client/register-client-settings-script.model.ts
index 481ceef96..117ca4739 100644
--- a/shared/models/plugins/client/register-client-settings-script.model.ts
+++ b/shared/models/plugins/client/register-client-settings-script.model.ts
@@ -1,6 +1,6 @@
 import { RegisterServerSettingOptions } from '../server'
 
-export interface RegisterClientSettingsScript {
+export interface RegisterClientSettingsScriptOptions {
   isSettingHidden (options: {
     setting: RegisterServerSettingOptions
     formValues: { [name: string]: any }
diff --git a/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts b/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
index e91c8b4dc..36dfef943 100644
--- a/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
+++ b/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
@@ -9,6 +9,8 @@ export interface PeerTubePluginIndex {
 
   latestVersion: string
 
+  official: boolean
+
   name?: string
   installed?: boolean
 }
diff --git a/shared/models/plugins/plugin-package-json.model.ts b/shared/models/plugins/plugin-package-json.model.ts
index b2f92af80..7ce968ff2 100644
--- a/shared/models/plugins/plugin-package-json.model.ts
+++ b/shared/models/plugins/plugin-package-json.model.ts
@@ -1,15 +1,15 @@
 import { PluginClientScope } from './client/plugin-client-scope.type'
 
-export type PluginTranslationPaths = {
+export type PluginTranslationPathsJSON = {
   [ locale: string ]: string
 }
 
-export type ClientScript = {
+export type ClientScriptJSON = {
   script: string
   scopes: PluginClientScope[]
 }
 
-export type PluginPackageJson = {
+export type PluginPackageJSON = {
   name: string
   version: string
   description: string
@@ -23,7 +23,7 @@ export type PluginPackageJson = {
   staticDirs: { [ name: string ]: string }
   css: string[]
 
-  clientScripts: ClientScript[]
+  clientScripts: ClientScriptJSON[]
 
-  translations: PluginTranslationPaths
+  translations: PluginTranslationPathsJSON
 }
diff --git a/shared/models/plugins/plugin.type.ts b/shared/models/plugins/plugin.type.ts
index b6766821a..016219ceb 100644
--- a/shared/models/plugins/plugin.type.ts
+++ b/shared/models/plugins/plugin.type.ts
@@ -1,4 +1,4 @@
-export enum PluginType {
+export const enum PluginType {
   PLUGIN = 1,
   THEME = 2
 }
diff --git a/shared/models/plugins/server/api/install-plugin.model.ts b/shared/models/plugins/server/api/install-plugin.model.ts
index 5a268ebe1..a1d009a00 100644
--- a/shared/models/plugins/server/api/install-plugin.model.ts
+++ b/shared/models/plugins/server/api/install-plugin.model.ts
@@ -1,4 +1,5 @@
 export interface InstallOrUpdatePlugin {
   npmName?: string
+  pluginVersion?: string
   path?: string
 }
diff --git a/shared/models/plugins/server/server-hook.model.ts b/shared/models/plugins/server/server-hook.model.ts
index 3ab910197..bd2b27da5 100644
--- a/shared/models/plugins/server/server-hook.model.ts
+++ b/shared/models/plugins/server/server-hook.model.ts
@@ -53,6 +53,12 @@ export const serverFilterHookObject = {
   'filter:api.video-thread.create.accept.result': true,
   'filter:api.video-comment-reply.create.accept.result': true,
 
+  // Filter attributes when creating video object
+  'filter:api.video.upload.video-attribute.result': true,
+  'filter:api.video.import-url.video-attribute.result': true,
+  'filter:api.video.import-torrent.video-attribute.result': true,
+  'filter:api.video.live.video-attribute.result': true,
+
   // Filter params/result used to list threads of a specific video
   // (used by the video watch page)
   'filter:api.video-threads.list.params': true,
@@ -63,6 +69,9 @@ export const serverFilterHookObject = {
   'filter:api.video-thread-comments.list.params': true,
   'filter:api.video-thread-comments.list.result': true,
 
+  // Filter get stats result
+  'filter:api.server.stats.get.result': true,
+
   // Filter result used to check if we need to auto blacklist a video
   // (fired when a local or remote video is created or updated)
   'filter:video.auto-blacklist.result': true,
@@ -106,6 +115,11 @@ export const serverActionHookObject = {
   // Fired when a comment (thread or reply) is deleted
   'action:api.video-comment.deleted': true,
 
+  // Fired when a caption is created
+  'action:api.video-caption.created': true,
+  // Fired when a caption is deleted
+  'action:api.video-caption.deleted': true,
+
   // Fired when a user is blocked (banned)
   'action:api.user.blocked': true,
   // Fired when a user is unblocked (unbanned)