diff options
Diffstat (limited to 'shared')
-rw-r--r-- | shared/models/server/job.model.ts | 5 | ||||
-rw-r--r-- | shared/models/users/user-notification-setting.model.ts | 2 | ||||
-rw-r--r-- | shared/models/users/user-notification.model.ts | 4 | ||||
-rw-r--r-- | shared/server-commands/server/config-command.ts | 10 |
4 files changed, 20 insertions, 1 deletions
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index d81b72696..3b4855eaa 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | import { ContextType } from '../activitypub/context' | 1 | import { ContextType } from '../activitypub/context' |
2 | import { VideoState } from '../videos' | ||
2 | import { VideoEditorTaskCut } from '../videos/editor' | 3 | import { VideoEditorTaskCut } from '../videos/editor' |
3 | import { VideoResolution } from '../videos/file/video-resolution.enum' | 4 | import { VideoResolution } from '../videos/file/video-resolution.enum' |
4 | import { SendEmailOptions } from './emailer.model' | 5 | import { SendEmailOptions } from './emailer.model' |
@@ -116,6 +117,9 @@ export type ManageVideoTorrentPayload = | |||
116 | interface BaseTranscodingPayload { | 117 | interface BaseTranscodingPayload { |
117 | videoUUID: string | 118 | videoUUID: string |
118 | isNewVideo?: boolean | 119 | isNewVideo?: boolean |
120 | |||
121 | // Custom notification when the task is finished | ||
122 | notification?: 'default' | 'video-edition' | ||
119 | } | 123 | } |
120 | 124 | ||
121 | export interface HLSTranscodingPayload extends BaseTranscodingPayload { | 125 | export interface HLSTranscodingPayload extends BaseTranscodingPayload { |
@@ -171,6 +175,7 @@ export interface DeleteResumableUploadMetaFilePayload { | |||
171 | export interface MoveObjectStoragePayload { | 175 | export interface MoveObjectStoragePayload { |
172 | videoUUID: string | 176 | videoUUID: string |
173 | isNewVideo: boolean | 177 | isNewVideo: boolean |
178 | previousVideoState: VideoState | ||
174 | } | 179 | } |
175 | 180 | ||
176 | export type VideoEditorTaskCutPayload = VideoEditorTaskCut | 181 | export type VideoEditorTaskCutPayload = VideoEditorTaskCut |
diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts index 977e6b985..35656f14c 100644 --- a/shared/models/users/user-notification-setting.model.ts +++ b/shared/models/users/user-notification-setting.model.ts | |||
@@ -27,4 +27,6 @@ export interface UserNotificationSetting { | |||
27 | 27 | ||
28 | newPeerTubeVersion: UserNotificationSettingValue | 28 | newPeerTubeVersion: UserNotificationSettingValue |
29 | newPluginVersion: UserNotificationSettingValue | 29 | newPluginVersion: UserNotificationSettingValue |
30 | |||
31 | myVideoEditionFinished: UserNotificationSettingValue | ||
30 | } | 32 | } |
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index a2621fb5b..a2918194f 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts | |||
@@ -30,7 +30,9 @@ export const enum UserNotificationType { | |||
30 | ABUSE_NEW_MESSAGE = 16, | 30 | ABUSE_NEW_MESSAGE = 16, |
31 | 31 | ||
32 | NEW_PLUGIN_VERSION = 17, | 32 | NEW_PLUGIN_VERSION = 17, |
33 | NEW_PEERTUBE_VERSION = 18 | 33 | NEW_PEERTUBE_VERSION = 18, |
34 | |||
35 | MY_VIDEO_EDITION_FINISHED = 19 | ||
34 | } | 36 | } |
35 | 37 | ||
36 | export interface VideoInfo { | 38 | export interface VideoInfo { |
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts index 1dd6e1ea4..35a1eec7c 100644 --- a/shared/server-commands/server/config-command.ts +++ b/shared/server-commands/server/config-command.ts | |||
@@ -111,6 +111,16 @@ export class ConfigCommand extends AbstractCommand { | |||
111 | }) | 111 | }) |
112 | } | 112 | } |
113 | 113 | ||
114 | enableEditor () { | ||
115 | return this.updateExistingSubConfig({ | ||
116 | newConfig: { | ||
117 | videoEditor: { | ||
118 | enabled: true | ||
119 | } | ||
120 | } | ||
121 | }) | ||
122 | } | ||
123 | |||
114 | getConfig (options: OverrideCommandOptions = {}) { | 124 | getConfig (options: OverrideCommandOptions = {}) { |
115 | const path = '/api/v1/config' | 125 | const path = '/api/v1/config' |
116 | 126 | ||