9 files changed, 25 insertions, 25 deletions

diff --git a/client/src/app/shared/form-validators/index.ts b/client/src/app/shared/form-validators/index.ts
index c14272a2a..0b605719c 100644
--- a/client/src/app/shared/form-validators/index.ts
+++ b/client/src/app/shared/form-validators/index.ts
@@ -1,6 +1,6 @@
 export * from './form-validator.model'
 
-// Don't re export const variables because webpack 4 cannot do tree shaking with them
+// Don't re export const variables because webpack cannot do tree shaking with them
 // export * from './abuse-validators'
 // export * from './batch-domains-validators'
 // export * from './custom-config-validators'
diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 071c4dea7..83b932909 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -232,7 +232,7 @@ async function prepare () {
   }
 
   for (const caption of [ 'ar', 'fr', 'en', 'zh' ]) {
-    await server.captions.createVideoCaption({
+    await server.captions.add({
       language: caption,
       videoId: video.id,
       fixture: 'subtitle-good2.vtt'
diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts
index 5aaeb27fe..90f429314 100644
--- a/server/tests/api/check-params/video-captions.ts
+++ b/server/tests/api/check-params/video-captions.ts
@@ -151,7 +151,7 @@ describe('Test video captions API validator', function () {
     // })
 
     it('Should succeed with a valid captionfile extension and octet-stream mime type', async function () {
-      await server.captions.createVideoCaption({
+      await server.captions.add({
         language: 'zh',
         videoId: video.uuid,
         fixture: 'subtitle-good.srt',
diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts
index f834c7f36..965766742 100644
--- a/server/tests/api/search/search-videos.ts
+++ b/server/tests/api/search/search-videos.ts
@@ -50,14 +50,14 @@ describe('Test videos search', function () {
         const { id, uuid } = await server.videos.upload({ attributes: attributes3 })
         videoUUID = uuid
 
-        await server.captions.createVideoCaption({
+        await server.captions.add({
           language: 'en',
           videoId: id,
           fixture: 'subtitle-good2.vtt',
           mimeType: 'application/octet-stream'
         })
 
-        await server.captions.createVideoCaption({
+        await server.captions.add({
           language: 'aa',
           videoId: id,
           fixture: 'subtitle-good2.vtt',
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index a616edcff..832ba561a 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -416,7 +416,7 @@ describe('Test follows', function () {
         await servers[2].comments.delete({ videoId: video4.id, commentId: replyId })
       }
 
-      await servers[2].captions.createVideoCaption({
+      await servers[2].captions.add({
         language: 'ar',
         videoId: video4.id,
         fixture: 'subtitle-good2.vtt'
@@ -569,7 +569,7 @@ describe('Test follows', function () {
     })
 
     it('Should have propagated captions', async function () {
-      const body = await servers[0].captions.listVideoCaptions({ videoId: video4.id })
+      const body = await servers[0].captions.list({ videoId: video4.id })
       expect(body.total).to.equal(1)
       expect(body.data).to.have.lengthOf(1)
 
diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts
index e3d46e619..4c8e28adf 100644
--- a/server/tests/api/videos/video-captions.ts
+++ b/server/tests/api/videos/video-captions.ts
@@ -40,7 +40,7 @@ describe('Test video captions', function () {
 
   it('Should list the captions and return an empty list', async function () {
     for (const server of servers) {
-      const body = await server.captions.listVideoCaptions({ videoId: videoUUID })
+      const body = await server.captions.list({ videoId: videoUUID })
       expect(body.total).to.equal(0)
       expect(body.data).to.have.lengthOf(0)
     }
@@ -49,13 +49,13 @@ describe('Test video captions', function () {
   it('Should create two new captions', async function () {
     this.timeout(30000)
 
-    await servers[0].captions.createVideoCaption({
+    await servers[0].captions.add({
       language: 'ar',
       videoId: videoUUID,
       fixture: 'subtitle-good1.vtt'
     })
 
-    await servers[0].captions.createVideoCaption({
+    await servers[0].captions.add({
       language: 'zh',
       videoId: videoUUID,
       fixture: 'subtitle-good2.vtt',
@@ -67,7 +67,7 @@ describe('Test video captions', function () {
 
   it('Should list these uploaded captions', async function () {
     for (const server of servers) {
-      const body = await server.captions.listVideoCaptions({ videoId: videoUUID })
+      const body = await server.captions.list({ videoId: videoUUID })
       expect(body.total).to.equal(2)
       expect(body.data).to.have.lengthOf(2)
 
@@ -88,7 +88,7 @@ describe('Test video captions', function () {
   it('Should replace an existing caption', async function () {
     this.timeout(30000)
 
-    await servers[0].captions.createVideoCaption({
+    await servers[0].captions.add({
       language: 'ar',
       videoId: videoUUID,
       fixture: 'subtitle-good2.vtt'
@@ -99,7 +99,7 @@ describe('Test video captions', function () {
 
   it('Should have this caption updated', async function () {
     for (const server of servers) {
-      const body = await server.captions.listVideoCaptions({ videoId: videoUUID })
+      const body = await server.captions.list({ videoId: videoUUID })
       expect(body.total).to.equal(2)
       expect(body.data).to.have.lengthOf(2)
 
@@ -114,7 +114,7 @@ describe('Test video captions', function () {
   it('Should replace an existing caption with a srt file and convert it', async function () {
     this.timeout(30000)
 
-    await servers[0].captions.createVideoCaption({
+    await servers[0].captions.add({
       language: 'ar',
       videoId: videoUUID,
       fixture: 'subtitle-good.srt'
@@ -128,7 +128,7 @@ describe('Test video captions', function () {
 
   it('Should have this caption updated and converted', async function () {
     for (const server of servers) {
-      const body = await server.captions.listVideoCaptions({ videoId: videoUUID })
+      const body = await server.captions.list({ videoId: videoUUID })
       expect(body.total).to.equal(2)
       expect(body.data).to.have.lengthOf(2)
 
@@ -157,14 +157,14 @@ describe('Test video captions', function () {
   it('Should remove one caption', async function () {
     this.timeout(30000)
 
-    await servers[0].captions.deleteVideoCaption({ videoId: videoUUID, language: 'ar' })
+    await servers[0].captions.delete({ videoId: videoUUID, language: 'ar' })
 
     await waitJobs(servers)
   })
 
   it('Should only list the caption that was not deleted', async function () {
     for (const server of servers) {
-      const body = await server.captions.listVideoCaptions({ videoId: videoUUID })
+      const body = await server.captions.list({ videoId: videoUUID })
       expect(body.total).to.equal(1)
       expect(body.data).to.have.lengthOf(1)
 
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index 192f5232e..2eac130d2 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -59,7 +59,7 @@ describe('Test video imports', function () {
     expect(videoTorrent.name).to.contain('你好 世界 720p.mp4')
     expect(videoMagnet.name).to.contain('super peertube2 video')
 
-    const bodyCaptions = await server.captions.listVideoCaptions({ videoId: idHttp })
+    const bodyCaptions = await server.captions.list({ videoId: idHttp })
     expect(bodyCaptions.total).to.equal(2)
   }
 
@@ -76,7 +76,7 @@ describe('Test video imports', function () {
 
     expect(video.files).to.have.lengthOf(1)
 
-    const bodyCaptions = await server.captions.listVideoCaptions({ videoId: id })
+    const bodyCaptions = await server.captions.list({ videoId: id })
     expect(bodyCaptions.total).to.equal(2)
   }
 
@@ -120,7 +120,7 @@ describe('Test video imports', function () {
       await testImage(servers[0].url, 'video_import_thumbnail', video.thumbnailPath)
       await testImage(servers[0].url, 'video_import_preview', video.previewPath)
 
-      const bodyCaptions = await servers[0].captions.listVideoCaptions({ videoId: video.id })
+      const bodyCaptions = await servers[0].captions.list({ videoId: video.id })
       const videoCaptions = bodyCaptions.data
       expect(videoCaptions).to.have.lengthOf(2)
 
diff --git a/shared/extra-utils/videos/captions-command.ts b/shared/extra-utils/videos/captions-command.ts
index a0608e1a6..a65ea99e3 100644
--- a/shared/extra-utils/videos/captions-command.ts
+++ b/shared/extra-utils/videos/captions-command.ts
@@ -4,7 +4,7 @@ import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class CaptionsCommand extends AbstractCommand {
 
-  createVideoCaption (options: OverrideCommandOptions & {
+  add (options: OverrideCommandOptions & {
     videoId: string | number
     language: string
     fixture: string
@@ -32,7 +32,7 @@ export class CaptionsCommand extends AbstractCommand {
     })
   }
 
-  listVideoCaptions (options: OverrideCommandOptions & {
+  list (options: OverrideCommandOptions & {
     videoId: string | number
   }) {
     const { videoId } = options
@@ -47,7 +47,7 @@ export class CaptionsCommand extends AbstractCommand {
     })
   }
 
-  deleteVideoCaption (options: OverrideCommandOptions & {
+  delete (options: OverrideCommandOptions & {
     videoId: string | number
     language: string
   }) {
diff --git a/shared/extra-utils/videos/comments-command.ts b/shared/extra-utils/videos/comments-command.ts
index 5034c57ad..f0d163a07 100644
--- a/shared/extra-utils/videos/comments-command.ts
+++ b/shared/extra-utils/videos/comments-command.ts
@@ -84,7 +84,7 @@ export class CommentsCommand extends AbstractCommand {
       defaultExpectedStatus: HttpStatusCode.OK_200
     }))
 
-    this.lastThreadId = body.comment.id
+    this.lastThreadId = body.comment?.id
     this.lastVideoId = videoId
 
     return body.comment
@@ -107,7 +107,7 @@ export class CommentsCommand extends AbstractCommand {
       defaultExpectedStatus: HttpStatusCode.OK_200
     }))
 
-    this.lastReplyId = body.comment.id
+    this.lastReplyId = body.comment?.id
 
     return body.comment
   }