4 files changed, 736 insertions, 274 deletions

diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts
index ba7c0833f..8964c0ab2 100644
--- a/server/tests/api/check-params/abuses.ts
+++ b/server/tests/api/check-params/abuses.ts
@@ -21,9 +21,7 @@ import {
   checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
 
-// FIXME: deprecated in 2.3. Remove this controller
-
-describe('Test video abuses API validators', function () {
+describe('Test abuses API validators', function () {
   const basePath = '/api/v1/abuses/'
 
   let server: ServerInfo
diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts
index 28c5a5531..f186f7ea0 100644
--- a/server/tests/api/moderation/abuses.ts
+++ b/server/tests/api/moderation/abuses.ts
@@ -2,21 +2,30 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { Abuse, AbusePredefinedReasonsString, AbuseState } from '@shared/models'
+import { Abuse, AbuseFilter, AbusePredefinedReasonsString, AbuseState, VideoComment, Account } from '@shared/models'
 import {
+  addVideoCommentThread,
   cleanupTests,
   createUser,
-  deleteVideoAbuse,
+  deleteAbuse,
+  deleteVideoComment,
   flushAndRunMultipleServers,
-  getVideoAbusesList,
+  getAbusesList,
+  getVideoCommentThreads,
+  getVideoIdFromUUID,
   getVideosList,
+  immutableAssign,
   removeVideo,
-  reportVideoAbuse,
+  reportAbuse,
   ServerInfo,
   setAccessTokensToServers,
-  updateVideoAbuse,
+  updateAbuse,
   uploadVideo,
-  userLogin
+  uploadVideoAndGetId,
+  userLogin,
+  getAccount,
+  removeUser,
+  generateUserAccessToken
 } from '../../../../shared/extra-utils/index'
 import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
@@ -31,6 +40,7 @@ const expect = chai.expect
 
 describe('Test abuses', function () {
   let servers: ServerInfo[] = []
+  let abuseServer1: Abuse
   let abuseServer2: Abuse
 
   before(async function () {
@@ -44,338 +54,721 @@ describe('Test abuses', function () {
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
+  })
 
-    // Upload some videos on each servers
-    const video1Attributes = {
-      name: 'my super name for server 1',
-      description: 'my super description for server 1'
-    }
-    await uploadVideo(servers[0].url, servers[0].accessToken, video1Attributes)
+  describe('Video abuses', function () {
 
-    const video2Attributes = {
-      name: 'my super name for server 2',
-      description: 'my super description for server 2'
-    }
-    await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes)
+    before(async function () {
+      this.timeout(50000)
 
-    // Wait videos propagation, server 2 has transcoding enabled
-    await waitJobs(servers)
+      // Upload some videos on each servers
+      const video1Attributes = {
+        name: 'my super name for server 1',
+        description: 'my super description for server 1'
+      }
+      await uploadVideo(servers[0].url, servers[0].accessToken, video1Attributes)
 
-    const res = await getVideosList(servers[0].url)
-    const videos = res.body.data
+      const video2Attributes = {
+        name: 'my super name for server 2',
+        description: 'my super description for server 2'
+      }
+      await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes)
 
-    expect(videos.length).to.equal(2)
+      // Wait videos propagation, server 2 has transcoding enabled
+      await waitJobs(servers)
 
-    servers[0].video = videos.find(video => video.name === 'my super name for server 1')
-    servers[1].video = videos.find(video => video.name === 'my super name for server 2')
-  })
+      const res = await getVideosList(servers[0].url)
+      const videos = res.body.data
 
-  it('Should not have video abuses', async function () {
-    const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+      expect(videos.length).to.equal(2)
 
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data.length).to.equal(0)
-  })
+      servers[0].video = videos.find(video => video.name === 'my super name for server 1')
+      servers[1].video = videos.find(video => video.name === 'my super name for server 2')
+    })
 
-  it('Should report abuse on a local video', async function () {
-    this.timeout(15000)
+    it('Should not have abuses', async function () {
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
 
-    const reason = 'my super bad reason'
-    await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[0].video.id, reason)
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
+    })
 
-    // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2
-    await waitJobs(servers)
-  })
+    it('Should report abuse on a local video', async function () {
+      this.timeout(15000)
 
-  it('Should have 1 video abuses on server 1 and 0 on server 2', async function () {
-    const res1 = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-
-    expect(res1.body.total).to.equal(1)
-    expect(res1.body.data).to.be.an('array')
-    expect(res1.body.data.length).to.equal(1)
-
-    const abuse: Abuse = res1.body.data[0]
-    expect(abuse.reason).to.equal('my super bad reason')
-    expect(abuse.reporterAccount.name).to.equal('root')
-    expect(abuse.reporterAccount.host).to.equal('localhost:' + servers[0].port)
-    expect(abuse.video.id).to.equal(servers[0].video.id)
-    expect(abuse.video.channel).to.exist
-    expect(abuse.count).to.equal(1)
-    expect(abuse.nth).to.equal(1)
-    expect(abuse.countReportsForReporter).to.equal(1)
-    expect(abuse.countReportsForReportee).to.equal(1)
-
-    const res2 = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res2.body.total).to.equal(0)
-    expect(res2.body.data).to.be.an('array')
-    expect(res2.body.data.length).to.equal(0)
-  })
+      const reason = 'my super bad reason'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: servers[0].video.id, reason })
 
-  it('Should report abuse on a remote video', async function () {
-    this.timeout(10000)
+      // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2
+      await waitJobs(servers)
+    })
 
-    const reason = 'my super bad reason 2'
-    await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[1].video.id, reason)
+    it('Should have 1 video abuses on server 1 and 0 on server 2', async function () {
+      const res1 = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
 
-    // We wait requests propagation
-    await waitJobs(servers)
-  })
+      expect(res1.body.total).to.equal(1)
+      expect(res1.body.data).to.be.an('array')
+      expect(res1.body.data.length).to.equal(1)
 
-  it('Should have 2 video abuses on server 1 and 1 on server 2', async function () {
-    const res1 = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-    expect(res1.body.total).to.equal(2)
-    expect(res1.body.data).to.be.an('array')
-    expect(res1.body.data.length).to.equal(2)
-
-    const abuse1: Abuse = res1.body.data[0]
-    expect(abuse1.reason).to.equal('my super bad reason')
-    expect(abuse1.reporterAccount.name).to.equal('root')
-    expect(abuse1.reporterAccount.host).to.equal('localhost:' + servers[0].port)
-    expect(abuse1.video.id).to.equal(servers[0].video.id)
-    expect(abuse1.state.id).to.equal(AbuseState.PENDING)
-    expect(abuse1.state.label).to.equal('Pending')
-    expect(abuse1.moderationComment).to.be.null
-    expect(abuse1.count).to.equal(1)
-    expect(abuse1.nth).to.equal(1)
-
-    const abuse2: Abuse = res1.body.data[1]
-    expect(abuse2.reason).to.equal('my super bad reason 2')
-    expect(abuse2.reporterAccount.name).to.equal('root')
-    expect(abuse2.reporterAccount.host).to.equal('localhost:' + servers[0].port)
-    expect(abuse2.video.id).to.equal(servers[1].video.id)
-    expect(abuse2.state.id).to.equal(AbuseState.PENDING)
-    expect(abuse2.state.label).to.equal('Pending')
-    expect(abuse2.moderationComment).to.be.null
-
-    const res2 = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res2.body.total).to.equal(1)
-    expect(res2.body.data).to.be.an('array')
-    expect(res2.body.data.length).to.equal(1)
-
-    abuseServer2 = res2.body.data[0]
-    expect(abuseServer2.reason).to.equal('my super bad reason 2')
-    expect(abuseServer2.reporterAccount.name).to.equal('root')
-    expect(abuseServer2.reporterAccount.host).to.equal('localhost:' + servers[0].port)
-    expect(abuseServer2.state.id).to.equal(AbuseState.PENDING)
-    expect(abuseServer2.state.label).to.equal('Pending')
-    expect(abuseServer2.moderationComment).to.be.null
-  })
+      const abuse: Abuse = res1.body.data[0]
+      expect(abuse.reason).to.equal('my super bad reason')
 
-  it('Should update the state of a video abuse', async function () {
-    const body = { state: AbuseState.REJECTED }
-    await updateVideoAbuse(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid, abuseServer2.id, body)
+      expect(abuse.reporterAccount.name).to.equal('root')
+      expect(abuse.reporterAccount.host).to.equal(servers[0].host)
 
-    const res = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res.body.data[0].state.id).to.equal(AbuseState.REJECTED)
-  })
+      expect(abuse.video.id).to.equal(servers[0].video.id)
+      expect(abuse.video.channel).to.exist
 
-  it('Should add a moderation comment', async function () {
-    const body = { state: AbuseState.ACCEPTED, moderationComment: 'It is valid' }
-    await updateVideoAbuse(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid, abuseServer2.id, body)
+      expect(abuse.comment).to.be.null
 
-    const res = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res.body.data[0].state.id).to.equal(AbuseState.ACCEPTED)
-    expect(res.body.data[0].moderationComment).to.equal('It is valid')
-  })
+      expect(abuse.flaggedAccount.name).to.equal('root')
+      expect(abuse.flaggedAccount.host).to.equal(servers[0].host)
+
+      expect(abuse.video.countReports).to.equal(1)
+      expect(abuse.video.nthReport).to.equal(1)
+
+      expect(abuse.countReportsForReporter).to.equal(1)
+      expect(abuse.countReportsForReportee).to.equal(1)
 
