14 files changed, 1201 insertions, 77 deletions

diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts
new file mode 100644
index 000000000..8964c0ab2
--- /dev/null
+++ b/server/tests/api/check-params/abuses.ts
@@ -0,0 +1,269 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+
+import 'mocha'
+import { AbuseCreate, AbuseState } from '@shared/models'
+import {
+  cleanupTests,
+  createUser,
+  deleteAbuse,
+  flushAndRunServer,
+  makeGetRequest,
+  makePostBodyRequest,
+  ServerInfo,
+  setAccessTokensToServers,
+  updateAbuse,
+  uploadVideo,
+  userLogin
+} from '../../../../shared/extra-utils'
+import {
+  checkBadCountPagination,
+  checkBadSortPagination,
+  checkBadStartPagination
+} from '../../../../shared/extra-utils/requests/check-api-params'
+
+describe('Test abuses API validators', function () {
+  const basePath = '/api/v1/abuses/'
+
+  let server: ServerInfo
+  let userAccessToken = ''
+  let abuseId: number
+
+  // ---------------------------------------------------------------
+
+  before(async function () {
+    this.timeout(30000)
+
+    server = await flushAndRunServer(1)
+
+    await setAccessTokensToServers([ server ])
+
+    const username = 'user1'
+    const password = 'my super password'
+    await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
+    userAccessToken = await userLogin(server, { username, password })
+
+    const res = await uploadVideo(server.url, server.accessToken, {})
+    server.video = res.body.video
+  })
+
+  describe('When listing abuses', function () {
+    const path = basePath
+
+    it('Should fail with a bad start pagination', async function () {
+      await checkBadStartPagination(server.url, path, server.accessToken)
+    })
+
+    it('Should fail with a bad count pagination', async function () {
+      await checkBadCountPagination(server.url, path, server.accessToken)
+    })
+
+    it('Should fail with an incorrect sort', async function () {
+      await checkBadSortPagination(server.url, path, server.accessToken)
+    })
+
+    it('Should fail with a non authenticated user', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        statusCodeExpected: 401
+      })
+    })
+
+    it('Should fail with a non admin user', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        token: userAccessToken,
+        statusCodeExpected: 403
+      })
+    })
+
+    it('Should fail with a bad id filter', async function () {
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { id: 'toto' } })
+    })
+
+    it('Should fail with a bad filter', async function () {
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { filter: 'toto' } })
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { filter: 'videos' } })
+    })
+
+    it('Should fail with bad predefined reason', async function () {
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { predefinedReason: 'violentOrRepulsives' } })
+    })
+
+    it('Should fail with a bad state filter', async function () {
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { state: 'toto' } })
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { state: 0 } })
+    })
+
+    it('Should fail with a bad videoIs filter', async function () {
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query: { videoIs: 'toto' } })
+    })
+
+    it('Should succeed with the correct params', async function () {
+      const query = {
+        id: 13,
+        predefinedReason: 'violentOrRepulsive',
+        filter: 'comment',
+        state: 2,
+        videoIs: 'deleted'
+      }
+
+      await makeGetRequest({ url: server.url, path, token: server.accessToken, query, statusCodeExpected: 200 })
+    })
+  })
+
+  describe('When reporting an abuse', function () {
+    const path = basePath
+
+    it('Should fail with nothing', async function () {
+      const fields = {}
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
+    it('Should fail with a wrong video', async function () {
+      const fields = { video: { id: 'blabla' }, reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields })
+    })
+
+    it('Should fail with an unknown video', async function () {
+      const fields = { video: { id: 42 }, reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields, statusCodeExpected: 404 })
+    })
+
+    it('Should fail with a wrong comment', async function () {
+      const fields = { comment: { id: 'blabla' }, reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields })
+    })
+
+    it('Should fail with an unknown comment', async function () {
+      const fields = { comment: { id: 42 }, reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields, statusCodeExpected: 404 })
+    })
+
+    it('Should fail with a wrong account', async function () {
+      const fields = { account: { id: 'blabla' }, reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields })
+    })
+
+    it('Should fail with an unknown account', async function () {
+      const fields = { account: { id: 42 }, reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields, statusCodeExpected: 404 })
+    })
+
+    it('Should fail with not account, comment or video', async function () {
+      const fields = { reason: 'my super reason' }
+      await makePostBodyRequest({ url: server.url, path: path, token: server.accessToken, fields, statusCodeExpected: 400 })
+    })
+
+    it('Should fail with a non authenticated user', async function () {
+      const fields = { video: { id: server.video.id }, reason: 'my super reason' }
+
+      await makePostBodyRequest({ url: server.url, path, token: 'hello', fields, statusCodeExpected: 401 })
+    })
+
+    it('Should fail with a reason too short', async function () {
+      const fields = { video: { id: server.video.id }, reason: 'h' }
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
+    it('Should fail with a too big reason', async function () {
+      const fields = { video: { id: server.video.id }, reason: 'super'.repeat(605) }
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
+    it('Should succeed with the correct parameters (basic)', async function () {
+      const fields: AbuseCreate = { video: { id: server.video.id }, reason: 'my super reason' }
+
+      const res = await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 200 })
+      abuseId = res.body.abuse.id
+    })
+
+    it('Should fail with a wrong predefined reason', async function () {
+      const fields = { video: { id: server.video.id }, reason: 'my super reason', predefinedReasons: [ 'wrongPredefinedReason' ] }
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
+    it('Should fail with negative timestamps', async function () {
+      const fields = { video: { id: server.video.id, startAt: -1 }, reason: 'my super reason' }
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
+    it('Should fail mith misordered startAt/endAt', async function () {
+      const fields = { video: { id: server.video.id, startAt: 5, endAt: 1 }, reason: 'my super reason' }
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
+    })
+
+    it('Should succeed with the corret parameters (advanced)', async function () {
+      const fields: AbuseCreate = {
+        video: {
+          id: server.video.id,
+          startAt: 1,
+          endAt: 5
+        },
+        reason: 'my super reason',
+        predefinedReasons: [ 'serverRules' ]
+      }
+
+      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 200 })
+    })
+  })
+
+  describe('When updating an abuse', function () {
+
+    it('Should fail with a non authenticated user', async function () {
+      await updateAbuse(server.url, 'blabla', abuseId, {}, 401)
+    })
+
+    it('Should fail with a non admin user', async function () {
+      await updateAbuse(server.url, userAccessToken, abuseId, {}, 403)
+    })
+
+    it('Should fail with a bad abuse id', async function () {
+      await updateAbuse(server.url, server.accessToken, 45, {}, 404)
+    })
+
+    it('Should fail with a bad state', async function () {
+      const body = { state: 5 }
+      await updateAbuse(server.url, server.accessToken, abuseId, body, 400)
+    })
+
+    it('Should fail with a bad moderation comment', async function () {
+      const body = { moderationComment: 'b'.repeat(3001) }
+      await updateAbuse(server.url, server.accessToken, abuseId, body, 400)
+    })
+
+    it('Should succeed with the correct params', async function () {
+      const body = { state: AbuseState.ACCEPTED }
+      await updateAbuse(server.url, server.accessToken, abuseId, body)
+    })
+  })
+
+  describe('When deleting a video abuse', function () {
+
+    it('Should fail with a non authenticated user', async function () {
+      await deleteAbuse(server.url, 'blabla', abuseId, 401)
+    })
+
+    it('Should fail with a non admin user', async function () {
+      await deleteAbuse(server.url, userAccessToken, abuseId, 403)
+    })
+
+    it('Should fail with a bad abuse id', async function () {
+      await deleteAbuse(server.url, server.accessToken, 45, 404)
+    })
+
+    it('Should succeed with the correct params', async function () {
+      await deleteAbuse(server.url, server.accessToken, abuseId)
+    })
+  })
+
+  after(async function () {
+    await cleanupTests([ server ])
+  })
+})
diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts
index 93ffd98b1..0ee1f27aa 100644
--- a/server/tests/api/check-params/index.ts
+++ b/server/tests/api/check-params/index.ts
@@ -1,3 +1,4 @@
+import './abuses'
 import './accounts'
 import './blocklist'
 import './bulk'
