diff options
Diffstat (limited to 'server/controllers/api')
-rw-r--r-- | server/controllers/api/users/my-notifications.ts | 3 | ||||
-rw-r--r-- | server/controllers/api/videos/upload.ts | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/server/controllers/api/users/my-notifications.ts b/server/controllers/api/users/my-notifications.ts index 58732158f..55184dc0f 100644 --- a/server/controllers/api/users/my-notifications.ts +++ b/server/controllers/api/users/my-notifications.ts | |||
@@ -82,7 +82,8 @@ async function updateNotificationSettings (req: express.Request, res: express.Re | |||
82 | abuseNewMessage: body.abuseNewMessage, | 82 | abuseNewMessage: body.abuseNewMessage, |
83 | abuseStateChange: body.abuseStateChange, | 83 | abuseStateChange: body.abuseStateChange, |
84 | newPeerTubeVersion: body.newPeerTubeVersion, | 84 | newPeerTubeVersion: body.newPeerTubeVersion, |
85 | newPluginVersion: body.newPluginVersion | 85 | newPluginVersion: body.newPluginVersion, |
86 | myVideoEditionFinished: body.myVideoEditionFinished | ||
86 | } | 87 | } |
87 | 88 | ||
88 | await UserNotificationSettingModel.update(values, query) | 89 | await UserNotificationSettingModel.update(values, query) |
diff --git a/server/controllers/api/videos/upload.ts b/server/controllers/api/videos/upload.ts index 14ae9d920..3afbedbb2 100644 --- a/server/controllers/api/videos/upload.ts +++ b/server/controllers/api/videos/upload.ts | |||
@@ -218,11 +218,11 @@ async function addVideo (options: { | |||
218 | if (!refreshedVideo) return | 218 | if (!refreshedVideo) return |
219 | 219 | ||
220 | if (refreshedVideo.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { | 220 | if (refreshedVideo.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { |
221 | return addMoveToObjectStorageJob(refreshedVideo) | 221 | return addMoveToObjectStorageJob({ video: refreshedVideo, previousVideoState: undefined }) |
222 | } | 222 | } |
223 | 223 | ||
224 | if (refreshedVideo.state === VideoState.TO_TRANSCODE) { | 224 | if (refreshedVideo.state === VideoState.TO_TRANSCODE) { |
225 | return addOptimizeOrMergeAudioJob(refreshedVideo, videoFile, user) | 225 | return addOptimizeOrMergeAudioJob({ video: refreshedVideo, videoFile, user }) |
226 | } | 226 | } |
227 | }).catch(err => logger.error('Cannot add optimize/merge audio job for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) })) | 227 | }).catch(err => logger.error('Cannot add optimize/merge audio job for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) })) |
228 | 228 | ||