-  it('Should hide video abuses from blocked accounts', async function () {
-    this.timeout(10000)
+      const res2 = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken })
+      expect(res2.body.total).to.equal(0)
+      expect(res2.body.data).to.be.an('array')
+      expect(res2.body.data.length).to.equal(0)
+    })
 
-    {
-      await reportVideoAbuse(servers[1].url, servers[1].accessToken, servers[0].video.uuid, 'will mute this')
+    it('Should report abuse on a remote video', async function () {
+      this.timeout(10000)
+
+      const reason = 'my super bad reason 2'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: servers[1].video.id, reason })
+
+      // We wait requests propagation
       await waitJobs(servers)
+    })
 
-      const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-      expect(res.body.total).to.equal(3)
-    }
+    it('Should have 2 video abuses on server 1 and 1 on server 2', async function () {
+      const res1 = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
 
-    const accountToBlock = 'root@localhost:' + servers[1].port
+      expect(res1.body.total).to.equal(2)
+      expect(res1.body.data.length).to.equal(2)
 
-    {
-      await addAccountToServerBlocklist(servers[0].url, servers[0].accessToken, accountToBlock)
+      const abuse1: Abuse = res1.body.data[0]
+      expect(abuse1.reason).to.equal('my super bad reason')
+      expect(abuse1.reporterAccount.name).to.equal('root')
+      expect(abuse1.reporterAccount.host).to.equal(servers[0].host)
 
-      const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-      expect(res.body.total).to.equal(2)
+      expect(abuse1.video.id).to.equal(servers[0].video.id)
+      expect(abuse1.video.countReports).to.equal(1)
+      expect(abuse1.video.nthReport).to.equal(1)
 
-      const abuse = res.body.data.find(a => a.reason === 'will mute this')
-      expect(abuse).to.be.undefined
-    }
+      expect(abuse1.comment).to.be.null
 
-    {
-      await removeAccountFromServerBlocklist(servers[0].url, servers[0].accessToken, accountToBlock)
+      expect(abuse1.flaggedAccount.name).to.equal('root')
+      expect(abuse1.flaggedAccount.host).to.equal(servers[0].host)
 
-      const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-      expect(res.body.total).to.equal(3)
-    }
-  })
+      expect(abuse1.state.id).to.equal(AbuseState.PENDING)
+      expect(abuse1.state.label).to.equal('Pending')
+      expect(abuse1.moderationComment).to.be.null
 
