10 files changed, 61 insertions, 64 deletions

diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 5df606566..ab83ed497 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -147,7 +147,7 @@ export interface CustomConfig {
     }
   }
 
-  videoEditor: {
+  videoStudio: {
     enabled: boolean
   }
 
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index 3b4855eaa..91469d010 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -1,6 +1,6 @@
 import { ContextType } from '../activitypub/context'
 import { VideoState } from '../videos'
-import { VideoEditorTaskCut } from '../videos/editor'
+import { VideoStudioTaskCut } from '../videos/studio'
 import { VideoResolution } from '../videos/file/video-resolution.enum'
 import { SendEmailOptions } from './emailer.model'
 
@@ -23,7 +23,7 @@ export type JobType =
   | 'actor-keys'
   | 'manage-video-torrent'
   | 'move-to-object-storage'
-  | 'video-edition'
+  | 'video-studio-edition'
 
 export interface Job {
   id: number
@@ -117,9 +117,6 @@ export type ManageVideoTorrentPayload =
 interface BaseTranscodingPayload {
   videoUUID: string
   isNewVideo?: boolean
-
-  // Custom notification when the task is finished
-  notification?: 'default' | 'video-edition'
 }
 
 export interface HLSTranscodingPayload extends BaseTranscodingPayload {
@@ -178,9 +175,9 @@ export interface MoveObjectStoragePayload {
   previousVideoState: VideoState
 }
 
-export type VideoEditorTaskCutPayload = VideoEditorTaskCut
+export type VideoStudioTaskCutPayload = VideoStudioTaskCut
 
-export type VideoEditorTaskIntroPayload = {
+export type VideoStudioTaskIntroPayload = {
   name: 'add-intro'
 
   options: {
@@ -188,7 +185,7 @@ export type VideoEditorTaskIntroPayload = {
   }
 }
 
-export type VideoEditorTaskOutroPayload = {
+export type VideoStudioTaskOutroPayload = {
   name: 'add-outro'
 
   options: {
@@ -196,7 +193,7 @@ export type VideoEditorTaskOutroPayload = {
   }
 }
 
-export type VideoEditorTaskWatermarkPayload = {
+export type VideoStudioTaskWatermarkPayload = {
   name: 'add-watermark'
 
   options: {
@@ -204,13 +201,13 @@ export type VideoEditorTaskWatermarkPayload = {
   }
 }
 
-export type VideoEditionTaskPayload =
-  VideoEditorTaskCutPayload |
-  VideoEditorTaskIntroPayload |
-  VideoEditorTaskOutroPayload |
-  VideoEditorTaskWatermarkPayload
+export type VideoStudioTaskPayload =
+  VideoStudioTaskCutPayload |
+  VideoStudioTaskIntroPayload |
+  VideoStudioTaskOutroPayload |
+  VideoStudioTaskWatermarkPayload
 
-export interface VideoEditionPayload {
+export interface VideoStudioEditionPayload {
   videoUUID: string
-  tasks: VideoEditionTaskPayload[]
+  tasks: VideoStudioTaskPayload[]
 }
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 146bed24b..67ad809f7 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -175,7 +175,7 @@ export interface ServerConfig {
     }
   }
 
-  videoEditor: {
+  videoStudio: {
     enabled: boolean
   }
 
diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts
index 35656f14c..278a05e7a 100644
--- a/shared/models/users/user-notification-setting.model.ts
+++ b/shared/models/users/user-notification-setting.model.ts
@@ -28,5 +28,5 @@ export interface UserNotificationSetting {
   newPeerTubeVersion: UserNotificationSettingValue
   newPluginVersion: UserNotificationSettingValue
 
-  myVideoEditionFinished: UserNotificationSettingValue
+  myVideoStudioEditionFinished: UserNotificationSettingValue
 }
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index a2918194f..0fd7a7181 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -32,7 +32,7 @@ export const enum UserNotificationType {
   NEW_PLUGIN_VERSION = 17,
   NEW_PEERTUBE_VERSION = 18,
 
-  MY_VIDEO_EDITION_FINISHED = 19
+  MY_VIDEO_STUDIO_EDITION_FINISHED = 19
 }
 
 export interface VideoInfo {
diff --git a/shared/models/videos/editor/index.ts b/shared/models/videos/editor/index.ts
deleted file mode 100644
index 3436f2c3f..000000000
--- a/shared/models/videos/editor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-editor-create-edit.model'
diff --git a/shared/models/videos/editor/video-editor-create-edit.model.ts b/shared/models/videos/editor/video-editor-create-edit.model.ts
deleted file mode 100644
index 36b7c8d55..000000000
--- a/shared/models/videos/editor/video-editor-create-edit.model.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export interface VideoEditorCreateEdition {
-  tasks: VideoEditorTask[]
-}
-
-export type VideoEditorTask =
-  VideoEditorTaskCut |
-  VideoEditorTaskIntro |
-  VideoEditorTaskOutro |
-  VideoEditorTaskWatermark
-
-export interface VideoEditorTaskCut {
-  name: 'cut'
-
-  options: {
-    start?: number
-    end?: number
-  }
-}
-
-export interface VideoEditorTaskIntro {
-  name: 'add-intro'
-
-  options: {
-    file: Blob | string
-  }
-}
-
-export interface VideoEditorTaskOutro {
-  name: 'add-outro'
-
-  options: {
-    file: Blob | string
-  }
-}
-
-export interface VideoEditorTaskWatermark {
-  name: 'add-watermark'
-
-  options: {
-    file: Blob | string
-  }
-}
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index e8eb227ab..705e8d0ff 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -3,7 +3,7 @@ export * from './caption'
 export * from './change-ownership'
 export * from './channel'
 export * from './comment'
-export * from './editor'
+export * from './studio'
 export * from './live'
 export * from './file'
 export * from './import'
diff --git a/shared/models/videos/studio/index.ts b/shared/models/videos/studio/index.ts
new file mode 100644
index 000000000..a1eb98a49
--- /dev/null
+++ b/shared/models/videos/studio/index.ts
@@ -0,0 +1 @@
+export * from './video-studio-create-edit.model'
diff --git a/shared/models/videos/studio/video-studio-create-edit.model.ts b/shared/models/videos/studio/video-studio-create-edit.model.ts
new file mode 100644
index 000000000..001d65c90
--- /dev/null
+++ b/shared/models/videos/studio/video-studio-create-edit.model.ts
@@ -0,0 +1,42 @@
+export interface VideoStudioCreateEdition {
+  tasks: VideoStudioTask[]
+}
+
+export type VideoStudioTask =
+  VideoStudioTaskCut |
+  VideoStudioTaskIntro |
+  VideoStudioTaskOutro |
+  VideoStudioTaskWatermark
+
+export interface VideoStudioTaskCut {
+  name: 'cut'
+
+  options: {
+    start?: number
+    end?: number
+  }
+}
+
+export interface VideoStudioTaskIntro {
+  name: 'add-intro'
+
+  options: {
+    file: Blob | string
+  }
+}
+
+export interface VideoStudioTaskOutro {
+  name: 'add-outro'
+
+  options: {
+    file: Blob | string
+  }
+}
+
+export interface VideoStudioTaskWatermark {
+  name: 'add-watermark'
+
+  options: {
+    file: Blob | string
+  }
+}