diff --git a/server/tests/api/check-params/user-notifications.ts b/server/tests/api/check-params/user-notifications.ts
index 2048fa667..883b1d29c 100644
--- a/server/tests/api/check-params/user-notifications.ts
+++ b/server/tests/api/check-params/user-notifications.ts
@@ -164,7 +164,7 @@ describe('Test user notifications API validators', function () {
     const correctFields: UserNotificationSetting = {
       newVideoFromSubscription: UserNotificationSettingValue.WEB,
       newCommentOnMyVideo: UserNotificationSettingValue.WEB,
-      videoAbuseAsModerator: UserNotificationSettingValue.WEB,
+      abuseAsModerator: UserNotificationSettingValue.WEB,
       videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB,
       blacklistOnMyVideo: UserNotificationSettingValue.WEB,
       myVideoImportFinished: UserNotificationSettingValue.WEB,
diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts
index 557bf20eb..3b361ca79 100644
--- a/server/tests/api/check-params/video-abuses.ts
+++ b/server/tests/api/check-params/video-abuses.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-
+import { AbuseState, VideoAbuseCreate } from '@shared/models'
 import {
   cleanupTests,
   createUser,
@@ -20,7 +20,8 @@ import {
   checkBadSortPagination,
   checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
-import { VideoAbuseState, VideoAbuseCreate } from '../../../../shared/models/videos'
+
+// FIXME: deprecated in 2.3. Remove this controller
 
 describe('Test video abuses API validators', function () {
   let server: ServerInfo
@@ -136,7 +137,7 @@ describe('Test video abuses API validators', function () {
       const fields = { reason: 'my super reason' }
 
       const res = await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 200 })
-      videoAbuseId = res.body.videoAbuse.id
+      videoAbuseId = res.body.abuse.id
     })
 
     it('Should fail with a wrong predefined reason', async function () {
@@ -151,12 +152,6 @@ describe('Test video abuses API validators', function () {
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
-    it('Should fail mith misordered startAt/endAt', async function () {
-      const fields = { reason: 'my super reason', startAt: 5, endAt: 1 }
-
-      await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
-    })
-
     it('Should succeed with the corret parameters (advanced)', async function () {
       const fields: VideoAbuseCreate = { reason: 'my super reason', predefinedReasons: [ 'serverRules' ], startAt: 1, endAt: 5 }
 
@@ -190,7 +185,7 @@ describe('Test video abuses API validators', function () {
     })
 
     it('Should succeed with the correct params', async function () {
-      const body = { state: VideoAbuseState.ACCEPTED }
+      const body = { state: AbuseState.ACCEPTED }
       await updateVideoAbuse(server.url, server.accessToken, server.video.uuid, videoAbuseId, body)
     })
   })
diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh
index 14a014f07..4998de364 100644
--- a/server/tests/api/ci-4.sh
+++ b/server/tests/api/ci-4.sh
@@ -2,6 +2,7 @@
 
 set -eu
 
+activitypubFiles=$(find server/tests/api/moderation -type f | grep -v index.ts | xargs echo)
 redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo)
 activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo)
 
diff --git a/server/tests/api/index.ts b/server/tests/api/index.ts
index bac77ab2e..b62e2f5f7 100644
--- a/server/tests/api/index.ts
+++ b/server/tests/api/index.ts
@@ -1,6 +1,7 @@
 // Order of the tests we want to execute
 import './activitypub'
 import './check-params'
+import './moderation'
 import './notifications'
 import './redundancy'
 import './search'
diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts
new file mode 100644
index 000000000..f186f7ea0
--- /dev/null
+++ b/server/tests/api/moderation/abuses.ts
@@ -0,0 +1,777 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+
+import 'mocha'
+import * as chai from 'chai'
+import { Abuse, AbuseFilter, AbusePredefinedReasonsString, AbuseState, VideoComment, Account } from '@shared/models'
+import {
+  addVideoCommentThread,
+  cleanupTests,
+  createUser,
+  deleteAbuse,
+  deleteVideoComment,
+  flushAndRunMultipleServers,
+  getAbusesList,
+  getVideoCommentThreads,
+  getVideoIdFromUUID,
+  getVideosList,
+  immutableAssign,
+  removeVideo,
+  reportAbuse,
+  ServerInfo,
+  setAccessTokensToServers,
+  updateAbuse,
+  uploadVideo,
+  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'
+import {
+  addAccountToServerBlocklist,
+  addServerToServerBlocklist,
+  removeAccountFromServerBlocklist,
+  removeServerFromServerBlocklist
+} from '../../../../shared/extra-utils/users/blocklist'
+
+const expect = chai.expect
+
+describe('Test abuses', function () {
+  let servers: ServerInfo[] = []
+  let abuseServer1: Abuse
+  let abuseServer2: Abuse
+
+  before(async function () {
+    this.timeout(50000)
+
+    // Run servers
+    servers = await flushAndRunMultipleServers(2)
+
+    // Get the access tokens
+    await setAccessTokensToServers(servers)
+
+    // Server 1 and server 2 follow each other
+    await doubleFollow(servers[0], servers[1])
+  })
+
+  describe('Video abuses', function () {
+
+    before(async function () {
+      this.timeout(50000)
+
+      // 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 video2Attributes = {
+        name: 'my super name for server 2',
+        description: 'my super description for server 2'
+      }
+      await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes)
+
+      // Wait videos propagation, server 2 has transcoding enabled
+      await waitJobs(servers)
+
+      const res = await getVideosList(servers[0].url)
+      const videos = res.body.data
+
+      expect(videos.length).to.equal(2)
+
+      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 not have abuses', async function () {
+      const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
+    })
+
+    it('Should report abuse on a local video', async function () {
+      this.timeout(15000)
+
+      const reason = 'my super bad reason'
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: servers[0].video.id, reason })
+
+      // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2
+      await waitJobs(servers)
+    })
+
+    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 })
+
+      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(servers[0].host)
+
+      expect(abuse.video.id).to.equal(servers[0].video.id)
+      expect(abuse.video.channel).to.exist
+
+      expect(abuse.comment).to.be.null
+
+      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)
+
+      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)
+    })
+
+    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)
+    })
+
+    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 })
+
+      expect(res1.body.total).to.equal(2)
+      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(servers[0].host)
+
+      expect(abuse1.video.id).to.equal(servers[0].video.id)
+      expect(abuse1.video.countReports).to.equal(1)
+      expect(abuse1.video.nthReport).to.equal(1)
+
+      expect(abuse1.comment).to.be.null
+
+      expect(abuse1.flaggedAccount.name).to.equal('root')
+      expect(abuse1.flaggedAccount.host).to.equal(servers[0].host)
+
+      expect(abuse1.state.id).to.equal(AbuseState.PENDING)
+      expect(abuse1.state.label).to.equal('Pending')
+      expect(abuse1.moderationComment).to.be.null
+
+      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(servers[0].host)
+
+      expect(abuse2.video.id).to.equal(servers[1].video.id)
+
+      expect(abuse2.comment).to.be.null
+
+      expect(abuse2.flaggedAccount.name).to.equal('root')
+      expect(abuse2.flaggedAccount.host).to.equal(servers[1].host)
+
+      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 })
+      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('my super bad reason 2')
+      expect(abuseServer2.reporterAccount.name).to.equal('root')
+      expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host)
+
+      expect(abuse2.flaggedAccount.name).to.equal('root')
+      expect(abuse2.flaggedAccount.host).to.equal(servers[1].host)
+
+      expect(abuseServer2.state.id).to.equal(AbuseState.PENDING)
+      expect(abuseServer2.state.label).to.equal('Pending')
+      expect(abuseServer2.moderationComment).to.be.null
+    })
+
+    it('Should hide video abuses from blocked accounts', 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)
+
+        const res = await getAbusesList({ url: servers[0].url, token: servers[0].accessToken })
+        expect(res.body.total).to.equal(3)
+      }
+
+      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[]
+      }
+
+      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)
+    })
+  })
+
+  describe('Comment abuses', function () {
+
+    async function getComment (url: string, videoIdArg: number | string) {
+      const videoId = typeof videoIdArg === 'string'
+        ? await getVideoIdFromUUID(url, videoIdArg)
+        : videoIdArg
+
+      const res = await getVideoCommentThreads(url, videoId, 0, 5)
+
+      return res.body.data[0] as VideoComment
+    }
+
+    before(async function () {
+      this.timeout(50000)
+
+      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')
+      }
+    })
+  })
+
+  describe('Account abuses', function () {
+
+    async function getAccountFromServer (url: string, name: string, server: ServerInfo) {
+      const res = await getAccount(url, name + '@' + server.host)
+
+      return res.body as Account
+    }
+
+    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')
+
+      const abuse2: Abuse = res1.body.data[1]
+      expect(abuse2.reason).to.equal('it is a really bad account')
+
+      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).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]
+      }
+    })
+  })
+
+  describe('Common actions on abuses', function () {
+
+    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)
+
+      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)
+    })
+
+    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)
+
+      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 () {
+    await cleanupTests(servers)
+  })
+})
diff --git a/server/tests/api/users/blocklist.ts b/server/tests/api/moderation/blocklist.ts
index 8c9107a50..8c9107a50 100644
--- a/server/tests/api/users/blocklist.ts
+++ b/server/tests/api/moderation/blocklist.ts
diff --git a/server/tests/api/moderation/index.ts b/server/tests/api/moderation/index.ts
new file mode 100644
index 000000000..cb018d88e
--- /dev/null
+++ b/server/tests/api/moderation/index.ts
@@ -0,0 +1,2 @@
+export * from './abuses'
+export * from './blocklist'
diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts
index b90732a7a..a8517600a 100644
--- a/server/tests/api/notifications/moderation-notifications.ts
+++ b/server/tests/api/notifications/moderation-notifications.ts
@@ -3,15 +3,21 @@
 import 'mocha'
 import { v4 as uuidv4 } from 'uuid'
 import {
+  addVideoCommentThread,
   addVideoToBlacklist,
   cleanupTests,
+  createUser,
   follow,
+  generateUserAccessToken,
+  getAccount,
   getCustomConfig,
+  getVideoCommentThreads,
+  getVideoIdFromUUID,
   immutableAssign,
   MockInstancesIndex,
   registerUser,
   removeVideoFromBlacklist,
-  reportVideoAbuse,
+  reportAbuse,
   unfollow,
   updateCustomConfig,
   updateCustomSubConfig,
@@ -23,7 +29,9 @@ import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import {
   checkAutoInstanceFollowing,
   CheckerBaseParams,
+  checkNewAccountAbuseForModerators,
   checkNewBlacklistOnMyVideo,
+  checkNewCommentAbuseForModerators,
   checkNewInstanceFollower,
   checkNewVideoAbuseForModerators,
   checkNewVideoFromSubscription,
@@ -74,12 +82,12 @@ describe('Test moderation notifications', function () {
 
       const name = 'video for abuse ' + uuidv4()
       const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
-      const uuid = resVideo.body.video.uuid
+      const video = resVideo.body.video
 
-      await reportVideoAbuse(servers[0].url, servers[0].accessToken, uuid, 'super reason')
+      await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: video.id, reason: 'super reason' })
 
       await waitJobs(servers)
-      await checkNewVideoAbuseForModerators(baseParams, uuid, name, 'presence')
+      await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence')
     })
 
     it('Should send a notification to moderators on remote video abuse', async function () {
@@ -87,14 +95,77 @@ describe('Test moderation notifications', function () {
 
       const name = 'video for abuse ' + uuidv4()
       const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
-      const uuid = resVideo.body.video.uuid
+      const video = resVideo.body.video
+
+      await waitJobs(servers)
+
+      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)
 
-      await reportVideoAbuse(servers[1].url, servers[1].accessToken, uuid, 'super reason')
+      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 checkNewVideoAbuseForModerators(baseParams, uuid, name, 'presence')
+      await checkNewAccountAbuseForModerators(baseParams, username, 'presence')
     })
   })
 
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 95b64a459..b01a91d48 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
 import {
   addVideoToBlacklist,
   askResetPassword,
@@ -11,7 +11,7 @@ import {
   createUser,
   flushAndRunServer,
   removeVideoFromBlacklist,
-  reportVideoAbuse,
+  reportAbuse,
   resetPassword,
   ServerInfo,
   setAccessTokensToServers,
@@ -30,10 +30,15 @@ describe('Test emails', function () {
   let userId: number
   let userId2: number
   let userAccessToken: string
+
   let videoUUID: string
+  let videoId: number
+
   let videoUserUUID: string
+
   let verificationString: string
   let verificationString2: string
+
   const emails: object[] = []
   const user = {
     username: 'user_1',
@@ -76,6 +81,7 @@ describe('Test emails', function () {
       }
       const res = await uploadVideo(server.url, server.accessToken, attributes)
       videoUUID = res.body.video.uuid
+      videoId = res.body.video.id
     }
   })
 
@@ -174,12 +180,12 @@ 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)
 
       const reason = 'my super bad reason'
-      await reportVideoAbuse(server.url, server.accessToken, videoUUID, reason)
+      await reportAbuse({ url: server.url, token: server.accessToken, videoId, reason })
 
       await waitJobs(server)
       expect(emails).to.have.lengthOf(3)
diff --git a/server/tests/api/users/index.ts b/server/tests/api/users/index.ts
index fcd022429..a244a6edb 100644
--- a/server/tests/api/users/index.ts
+++ b/server/tests/api/users/index.ts
@@ -1,5 +1,4 @@
-import './users-verification'
-import './blocklist'
 import './user-subscriptions'
 import './users'
 import './users-multiple-servers'
+import './users-verification'
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 0a66bd1ce..ea74bde6a 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { MyUser, User, UserRole, Video, VideoAbuseState, VideoAbuseUpdate, VideoPlaylistType } from '../../../../shared/index'
+import * as chai from 'chai'
+import { AbuseState, AbuseUpdate, MyUser, User, UserRole, Video, VideoPlaylistType } from '@shared/models'
+import { CustomConfig } from '@shared/models/server'
 import {
   addVideoCommentThread,
   blockUser,
@@ -10,6 +11,7 @@ import {
   createUser,
   deleteMe,
   flushAndRunServer,
+  getAbusesList,
   getAccountRatings,
   getBlacklistedVideosList,
   getCustomConfig,
@@ -19,7 +21,6 @@ import {
   getUserInformation,
   getUsersList,
   getUsersListPaginationAndSort,
-  getVideoAbusesList,
   getVideoChannel,
   getVideosList,
   installPlugin,
@@ -29,15 +30,15 @@ import {
   registerUserWithChannel,
   removeUser,
   removeVideo,
-  reportVideoAbuse,
+  reportAbuse,
   ServerInfo,
   testImage,
   unblockUser,
+  updateAbuse,
   updateCustomSubConfig,
   updateMyAvatar,
   updateMyUser,
   updateUser,
-  updateVideoAbuse,
   uploadVideo,
   userLogin,
   waitJobs
@@ -46,7 +47,6 @@ import { follow } from '../../../../shared/extra-utils/server/follows'
 import { logout, serverLogin, setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
 import { getMyVideos } from '../../../../shared/extra-utils/videos/videos'
 import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
-import { CustomConfig } from '@shared/models/server'
 
 const expect = chai.expect
 
@@ -302,10 +302,10 @@ describe('Test users', function () {
       expect(userGet.videosCount).to.equal(0)
       expect(userGet.videoCommentsCount).to.be.a('number')
       expect(userGet.videoCommentsCount).to.equal(0)
-      expect(userGet.videoAbusesCount).to.be.a('number')
-      expect(userGet.videoAbusesCount).to.equal(0)
-      expect(userGet.videoAbusesAcceptedCount).to.be.a('number')
-      expect(userGet.videoAbusesAcceptedCount).to.equal(0)
+      expect(userGet.abusesCount).to.be.a('number')
+      expect(userGet.abusesCount).to.equal(0)
+      expect(userGet.abusesAcceptedCount).to.be.a('number')
+      expect(userGet.abusesAcceptedCount).to.equal(0)
     })
   })
 
@@ -895,9 +895,9 @@ describe('Test users', function () {
 
       expect(user.videosCount).to.equal(0)
       expect(user.videoCommentsCount).to.equal(0)
-      expect(user.videoAbusesCount).to.equal(0)
-      expect(user.videoAbusesCreatedCount).to.equal(0)
-      expect(user.videoAbusesAcceptedCount).to.equal(0)
+      expect(user.abusesCount).to.equal(0)
+      expect(user.abusesCreatedCount).to.equal(0)
+      expect(user.abusesAcceptedCount).to.equal(0)
     })
 
     it('Should report correct videos count', async function () {
@@ -924,26 +924,26 @@ describe('Test users', function () {
       expect(user.videoCommentsCount).to.equal(1)
     })
 
-    it('Should report correct video abuses counts', async function () {
+    it('Should report correct abuses counts', async function () {
       const reason = 'my super bad reason'
-      await reportVideoAbuse(server.url, user17AccessToken, videoId, reason)
+      await reportAbuse({ url: server.url, token: user17AccessToken, videoId, reason })
 
-      const res1 = await getVideoAbusesList({ url: server.url, token: server.accessToken })
+      const res1 = await getAbusesList({ url: server.url, token: server.accessToken })
       const abuseId = res1.body.data[0].id
 
       const res2 = await getUserInformation(server.url, server.accessToken, user17Id, true)
       const user2: User = res2.body
 
-      expect(user2.videoAbusesCount).to.equal(1) // number of incriminations
-      expect(user2.videoAbusesCreatedCount).to.equal(1) // number of reports created
+      expect(user2.abusesCount).to.equal(1) // number of incriminations
+      expect(user2.abusesCreatedCount).to.equal(1) // number of reports created
 
-      const body: VideoAbuseUpdate = { state: VideoAbuseState.ACCEPTED }
-      await updateVideoAbuse(server.url, server.accessToken, videoId, abuseId, body)
+      const body: AbuseUpdate = { state: AbuseState.ACCEPTED }
+      await updateAbuse(server.url, server.accessToken, abuseId, body)
 
       const res3 = await getUserInformation(server.url, server.accessToken, user17Id, true)
       const user3: User = res3.body
 
-      expect(user3.videoAbusesAcceptedCount).to.equal(1) // number of reports created accepted
+      expect(user3.abusesAcceptedCount).to.equal(1) // number of reports created accepted
     })
   })
 
diff --git a/server/tests/api/videos/video-abuse.ts b/server/tests/api/videos/video-abuse.ts
index 7383bd991..baeb543e0 100644
--- a/server/tests/api/videos/video-abuse.ts
+++ b/server/tests/api/videos/video-abuse.ts
@@ -1,21 +1,21 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { VideoAbuse, VideoAbuseState, VideoAbusePredefinedReasonsString } from '../../../../shared/models/videos'
+import * as chai from 'chai'
+import { Abuse, AbusePredefinedReasonsString, AbuseState } from '@shared/models'
 import {
   cleanupTests,
+  createUser,
   deleteVideoAbuse,
   flushAndRunMultipleServers,
   getVideoAbusesList,
   getVideosList,
+  removeVideo,
   reportVideoAbuse,
   ServerInfo,
   setAccessTokensToServers,
   updateVideoAbuse,
   uploadVideo,
-  removeVideo,
-  createUser,
   userLogin
 } from '../../../../shared/extra-utils/index'
 import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
@@ -29,9 +29,11 @@ import {
 
 const expect = chai.expect
 
+// FIXME: deprecated in 2.3. Remove this controller
+
 describe('Test video abuses', function () {
   let servers: ServerInfo[] = []
-  let abuseServer2: VideoAbuse
+  let abuseServer2: Abuse
 
   before(async function () {
     this.timeout(50000)
@@ -95,14 +97,14 @@ describe('Test video abuses', function () {
     expect(res1.body.data).to.be.an('array')
     expect(res1.body.data.length).to.equal(1)
 
-    const abuse: VideoAbuse = res1.body.data[0]
+    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.video.countReports).to.equal(1)
+    expect(abuse.video.nthReport).to.equal(1)
     expect(abuse.countReportsForReporter).to.equal(1)
     expect(abuse.countReportsForReportee).to.equal(1)
 
@@ -128,23 +130,23 @@ describe('Test video abuses', function () {
     expect(res1.body.data).to.be.an('array')
     expect(res1.body.data.length).to.equal(2)
 
-    const abuse1: VideoAbuse = res1.body.data[0]
+    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(VideoAbuseState.PENDING)
+    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)
+    expect(abuse1.video.countReports).to.equal(1)
+    expect(abuse1.video.nthReport).to.equal(1)
 
-    const abuse2: VideoAbuse = res1.body.data[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(VideoAbuseState.PENDING)
+    expect(abuse2.state.id).to.equal(AbuseState.PENDING)
     expect(abuse2.state.label).to.equal('Pending')
     expect(abuse2.moderationComment).to.be.null
 
@@ -157,25 +159,25 @@ describe('Test video abuses', function () {
     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(VideoAbuseState.PENDING)
+    expect(abuseServer2.state.id).to.equal(AbuseState.PENDING)
     expect(abuseServer2.state.label).to.equal('Pending')
     expect(abuseServer2.moderationComment).to.be.null
   })
 
   it('Should update the state of a video abuse', async function () {
-    const body = { state: VideoAbuseState.REJECTED }
+    const body = { state: AbuseState.REJECTED }
     await updateVideoAbuse(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid, abuseServer2.id, body)
 
     const res = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res.body.data[0].state.id).to.equal(VideoAbuseState.REJECTED)
+    expect(res.body.data[0].state.id).to.equal(AbuseState.REJECTED)
   })
 
   it('Should add a moderation comment', async function () {
-    const body = { state: VideoAbuseState.ACCEPTED, moderationComment: 'It is valid' }
+    const body = { state: AbuseState.ACCEPTED, moderationComment: 'It is valid' }
     await updateVideoAbuse(servers[1].url, servers[1].accessToken, abuseServer2.video.uuid, abuseServer2.id, body)
 
     const res = await getVideoAbusesList({ url: servers[1].url, token: servers[1].accessToken })
-    expect(res.body.data[0].state.id).to.equal(VideoAbuseState.ACCEPTED)
+    expect(res.body.data[0].state.id).to.equal(AbuseState.ACCEPTED)
     expect(res.body.data[0].moderationComment).to.equal('It is valid')
   })
 
@@ -243,7 +245,7 @@ describe('Test video abuses', function () {
     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")
 
-    const abuse: VideoAbuse = res.body.data[0]
+    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
@@ -277,10 +279,10 @@ describe('Test video abuses', function () {
     const res2 = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
 
     {
-      for (const abuse of res2.body.data as VideoAbuse[]) {
+      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.video.countReports).to.equal(1, "wrong reports count for video 3")
+          expect(abuse.video.nthReport).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")
         }
@@ -295,7 +297,7 @@ describe('Test video abuses', function () {
     this.timeout(10000)
 
     const reason5 = 'my super bad reason 5'
-    const predefinedReasons5: VideoAbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ]
+    const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ]
     const createdAbuse = (await reportVideoAbuse(
       servers[0].url,
       servers[0].accessToken,
@@ -304,16 +306,16 @@ describe('Test video abuses', function () {
       predefinedReasons5,
       1,
       5
-    )).body.videoAbuse as VideoAbuse
+    )).body.abuse
 
     const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken })
 
     {
-      const abuse = (res.body.data as VideoAbuse[]).find(a => a.id === createdAbuse.id)
+      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.startAt).to.equal(1, "starting timestamp doesn't match the one reported")
-      expect(abuse.endAt).to.equal(5, "ending timestamp doesn't 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")
     }
   })
 
@@ -348,7 +350,7 @@ describe('Test video abuses', function () {
 
       const res = await getVideoAbusesList(options)
 
-      return res.body.data as VideoAbuse[]
+      return res.body.data as Abuse[]
     }
 
     expect(await list({ id: 56 })).to.have.lengthOf(0)
@@ -365,14 +367,14 @@ describe('Test video abuses', function () {
     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(4)
+    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: VideoAbuseState.ACCEPTED })).to.have.lengthOf(0)
-    expect(await list({ state: VideoAbuseState.PENDING })).to.have.lengthOf(6)
+    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)