-  it('Should hide video abuses from blocked servers', async function () {
-    const serverToBlock = servers[1].host
+      const abuse2: Abuse = res1.body.data[1]
+      expect(abuse2.reason).to.equal('my super bad reason 2')
 
-    {
-      await addServerToServerBlocklist(servers[0].url, servers[0].accessToken, servers[1].host)
+      expect(abuse2.reporterAccount.name).to.equal('root')
+      expect(abuse2.reporterAccount.host).to.equal(servers[0].host)
 
-      const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-      expect(res.body.total).to.equal(2)
+      expect(abuse2.video.id).to.equal(servers[1].video.id)
 
-      const abuse = res.body.data.find(a => a.reason === 'will mute this')
-      expect(abuse).to.be.undefined
-    }
+      expect(abuse2.comment).to.be.null
 
-    {
-      await removeServerFromServerBlocklist(servers[0].url, servers[0].accessToken, serverToBlock)
+      expect(abuse2.flaggedAccount.name).to.equal('root')
+      expect(abuse2.flaggedAccount.host).to.equal(servers[1].host)
 
-      const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-      expect(res.body.total).to.equal(3)
-    }
-  })
+      expect(abuse2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuse2.state.label).to.equal('Pending')
+      expect(abuse2.moderationComment).to.be.null
 
-  it('Should keep the video abuse when deleting the video', async function () {
-    this.timeout(10000)
+      const res2 = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken })
+      expect(res2.body.total).to.equal(1)
+      expect(res2.body.data.length).to.equal(1)
 
-    await removeVideo(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid)
+      abuseServer2 = res2.body.data[0]
+      expect(abuseServer2.reason).to.equal('my super bad reason 2')
+      expect(abuseServer2.reporterAccount.name).to.equal('root')
+      expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host)
 
-    await waitJobs(servers)
+      expect(abuse2.flaggedAccount.name).to.equal('root')
+      expect(abuse2.flaggedAccount.host).to.equal(servers[1].host)
 
-    const res = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res.body.total).to.equal(2, "wrong number of videos returned")
-    expect(res.body.data.length).to.equal(2, "wrong number of videos returned")
-    expect(res.body.data[0].id).to.equal(abuseServer2.id, "wrong origin server id for first video")
+      expect(abuseServer2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuseServer2.state.label).to.equal('Pending')
+      expect(abuseServer2.moderationComment).to.be.null
+    })
 
-    const abuse: Abuse = res.body.data[0]
-    expect(abuse.video.id).to.equal(abuseServer2.video.id, "wrong video id")
-    expect(abuse.video.channel).to.exist
-    expect(abuse.video.deleted).to.be.true
-  })
+    it('Should hide video abuses from blocked accounts', async function () {
+      this.timeout(10000)
 
-  it('Should include counts of reports from reporter and reportee', async function () {
-    this.timeout(10000)
+      {
+        const videoId = await getVideoIdFromUUID(servers[1].url, servers[0].video.uuid)
+        await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, videoId, reason: 'will mute this' })
+        await waitJobs(servers)
 
-    // register a second user to have two reporters/reportees
-    const user = { username: 'user2', password: 'password' }
-    await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, ...user })
-    const userAccessToken = await userLogin(servers[0], user)
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(3)
+      }
 
-    // upload a third video via this user
-    const video3Attributes = {
-      name: 'my second super name for server 1',
-      description: 'my second super description for server 1'
-    }
-    await uploadVideo(servers[0].url, userAccessToken, video3Attributes)
-
-    const res1 = await getVideosList(servers[0].url)
-    const videos = res1.body.data
-    const video3 = videos.find(video => video.name === 'my second super name for server 1')
-
-    // resume with the test
-    const reason3 = 'my super bad reason 3'
-    await reportVideoAbuse(servers[0].url, servers[0].accessToken, video3.id, reason3)
-    const reason4 = 'my super bad reason 4'
-    await reportVideoAbuse(servers[0].url, userAccessToken, servers[0].video.id, reason4)
-
-    const res2 = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-
-    {
-      for (const abuse of res2.body.data as Abuse[]) {
-        if (abuse.video.id === video3.id) {
-          expect(abuse.count).to.equal(1, "wrong reports count for video 3")
-          expect(abuse.nth).to.equal(1, "wrong report position in report list for video 3")
-          expect(abuse.countReportsForReportee).to.equal(1, "wrong reports count for reporter on video 3 abuse")
-          expect(abuse.countReportsForReporter).to.equal(3, "wrong reports count for reportee on video 3 abuse")
-        }
-        if (abuse.video.id === servers[0].video.id) {
-          expect(abuse.countReportsForReportee).to.equal(3, "wrong reports count for reporter on video 1 abuse")
+      const accountToBlock = 'root@' + servers[1].host
+
+      {
+        await addAccountToServerBlocklist(servers[0].url, servers[0].accessToken, accountToBlock)
+
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(2)
+
+        const abuse = res.body.data.find(a => a.reason === 'will mute this')
+        expect(abuse).to.be.undefined
+      }
+
+      {
+        await removeAccountFromServerBlocklist(servers[0].url, servers[0].accessToken, accountToBlock)
+
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(3)
+      }
+    })
+
+    it('Should hide video abuses from blocked servers', async function () {
+      const serverToBlock = servers[1].host
+
+      {
+        await addServerToServerBlocklist(servers[0].url, servers[0].accessToken, servers[1].host)
+
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(2)
+
+        const abuse = res.body.data.find(a => a.reason === 'will mute this')
+        expect(abuse).to.be.undefined
+      }
+
+      {
+        await removeServerFromServerBlocklist(servers[0].url, servers[0].accessToken, serverToBlock)
+
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(3)
+      }
+    })
+
+    it('Should keep the video abuse when deleting the video', async function () {
+      this.timeout(10000)
+
+      await removeVideo(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid)
+
+      await waitJobs(servers)
+
+      const res = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken })
+      expect(res.body.total).to.equal(2, "wrong number of videos returned")
+      expect(res.body.data).to.have.lengthOf(2, "wrong number of videos returned")
+
+      const abuse: Abuse = res.body.data[0]
+      expect(abuse.id).to.equal(abuseServer2.id, "wrong origin server id for first video")
+      expect(abuse.video.id).to.equal(abuseServer2.video.id, "wrong video id")
+      expect(abuse.video.channel).to.exist
+      expect(abuse.video.deleted).to.be.true
+    })
+
+    it('Should include counts of reports from reporter and reportee', async function () {
+      this.timeout(10000)
+
+      // register a second user to have two reporters/reportees
+      const user = { username: 'user2', password: 'password' }
+      await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, ...user })
+      const userAccessToken = await userLogin(servers[0], user)
+
+      // upload a third video via this user
+      const video3Attributes = {
+        name: 'my second super name for server 1',
+        description: 'my second super description for server 1'
+      }
+      await uploadVideo(servers[0].url, userAccessToken, video3Attributes)
+
+      const res1 = await getVideosList(servers[0].url)
+      const videos = res1.body.data
+      const video3 = videos.find(video => video.name === 'my second super name for server 1')
+
+      // resume with the test
+      const reason3 = 'my super bad reason 3'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: video3.id, reason: reason3 })
+
+      const reason4 = 'my super bad reason 4'
+      await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: servers[0].video.id, reason: reason4 })
+
+      {
+        const res2 = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        const abuses = res2.body.data as Abuse[]
+
+        const abuseVideo3 = res2.body.data.find(a => a.video.id === video3.id)
+        expect(abuseVideo3).to.not.be.undefined
+        expect(abuseVideo3.video.countReports).to.equal(1, "wrong reports count for video 3")
+        expect(abuseVideo3.video.nthReport).to.equal(1, "wrong report position in report list for video 3")
+        expect(abuseVideo3.countReportsForReportee).to.equal(1, "wrong reports count for reporter on video 3 abuse")
+        expect(abuseVideo3.countReportsForReporter).to.equal(3, "wrong reports count for reportee on video 3 abuse")
+
+        const abuseServer1 = abuses.find(a => a.video.id === servers[0].video.id)
+        expect(abuseServer1.countReportsForReportee).to.equal(3, "wrong reports count for reporter on video 1 abuse")
+      }
+    })
+
+    it('Should list predefined reasons as well as timestamps for the reported video', async function () {
+      this.timeout(10000)
+
+      const reason5 = 'my super bad reason 5'
+      const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ]
+      const createdAbuse = (await reportAbuse({
+        url: servers[0].url,
+        token: servers[0].accessToken,
+        videoId: servers[0].video.id,
+        reason: reason5,
+        predefinedReasons: predefinedReasons5,
+        startAt: 1,
+        endAt: 5
+      })).body.abuse
+
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+
+      {
+        const abuse = (res.body.data as Abuse[]).find(a => a.id === createdAbuse.id)
+        expect(abuse.reason).to.equals(reason5)
+        expect(abuse.predefinedReasons).to.deep.equals(predefinedReasons5, "predefined reasons do not match the one reported")
+        expect(abuse.video.startAt).to.equal(1, "starting timestamp doesn't match the one reported")
+        expect(abuse.video.endAt).to.equal(5, "ending timestamp doesn't match the one reported")
+      }
+    })
+
+    it('Should delete the video abuse', async function () {
+      this.timeout(10000)
+
+      await deleteAbuse(servers[1].url, servers[1].accessToken, abuseServer2.id)
+
+      await waitJobs(servers)
+
+      {
+        const res = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken })
+        expect(res.body.total).to.equal(1)
+        expect(res.body.data.length).to.equal(1)
+        expect(res.body.data[0].id).to.not.equal(abuseServer2.id)
+      }
+
+      {
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(6)
+      }
+    })
+
+    it('Should list and filter video abuses', async function () {
+      this.timeout(10000)
+
+      async function list (query: Omit<Parameters<typeof getAbusesList>[0], 'url' | 'token'>) {
+        const options = {
+          url: servers[0].url,
+          token: servers[0].accessToken
         }
+
+        Object.assign(options, query)
+
+        const res = await getAbusesList(options)
+
+        return res.body.data as Abuse[]
       }
-    }
-  })
 
-  it('Should list predefined reasons as well as timestamps for the reported video', async function () {
-    this.timeout(10000)
-
-    const reason5 = 'my super bad reason 5'
-    const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ]
-    const createdAbuse = (await reportVideoAbuse(
-      servers[0].url,
-      servers[0].accessToken,
-      servers[0].video.id,
-      reason5,
-      predefinedReasons5,
-      1,
-      5
-    )).body.abuse
-
-    const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-
-    {
-      const abuse = (res.body.data as Abuse[]).find(a => a.id === createdAbuse.id)
-      expect(abuse.reason).to.equals(reason5)
-      expect(abuse.predefinedReasons).to.deep.equals(predefinedReasons5, "predefined reasons do not match the one reported")
-      expect(abuse.video.startAt).to.equal(1, "starting timestamp doesn't match the one reported")
-      expect(abuse.video.endAt).to.equal(5, "ending timestamp doesn't match the one reported")
-    }
+      expect(await list({ id: 56 })).to.have.lengthOf(0)
+      expect(await list({ id: 1 })).to.have.lengthOf(1)
+
+      expect(await list({ search: 'my super name for server 1' })).to.have.lengthOf(4)
+      expect(await list({ search: 'aaaaaaaaaaaaaaaaaaaaaaaaaa' })).to.have.lengthOf(0)
+
+      expect(await list({ searchVideo: 'my second super name for server 1' })).to.have.lengthOf(1)
+
+      expect(await list({ searchVideoChannel: 'root' })).to.have.lengthOf(4)
+      expect(await list({ searchVideoChannel: 'aaaa' })).to.have.lengthOf(0)
+
+      expect(await list({ searchReporter: 'user2' })).to.have.lengthOf(1)
+      expect(await list({ searchReporter: 'root' })).to.have.lengthOf(5)
+
+      expect(await list({ searchReportee: 'root' })).to.have.lengthOf(5)
+      expect(await list({ searchReportee: 'aaaa' })).to.have.lengthOf(0)
+
+      expect(await list({ videoIs: 'deleted' })).to.have.lengthOf(1)
+      expect(await list({ videoIs: 'blacklisted' })).to.have.lengthOf(0)
+
+      expect(await list({ state: AbuseState.ACCEPTED })).to.have.lengthOf(0)
+      expect(await list({ state: AbuseState.PENDING })).to.have.lengthOf(6)
+
+      expect(await list({ predefinedReason: 'violentOrRepulsive' })).to.have.lengthOf(1)
+      expect(await list({ predefinedReason: 'serverRules' })).to.have.lengthOf(0)
+    })
   })
 
-  it('Should delete the video abuse', async function () {
-    this.timeout(10000)
+  describe('Comment abuses', function () {
 
-    await deleteVideoAbuse(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid, abuseServer2.id)
+    async function getComment (url: string, videoIdArg: number | string) {
+      const videoId = typeof videoIdArg === 'string'
+        ? await getVideoIdFromUUID(url, videoIdArg)
+        : videoIdArg
 
-    await waitJobs(servers)
+      const res = await getVideoCommentThreads(url, videoId, 0, 5)
 
-    {
-      const res = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-      expect(res.body.total).to.equal(1)
-      expect(res.body.data.length).to.equal(1)
-      expect(res.body.data[0].id).to.not.equal(abuseServer2.id)
+      return res.body.data[0] as VideoComment
     }
 
-    {
-      const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
-      expect(res.body.total).to.equal(6)
-    }
-  })
+    before(async function () {
+      this.timeout(50000)
 
-  it('Should list and filter video abuses', async function () {
-    async function list (query: Omit<Parameters<typeof getVideoAbusesList>[0], 'url' | 'token'>) {
-      const options = {
-        url: servers[0].url,
-        token: servers[0].accessToken
+      servers[0].video = await uploadVideoAndGetId({ server: servers[0], videoName: 'server 1' })
+      servers[1].video = await uploadVideoAndGetId({ server: servers[1], videoName: 'server 2' })
+
+      await addVideoCommentThread(servers[0].url, servers[0].accessToken, servers[0].video.id, 'comment server 1')
+      await addVideoCommentThread(servers[1].url, servers[1].accessToken, servers[1].video.id, 'comment server 2')
+
+      await waitJobs(servers)
+    })
+
+    it('Should report abuse on a comment', async function () {
+      this.timeout(15000)
+
+      const comment = await getComment(servers[0].url, servers[0].video.id)
+
+      const reason = 'it is a bad comment'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason })
+
+      await waitJobs(servers)
+    })
+
+    it('Should have 1 comment abuse on server 1 and 0 on server 2', async function () {
+      {
+        const comment = await getComment(servers[0].url, servers[0].video.id)
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' })
+
+        expect(res.body.total).to.equal(1)
+        expect(res.body.data).to.have.lengthOf(1)
+
+        const abuse: Abuse = res.body.data[0]
+        expect(abuse.reason).to.equal('it is a bad comment')
+
+        expect(abuse.reporterAccount.name).to.equal('root')
+        expect(abuse.reporterAccount.host).to.equal(servers[0].host)
+
+        expect(abuse.video).to.be.null
+
+        expect(abuse.comment.deleted).to.be.false
+        expect(abuse.comment.id).to.equal(comment.id)
+        expect(abuse.comment.text).to.equal(comment.text)
+        expect(abuse.comment.video.name).to.equal('server 1')
+        expect(abuse.comment.video.id).to.equal(servers[0].video.id)
+        expect(abuse.comment.video.uuid).to.equal(servers[0].video.uuid)
+
+        expect(abuse.countReportsForReporter).to.equal(5)
+        expect(abuse.countReportsForReportee).to.equal(5)
+      }
+
+      {
+        const res = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' })
+        expect(res.body.total).to.equal(0)
+        expect(res.body.data.length).to.equal(0)
+      }
+    })
+
+    it('Should report abuse on a remote comment', async function () {
+      this.timeout(10000)
+
+      const comment = await getComment(servers[0].url, servers[1].video.uuid)
+
+      const reason = 'it is a really bad comment'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason })
+
+      await waitJobs(servers)
+    })
+
+    it('Should have 2 comment abuses on server 1 and 1 on server 2', async function () {
+      const commentServer2 = await getComment(servers[0].url, servers[1].video.id)
+
+      const res1 = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' })
+      expect(res1.body.total).to.equal(2)
+      expect(res1.body.data.length).to.equal(2)
+
+      const abuse: Abuse = res1.body.data[0]
+      expect(abuse.reason).to.equal('it is a bad comment')
+      expect(abuse.countReportsForReporter).to.equal(6)
+      expect(abuse.countReportsForReportee).to.equal(5)
+
+      const abuse2: Abuse = res1.body.data[1]
+
+      expect(abuse2.reason).to.equal('it is a really bad comment')
+
+      expect(abuse2.reporterAccount.name).to.equal('root')
+      expect(abuse2.reporterAccount.host).to.equal(servers[0].host)
+
+      expect(abuse2.video).to.be.null
+
+      expect(abuse2.comment.deleted).to.be.false
+      expect(abuse2.comment.id).to.equal(commentServer2.id)
+      expect(abuse2.comment.text).to.equal(commentServer2.text)
+      expect(abuse2.comment.video.name).to.equal('server 2')
+      expect(abuse2.comment.video.uuid).to.equal(servers[1].video.uuid)
+
+      expect(abuse2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuse2.state.label).to.equal('Pending')
+
+      expect(abuse2.moderationComment).to.be.null
+
+      expect(abuse2.countReportsForReporter).to.equal(6)
+      expect(abuse2.countReportsForReportee).to.equal(2)
+
+      const res2 = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' })
+      expect(res2.body.total).to.equal(1)
+      expect(res2.body.data.length).to.equal(1)
+
+      abuseServer2 = res2.body.data[0]
+      expect(abuseServer2.reason).to.equal('it is a really bad comment')
+      expect(abuseServer2.reporterAccount.name).to.equal('root')
+      expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host)
+
+      expect(abuseServer2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuseServer2.state.label).to.equal('Pending')
+
+      expect(abuseServer2.moderationComment).to.be.null
+
+      expect(abuseServer2.countReportsForReporter).to.equal(1)
+      expect(abuseServer2.countReportsForReportee).to.equal(1)
+    })
+
+    it('Should keep the comment abuse when deleting the comment', async function () {
+      this.timeout(10000)
+
+      const commentServer2 = await getComment(servers[0].url, servers[1].video.id)
+
+      await deleteVideoComment(servers[0].url, servers[0].accessToken, servers[1].video.uuid, commentServer2.id)
+
+      await waitJobs(servers)
+
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' })
+      expect(res.body.total).to.equal(2)
+      expect(res.body.data).to.have.lengthOf(2)
+
+      const abuse = (res.body.data as Abuse[]).find(a => a.comment?.id === commentServer2.id)
+      expect(abuse).to.not.be.undefined
+
+      expect(abuse.comment.text).to.be.empty
+      expect(abuse.comment.video.name).to.equal('server 2')
+      expect(abuse.comment.deleted).to.be.true
+    })
+
+    it('Should delete the comment abuse', async function () {
+      this.timeout(10000)
+
+      await deleteAbuse(servers[1].url, servers[1].accessToken, abuseServer2.id)
+
+      await waitJobs(servers)
+
+      {
+        const res = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' })
+        expect(res.body.total).to.equal(0)
+        expect(res.body.data.length).to.equal(0)
+      }
+
+      {
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' })
+        expect(res.body.total).to.equal(2)
+      }
+    })
+
+    it('Should list and filter video abuses', async function () {
+      {
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment', searchReportee: 'foo' })
+        expect(res.body.total).to.equal(0)
+      }
+
+      {
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment', searchReportee: 'ot' })
+        expect(res.body.total).to.equal(2)
+      }
+
+      {
+        const baseParams = { url: servers[0].url, token: servers[0].accessToken, filter: 'comment' as AbuseFilter, start: 1, count: 1 }
+
+        const res1 = await getAbusesList(immutableAssign(baseParams, { sort: 'createdAt' }))
+        expect(res1.body.data).to.have.lengthOf(1)
+        expect(res1.body.data[0].comment.text).to.be.empty
+
+        const res2 = await getAbusesList(immutableAssign(baseParams, { sort: '-createdAt' }))
+        expect(res2.body.data).to.have.lengthOf(1)
+        expect(res2.body.data[0].comment.text).to.equal('comment server 1')
       }
+    })
+  })
 
-      Object.assign(options, query)
+  describe('Account abuses', function () {
 
-      const res = await getVideoAbusesList(options)
+    async function getAccountFromServer (url: string, name: string, server: ServerInfo) {
+      const res = await getAccount(url, name + '@' + server.host)
 
-      return res.body.data as Abuse[]
+      return res.body as Account
     }
 
-    expect(await list({ id: 56 })).to.have.lengthOf(0)
-    expect(await list({ id: 1 })).to.have.lengthOf(1)
+    before(async function () {
+      this.timeout(50000)
+
+      await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: 'user_1', password: 'donald' })
+
+      const token = await generateUserAccessToken(servers[1], 'user_2')
+      await uploadVideo(servers[1].url, token, { name: 'super video' })
+
+      await waitJobs(servers)
+    })
+
+    it('Should report abuse on an account', async function () {
+      this.timeout(15000)
+
+      const account = await getAccountFromServer(servers[0].url, 'user_1', servers[0])
+
+      const reason = 'it is a bad account'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId: account.id, reason })
+
+      await waitJobs(servers)
+    })
+
+    it('Should have 1 account abuse on server 1 and 0 on server 2', async function () {
+      {
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' })
+
+        expect(res.body.total).to.equal(1)
+        expect(res.body.data).to.have.lengthOf(1)
+
+        const abuse: Abuse = res.body.data[0]
+        expect(abuse.reason).to.equal('it is a bad account')
+
+        expect(abuse.reporterAccount.name).to.equal('root')
+        expect(abuse.reporterAccount.host).to.equal(servers[0].host)
+
+        expect(abuse.video).to.be.null
+        expect(abuse.comment).to.be.null
+
+        expect(abuse.flaggedAccount.name).to.equal('user_1')
+        expect(abuse.flaggedAccount.host).to.equal(servers[0].host)
+      }
+
+      {
+        const res = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' })
+        expect(res.body.total).to.equal(0)
+        expect(res.body.data.length).to.equal(0)
+      }
+    })
+
+    it('Should report abuse on a remote account', async function () {
+      this.timeout(10000)
+
+      const account = await getAccountFromServer(servers[0].url, 'user_2', servers[1])
+
+      const reason = 'it is a really bad account'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId: account.id, reason })
+
+      await waitJobs(servers)
+    })
+
+    it('Should have 2 comment abuses on server 1 and 1 on server 2', async function () {
+      const res1 = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' })
+      expect(res1.body.total).to.equal(2)
+      expect(res1.body.data.length).to.equal(2)
+
+      const abuse: Abuse = res1.body.data[0]
+      expect(abuse.reason).to.equal('it is a bad account')
 
-    expect(await list({ search: 'my super name for server 1' })).to.have.lengthOf(4)
-    expect(await list({ search: 'aaaaaaaaaaaaaaaaaaaaaaaaaa' })).to.have.lengthOf(0)
+      const abuse2: Abuse = res1.body.data[1]
+      expect(abuse2.reason).to.equal('it is a really bad account')
 
-    expect(await list({ searchVideo: 'my second super name for server 1' })).to.have.lengthOf(1)
+      expect(abuse2.reporterAccount.name).to.equal('root')
+      expect(abuse2.reporterAccount.host).to.equal(servers[0].host)
 
-    expect(await list({ searchVideoChannel: 'root' })).to.have.lengthOf(4)
-    expect(await list({ searchVideoChannel: 'aaaa' })).to.have.lengthOf(0)
+      expect(abuse2.video).to.be.null
+      expect(abuse2.comment).to.be.null
+
+      expect(abuse2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuse2.state.label).to.equal('Pending')
+
+      expect(abuse2.moderationComment).to.be.null
+
+      const res2 = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'account' })
+      expect(res2.body.total).to.equal(1)
+      expect(res2.body.data.length).to.equal(1)
+
+      abuseServer2 = res2.body.data[0]
+
+      expect(abuseServer2.reason).to.equal('it is a really bad account')
+
+      expect(abuseServer2.reporterAccount.name).to.equal('root')
+      expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host)
+
+      expect(abuseServer2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuseServer2.state.label).to.equal('Pending')
+
+      expect(abuseServer2.moderationComment).to.be.null
+    })
+
+    it('Should keep the account abuse when deleting the account', async function () {
+      this.timeout(10000)
+
+      const account = await getAccountFromServer(servers[1].url, 'user_2', servers[1])
+      await removeUser(servers[1].url, account.userId, servers[1].accessToken)
+
+      await waitJobs(servers)
+
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' })
+      expect(res.body.total).to.equal(2)
+      expect(res.body.data).to.have.lengthOf(2)
+
+      const abuse = (res.body.data as Abuse[]).find(a => a.reason === 'it is a really bad account')
+      expect(abuse).to.not.be.undefined
+    })
+
+    it('Should delete the account abuse', async function () {
+      this.timeout(10000)
+
+      await deleteAbuse(servers[1].url, servers[1].accessToken, abuseServer2.id)
+
+      await waitJobs(servers)
+
+      {
+        const res = await getAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'account' })
+        expect(res.body.total).to.equal(0)
+        expect(res.body.data.length).to.equal(0)
+      }
+
+      {
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' })
+        expect(res.body.total).to.equal(2)
+
+        abuseServer1 = res.body.data[0]
+      }
+    })
+  })
 
-    expect(await list({ searchReporter: 'user2' })).to.have.lengthOf(1)
-    expect(await list({ searchReporter: 'root' })).to.have.lengthOf(5)
+  describe('Common actions on abuses', function () {
 
-    expect(await list({ searchReportee: 'root' })).to.have.lengthOf(5)
-    expect(await list({ searchReportee: 'aaaa' })).to.have.lengthOf(0)
+    it('Should update the state of an abuse', async function () {
+      const body = { state: AbuseState.REJECTED }
+      await updateAbuse(servers[0].url, servers[0].accessToken, abuseServer1.id, body)
 
-    expect(await list({ videoIs: 'deleted' })).to.have.lengthOf(1)
-    expect(await list({ videoIs: 'blacklisted' })).to.have.lengthOf(0)
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, id: abuseServer1.id })
+      expect(res.body.data[0].state.id).to.equal(AbuseState.REJECTED)
+    })
 
-    expect(await list({ state: AbuseState.ACCEPTED })).to.have.lengthOf(0)
-    expect(await list({ state: AbuseState.PENDING })).to.have.lengthOf(6)
+    it('Should add a moderation comment', async function () {
+      const body = { state: AbuseState.ACCEPTED, moderationComment: 'It is valid' }
+      await updateAbuse(servers[0].url, servers[0].accessToken, abuseServer1.id, body)
 
-    expect(await list({ predefinedReason: 'violentOrRepulsive' })).to.have.lengthOf(1)
-    expect(await list({ predefinedReason: 'serverRules' })).to.have.lengthOf(0)
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken, id: abuseServer1.id })
+      expect(res.body.data[0].state.id).to.equal(AbuseState.ACCEPTED)
+      expect(res.body.data[0].moderationComment).to.equal('It is valid')
+    })
   })
 
   after(async function () {
diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts
index a27681603..a8517600a 100644
--- a/server/tests/api/notifications/moderation-notifications.ts
+++ b/server/tests/api/notifications/moderation-notifications.ts
@@ -3,10 +3,16 @@
 import 'mocha'
 import { v4 as uuidv4 } from 'uuid'
 import {
+  addVideoCommentThread,
   addVideoToBlacklist,
   cleanupTests,
+  createUser,
   follow,
+  generateUserAccessToken,
+  getAccount,
   getCustomConfig,
+  getVideoCommentThreads,
+  getVideoIdFromUUID,
   immutableAssign,
   MockInstancesIndex,
   registerUser,
@@ -23,7 +29,9 @@ import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import {
   checkAutoInstanceFollowing,
   CheckerBaseParams,
+  checkNewAccountAbuseForModerators,
   checkNewBlacklistOnMyVideo,
+  checkNewCommentAbuseForModerators,
   checkNewInstanceFollower,
   checkNewVideoAbuseForModerators,
   checkNewVideoFromSubscription,
@@ -91,11 +99,74 @@ describe('Test moderation notifications', function () {
 
       await waitJobs(servers)
 
-      await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, videoId: video.id, reason: 'super reason' })
+      const videoId = await getVideoIdFromUUID(servers[1].url, video.uuid)
+      await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, videoId, reason: 'super reason' })
 
       await waitJobs(servers)
       await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence')
     })
+
+    it('Should send a notification to moderators on local comment abuse', async function () {
+      this.timeout(10000)
+
+      const name = 'video for abuse ' + uuidv4()
+      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
+      const video = resVideo.body.video
+      const resComment = await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4())
+      const comment = resComment.body.comment
+
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason: 'super reason' })
+
+      await waitJobs(servers)
+      await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence')
+    })
+
+    it('Should send a notification to moderators on remote comment abuse', async function () {
+      this.timeout(10000)
+
+      const name = 'video for abuse ' + uuidv4()
+      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
+      const video = resVideo.body.video
+      await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4())
+
+      await waitJobs(servers)
+
+      const resComments = await getVideoCommentThreads(servers[1].url, video.uuid, 0, 5)
+      const commentId = resComments.body.data[0].id
+      await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, commentId, reason: 'super reason' })
+
+      await waitJobs(servers)
+      await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence')
+    })
+
+    it('Should send a notification to moderators on local account abuse', async function () {
+      this.timeout(10000)
+
+      const username = 'user' + new Date().getTime()
+      const resUser = await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username, password: 'donald' })
+      const accountId = resUser.body.user.account.id
+
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId, reason: 'super reason' })
+
+      await waitJobs(servers)
+      await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
+    })
+
+    it('Should send a notification to moderators on remote account abuse', async function () {
+      this.timeout(10000)
+
+      const username = 'user' + new Date().getTime()
+      const tmpToken = await generateUserAccessToken(servers[0], username)
+      await uploadVideo(servers[0].url, tmpToken, { name: 'super video' })
+
+      await waitJobs(servers)
+
+      const resAccount = await getAccount(servers[1].url, username + '@' + servers[0].host)
+      await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, accountId: resAccount.body.id, reason: 'super reason' })
+
+      await waitJobs(servers)
+      await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
+    })
   })
 
   describe('Video blacklist on my video', function () {
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 9c3299618..b01a91d48 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -180,7 +180,7 @@ describe('Test emails', function () {
     })
   })
 
-  describe('When creating a video abuse', function () {
+  describe('When creating an abuse', function () {
     it('Should send the notification email', async function () {
       this.timeout(10000)