73 files changed, 3512 insertions, 1286 deletions
diff --git a/server/controllers/api/abuse.ts b/server/controllers/api/abuse.ts
new file mode 100644
index 000000000..04a0c06e3
--- /dev/null
+++ b/server/controllers/api/abuse.ts
@@ -0,0 +1,168 @@
+import * as express from 'express'
+import { createAccountAbuse, createVideoAbuse, createVideoCommentAbuse } from '@server/lib/moderation'
+import { AbuseModel } from '@server/models/abuse/abuse'
+import { getServerActor } from '@server/models/application/application'
+import { AbuseCreate, abusePredefinedReasonsMap, AbuseState, UserRight } from '../../../shared'
+import { getFormattedObjects } from '../../helpers/utils'
+import { sequelizeTypescript } from '../../initializers/database'
+import {
+  abuseGetValidator,
+  abuseListValidator,
+  abuseReportValidator,
+  abusesSortValidator,
+  abuseUpdateValidator,
+  asyncMiddleware,
+  asyncRetryTransactionMiddleware,
+  authenticate,
+  ensureUserHasRight,
+  paginationValidator,
+  setDefaultPagination,
+  setDefaultSort
+} from '../../middlewares'
+import { AccountModel } from '../../models/account/account'
+const abuseRouter = express.Router()
+abuseRouter.get('/',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_ABUSES),
+  paginationValidator,
+  abusesSortValidator,
+  setDefaultSort,
+  setDefaultPagination,
+  abuseListValidator,
+  asyncMiddleware(listAbuses)
+)
+abuseRouter.put('/:id',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_ABUSES),
+  asyncMiddleware(abuseUpdateValidator),
+  asyncRetryTransactionMiddleware(updateAbuse)
+)
+abuseRouter.post('/',
+  authenticate,
+  asyncMiddleware(abuseReportValidator),
+  asyncRetryTransactionMiddleware(reportAbuse)
+)
+abuseRouter.delete('/:id',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_ABUSES),
+  asyncMiddleware(abuseGetValidator),
+  asyncRetryTransactionMiddleware(deleteAbuse)
+)
+// ---------------------------------------------------------------------------
+export {
+  abuseRouter,
+  // FIXME: deprecated in 2.3. Remove these exports
+  listAbuses,
+  updateAbuse,
+  deleteAbuse,
+  reportAbuse
+}
+// ---------------------------------------------------------------------------
+async function listAbuses (req: express.Request, res: express.Response) {
+  const user = res.locals.oauth.token.user
+  const serverActor = await getServerActor()
+  const resultList = await AbuseModel.listForApi({
+    start: req.query.start,
+    count: req.query.count,
+    sort: req.query.sort,
+    id: req.query.id,
+    filter: req.query.filter,
+    predefinedReason: req.query.predefinedReason,
+    search: req.query.search,
+    state: req.query.state,
+    videoIs: req.query.videoIs,
+    searchReporter: req.query.searchReporter,
+    searchReportee: req.query.searchReportee,
+    searchVideo: req.query.searchVideo,
+    searchVideoChannel: req.query.searchVideoChannel,
+    serverAccountId: serverActor.Account.id,
+    user
+  })
+  return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+async function updateAbuse (req: express.Request, res: express.Response) {
+  const abuse = res.locals.abuse
+  if (req.body.moderationComment !== undefined) abuse.moderationComment = req.body.moderationComment
+  if (req.body.state !== undefined) abuse.state = req.body.state
+  await sequelizeTypescript.transaction(t => {
+    return abuse.save({ transaction: t })
+  })
+  // Do not send the delete to other instances, we updated OUR copy of this abuse
+  return res.type('json').status(204).end()
+}
+async function deleteAbuse (req: express.Request, res: express.Response) {
+  const abuse = res.locals.abuse
+  await sequelizeTypescript.transaction(t => {
+    return abuse.destroy({ transaction: t })
+  })
+  // Do not send the delete to other instances, we delete OUR copy of this abuse
+  return res.type('json').status(204).end()
+}
+async function reportAbuse (req: express.Request, res: express.Response) {
+  const videoInstance = res.locals.videoAll
+  const commentInstance = res.locals.videoCommentFull
+  const accountInstance = res.locals.account
+  const body: AbuseCreate = req.body
+  const { id } = await sequelizeTypescript.transaction(async t => {
+    const reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t)
+    const predefinedReasons = body.predefinedReasons?.map(r => abusePredefinedReasonsMap[r])
+    const baseAbuse = {
+      reporterAccountId: reporterAccount.id,
+      reason: body.reason,
+      state: AbuseState.PENDING,
+      predefinedReasons
+    }
+    if (body.video) {
+      return createVideoAbuse({
+        baseAbuse,
+        videoInstance,
+        reporterAccount,
+        transaction: t,
+        startAt: body.video.startAt,
+        endAt: body.video.endAt
+      })
+    }
+    if (body.comment) {
+      return createVideoCommentAbuse({
+        baseAbuse,
+        commentInstance,
+        reporterAccount,
+        transaction: t
+      })
+    }
+    // Account report
+    return createAccountAbuse({
+      baseAbuse,
+      accountInstance,
+      reporterAccount,
+      transaction: t
+    })
+  })
+  return res.json({ abuse: { id } })
+}
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index c334a26b4..eda9e04d1 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -3,6 +3,7 @@ import * as express from 'express'
 import * as RateLimit from 'express-rate-limit'
 import { badRequest } from '../../helpers/express-utils'
 import { CONFIG } from '../../initializers/config'
+import { abuseRouter } from './abuse'
 import { accountsRouter } from './accounts'
 import { bulkRouter } from './bulk'
 import { configRouter } from './config'
@@ -32,6 +33,7 @@ const apiRateLimiter = RateLimit({
 apiRouter.use(apiRateLimiter)
 apiRouter.use('/server', serverRouter)
+apiRouter.use('/abuses', abuseRouter)
 apiRouter.use('/bulk', bulkRouter)
 apiRouter.use('/oauth-clients', oauthClientsRouter)
 apiRouter.use('/config', configRouter)
diff --git a/server/controllers/api/users/my-history.ts b/server/controllers/api/users/my-history.ts
index 77a15e5fc..dc915977f 100644
--- a/server/controllers/api/users/my-history.ts
+++ b/server/controllers/api/users/my-history.ts
@@ -50,7 +50,5 @@ async function removeUserHistory (req: express.Request, res: express.Response) {
    return UserVideoHistoryModel.removeUserHistoryBefore(user, beforeDate, t)
  })
-  // Do not send the delete to other instances, we delete OUR copy of this video abuse
  return res.type('json').status(204).end()
 }
diff --git a/server/controllers/api/users/my-notifications.ts b/server/controllers/api/users/my-notifications.ts
index 017f5219e..0be51c128 100644
--- a/server/controllers/api/users/my-notifications.ts
+++ b/server/controllers/api/users/my-notifications.ts
@@ -68,7 +68,7 @@ async function updateNotificationSettings (req: express.Request, res: express.Re
  const values: UserNotificationSetting = {
    newVideoFromSubscription: body.newVideoFromSubscription,
    newCommentOnMyVideo: body.newCommentOnMyVideo,
-    videoAbuseAsModerator: body.videoAbuseAsModerator,
+    abuseAsModerator: body.abuseAsModerator,
    videoAutoBlacklistAsModerator: body.videoAutoBlacklistAsModerator,
    blacklistOnMyVideo: body.blacklistOnMyVideo,
    myVideoPublished: body.myVideoPublished,
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index ab2074459..b92a66360 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -1,9 +1,10 @@
 import * as express from 'express'
-import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse, videoAbusePredefinedReasonsMap } from '../../../../shared'
+import { AbuseModel } from '@server/models/abuse/abuse'
-import { logger } from '../../../helpers/logger'
+import { getServerActor } from '@server/models/application/application'
+import { AbuseCreate, UserRight, VideoAbuseCreate } from '../../../../shared'
 import { getFormattedObjects } from '../../../helpers/utils'
-import { sequelizeTypescript } from '../../../initializers/database'
 import {
+  abusesSortValidator,
  asyncMiddleware,
  asyncRetryTransactionMiddleware,
  authenticate,
@@ -12,28 +13,21 @@ import {
  setDefaultPagination,
  setDefaultSort,
  videoAbuseGetValidator,
+  videoAbuseListValidator,
  videoAbuseReportValidator,
-  videoAbusesSortValidator,
+  videoAbuseUpdateValidator
-  videoAbuseUpdateValidator,
-  videoAbuseListValidator
 } from '../../../middlewares'
-import { AccountModel } from '../../../models/account/account'
+import { deleteAbuse, reportAbuse, updateAbuse } from '../abuse'
-import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { auditLoggerFactory, VideoAbuseAuditView } from '../../../helpers/audit-logger'
+// FIXME: deprecated in 2.3. Remove this controller
-import { Notifier } from '../../../lib/notifier'
-import { sendVideoAbuse } from '../../../lib/activitypub/send/send-flag'
-import { MVideoAbuseAccountVideo } from '../../../types/models/video'
-import { getServerActor } from '@server/models/application/application'
-import { MAccountDefault } from '@server/types/models'
-const auditLogger = auditLoggerFactory('abuse')
 const abuseVideoRouter = express.Router()
 abuseVideoRouter.get('/abuse',
  authenticate,
-  ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
+  ensureUserHasRight(UserRight.MANAGE_ABUSES),
  paginationValidator,
-  videoAbusesSortValidator,
+  abusesSortValidator,
  setDefaultSort,
  setDefaultPagination,
  videoAbuseListValidator,
@@ -41,7 +35,7 @@ abuseVideoRouter.get('/abuse',
 )
 abuseVideoRouter.put('/:videoId/abuse/:id',
  authenticate,
-  ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
+  ensureUserHasRight(UserRight.MANAGE_ABUSES),
  asyncMiddleware(videoAbuseUpdateValidator),
  asyncRetryTransactionMiddleware(updateVideoAbuse)
 )
@@ -52,7 +46,7 @@ abuseVideoRouter.post('/:videoId/abuse',
 )
 abuseVideoRouter.delete('/:videoId/abuse/:id',
  authenticate,
-  ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
+  ensureUserHasRight(UserRight.MANAGE_ABUSES),
  asyncMiddleware(videoAbuseGetValidator),
  asyncRetryTransactionMiddleware(deleteVideoAbuse)
 )
@@ -69,11 +63,12 @@ async function listVideoAbuses (req: express.Request, res: express.Response) {
  const user = res.locals.oauth.token.user
  const serverActor = await getServerActor()
-  const resultList = await VideoAbuseModel.listForApi({
+  const resultList = await AbuseModel.listForApi({
    start: req.query.start,
    count: req.query.count,
    sort: req.query.sort,
    id: req.query.id,
+    filter: 'video',
    predefinedReason: req.query.predefinedReason,
    search: req.query.search,
    state: req.query.state,
@@ -90,74 +85,28 @@ async function listVideoAbuses (req: express.Request, res: express.Response) {
 }
 async function updateVideoAbuse (req: express.Request, res: express.Response) {
-  const videoAbuse = res.locals.videoAbuse
+  return updateAbuse(req, res)
-  if (req.body.moderationComment !== undefined) videoAbuse.moderationComment = req.body.moderationComment
-  if (req.body.state !== undefined) videoAbuse.state = req.body.state
-  await sequelizeTypescript.transaction(t => {
-    return videoAbuse.save({ transaction: t })
-  })
-  // Do not send the delete to other instances, we updated OUR copy of this video abuse
-  return res.type('json').status(204).end()
 }
 async function deleteVideoAbuse (req: express.Request, res: express.Response) {
-  const videoAbuse = res.locals.videoAbuse
+  return deleteAbuse(req, res)
-  await sequelizeTypescript.transaction(t => {
-    return videoAbuse.destroy({ transaction: t })
-  })
-  // Do not send the delete to other instances, we delete OUR copy of this video abuse
-  return res.type('json').status(204).end()
 }
 async function reportVideoAbuse (req: express.Request, res: express.Response) {
-  const videoInstance = res.locals.videoAll
+  const oldBody = req.body as VideoAbuseCreate
-  const body: VideoAbuseCreate = req.body
-  let reporterAccount: MAccountDefault
-  let videoAbuseJSON: VideoAbuse
-  const videoAbuseInstance = await sequelizeTypescript.transaction(async t => {
-    reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t)
-    const predefinedReasons = body.predefinedReasons?.map(r => videoAbusePredefinedReasonsMap[r])
-    const abuseToCreate = {
-      reporterAccountId: reporterAccount.id,
-      reason: body.reason,
-      videoId: videoInstance.id,
-      state: VideoAbuseState.PENDING,
-      predefinedReasons,
-      startAt: body.startAt,
-      endAt: body.endAt
-    }
-    const videoAbuseInstance: MVideoAbuseAccountVideo = await VideoAbuseModel.create(abuseToCreate, { transaction: t })
-    videoAbuseInstance.Video = videoInstance
-    videoAbuseInstance.Account = reporterAccount
-    // We send the video abuse to the origin server
-    if (videoInstance.isOwned() === false) {
-      await sendVideoAbuse(reporterAccount.Actor, videoAbuseInstance, videoInstance, t)
-    }
-    videoAbuseJSON = videoAbuseInstance.toFormattedJSON()
+  req.body = {
-    auditLogger.create(reporterAccount.Actor.getIdentifier(), new VideoAbuseAuditView(videoAbuseJSON))
+    accountId: res.locals.videoAll.VideoChannel.accountId,
-    return videoAbuseInstance
+    reason: oldBody.reason,
-  })
+    predefinedReasons: oldBody.predefinedReasons,
-  Notifier.Instance.notifyOnNewVideoAbuse({
+    video: {
-    videoAbuse: videoAbuseJSON,
+      id: res.locals.videoAll.id,
-    videoAbuseInstance,
+      startAt: oldBody.startAt,
-    reporter: reporterAccount.Actor.getIdentifier()
+      endAt: oldBody.endAt
-  })
+    }
+  } as AbuseCreate
-  logger.info('Abuse report for video "%s" created.', videoInstance.name)
-  return res.json({ videoAbuse: videoAbuseJSON }).end()
+  return reportAbuse(req, res)
 }
diff --git a/server/helpers/audit-logger.ts b/server/helpers/audit-logger.ts
index 0bbfbc753..954b0b69d 100644
--- a/server/helpers/audit-logger.ts
+++ b/server/helpers/audit-logger.ts
@@ -1,15 +1,15 @@
-import * as path from 'path'
-import * as express from 'express'
 import { diff } from 'deep-object-diff'
-import { chain } from 'lodash'
+import * as express from 'express'
 import * as flatten from 'flat'
+import { chain } from 'lodash'
+import * as path from 'path'
 import * as winston from 'winston'
-import { jsonLoggerFormat, labelFormatter } from './logger'
+import { AUDIT_LOG_FILENAME } from '@server/initializers/constants'
-import { User, VideoAbuse, VideoChannel, VideoDetails, VideoImport } from '../../shared'
+import { Abuse, User, VideoChannel, VideoDetails, VideoImport } from '../../shared'
-import { VideoComment } from '../../shared/models/videos/video-comment.model'
 import { CustomConfig } from '../../shared/models/server/custom-config.model'
+import { VideoComment } from '../../shared/models/videos/video-comment.model'
 import { CONFIG } from '../initializers/config'
-import { AUDIT_LOG_FILENAME } from '@server/initializers/constants'
+import { jsonLoggerFormat, labelFormatter } from './logger'
 function getAuditIdFromRes (res: express.Response) {
  return res.locals.oauth.token.User.username
@@ -212,18 +212,15 @@ class VideoChannelAuditView extends EntityAuditView {
  }
 }
-const videoAbuseKeysToKeep = [
+const abuseKeysToKeep = [
  'id',
  'reason',
  'reporterAccount',
-  'video-id',
-  'video-name',
-  'video-uuid',
  'createdAt'
 ]
-class VideoAbuseAuditView extends EntityAuditView {
+class AbuseAuditView extends EntityAuditView {
-  constructor (private readonly videoAbuse: VideoAbuse) {
+  constructor (private readonly abuse: Abuse) {
-    super(videoAbuseKeysToKeep, 'abuse', videoAbuse)
+    super(abuseKeysToKeep, 'abuse', abuse)
  }
 }
@@ -274,6 +271,6 @@ export {
  CommentAuditView,
  UserAuditView,
  VideoAuditView,
-  VideoAbuseAuditView,
+  AbuseAuditView,
  CustomConfigAuditView
 }
diff --git a/server/helpers/custom-validators/abuses.ts b/server/helpers/custom-validators/abuses.ts
new file mode 100644
index 000000000..0ca06a252
--- /dev/null
+++ b/server/helpers/custom-validators/abuses.ts
@@ -0,0 +1,61 @@
+import validator from 'validator'
+import { AbuseFilter, abusePredefinedReasonsMap, AbusePredefinedReasonsString, AbuseVideoIs, AbuseCreate } from '@shared/models'
+import { ABUSE_STATES, CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { exists, isArray } from './misc'
+const ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.ABUSES
+function isAbuseReasonValid (value: string) {
+  return exists(value) && validator.isLength(value, ABUSES_CONSTRAINTS_FIELDS.REASON)
+}
+function isAbusePredefinedReasonValid (value: AbusePredefinedReasonsString) {
+  return exists(value) && value in abusePredefinedReasonsMap
+}
+function isAbuseFilterValid (value: AbuseFilter) {
+  return value === 'video' || value === 'comment' || value === 'account'
+}
+function areAbusePredefinedReasonsValid (value: AbusePredefinedReasonsString[]) {
+  return exists(value) && isArray(value) && value.every(v => v in abusePredefinedReasonsMap)
+}
+function isAbuseTimestampValid (value: number) {
+  return value === null || (exists(value) && validator.isInt('' + value, { min: 0 }))
+}
+function isAbuseTimestampCoherent (endAt: number, { req }) {
+  const startAt = (req.body as AbuseCreate).video.startAt
+  return exists(startAt) && endAt > startAt
+}
+function isAbuseModerationCommentValid (value: string) {
+  return exists(value) && validator.isLength(value, ABUSES_CONSTRAINTS_FIELDS.MODERATION_COMMENT)
+}
+function isAbuseStateValid (value: string) {
+  return exists(value) && ABUSE_STATES[value] !== undefined
+}
+function isAbuseVideoIsValid (value: AbuseVideoIs) {
+  return exists(value) && (
+    value === 'deleted' ||
+    value === 'blacklisted'
+  )
+}
+// ---------------------------------------------------------------------------
+export {
+  isAbuseReasonValid,
+  isAbuseFilterValid,
+  isAbusePredefinedReasonValid,
+  areAbusePredefinedReasonsValid as isAbusePredefinedReasonsValid,
+  isAbuseTimestampValid,
+  isAbuseTimestampCoherent,
+  isAbuseModerationCommentValid,
+  isAbuseStateValid,
+  isAbuseVideoIsValid
+}
diff --git a/server/helpers/custom-validators/activitypub/flag.ts b/server/helpers/custom-validators/activitypub/flag.ts
index 6452e297c..dc90b3667 100644
--- a/server/helpers/custom-validators/activitypub/flag.ts
+++ b/server/helpers/custom-validators/activitypub/flag.ts
@@ -1,9 +1,9 @@
 import { isActivityPubUrlValid } from './misc'
-import { isVideoAbuseReasonValid } from '../video-abuses'
+import { isAbuseReasonValid } from '../abuses'
 function isFlagActivityValid (activity: any) {
  return activity.type === 'Flag' &&
-    isVideoAbuseReasonValid(activity.content) &&
+    isAbuseReasonValid(activity.content) &&
    isActivityPubUrlValid(activity.object)
 }
diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts
deleted file mode 100644
index 0c2c34268..000000000
--- a/server/helpers/custom-validators/video-abuses.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import validator from 'validator'
-import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants'
-import { exists, isArray } from './misc'
-import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type'
-import { VideoAbusePredefinedReasonsString, videoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model'
-const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES
-function isVideoAbuseReasonValid (value: string) {
-  return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON)
-}
-function isVideoAbusePredefinedReasonValid (value: VideoAbusePredefinedReasonsString) {
-  return exists(value) && value in videoAbusePredefinedReasonsMap
-}
-function isVideoAbusePredefinedReasonsValid (value: VideoAbusePredefinedReasonsString[]) {
-  return exists(value) && isArray(value) && value.every(v => v in videoAbusePredefinedReasonsMap)
-}
-function isVideoAbuseTimestampValid (value: number) {
-  return value === null || (exists(value) && validator.isInt('' + value, { min: 0 }))
-}
-function isVideoAbuseTimestampCoherent (endAt: number, { req }) {
-  return exists(req.body.startAt) && endAt > req.body.startAt
-}
-function isVideoAbuseModerationCommentValid (value: string) {
-  return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.MODERATION_COMMENT)
-}
-function isVideoAbuseStateValid (value: string) {
-  return exists(value) && VIDEO_ABUSE_STATES[value] !== undefined
-}
-function isAbuseVideoIsValid (value: VideoAbuseVideoIs) {
-  return exists(value) && (
-    value === 'deleted' ||
-    value === 'blacklisted'
-  )
-}
-// ---------------------------------------------------------------------------
-export {
-  isVideoAbuseReasonValid,
-  isVideoAbusePredefinedReasonValid,
-  isVideoAbusePredefinedReasonsValid,
-  isVideoAbuseTimestampValid,
-  isVideoAbuseTimestampCoherent,
-  isVideoAbuseModerationCommentValid,
-  isVideoAbuseStateValid,
-  isAbuseVideoIsValid
-}
diff --git a/server/helpers/custom-validators/video-comments.ts b/server/helpers/custom-validators/video-comments.ts
index 846f28b17..455ff4241 100644
--- a/server/helpers/custom-validators/video-comments.ts
+++ b/server/helpers/custom-validators/video-comments.ts
@@ -1,6 +1,8 @@
-import 'multer'
+import * as express from 'express'
 import validator from 'validator'
+import { VideoCommentModel } from '@server/models/video/video-comment'
 import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { MVideoId } from '@server/types/models'
 const VIDEO_COMMENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_COMMENTS
@@ -8,8 +10,83 @@ function isValidVideoCommentText (value: string) {
  return value === null || validator.isLength(value, VIDEO_COMMENTS_CONSTRAINTS_FIELDS.TEXT)
 }
+async function doesVideoCommentThreadExist (idArg: number | string, video: MVideoId, res: express.Response) {
+  const id = parseInt(idArg + '', 10)
+  const videoComment = await VideoCommentModel.loadById(id)
+  if (!videoComment) {
+    res.status(404)
+      .json({ error: 'Video comment thread not found' })
+      .end()
+    return false
+  }
+  if (videoComment.videoId !== video.id) {
+    res.status(400)
+      .json({ error: 'Video comment is not associated to this video.' })
+      .end()
+    return false
+  }
+  if (videoComment.inReplyToCommentId !== null) {
+    res.status(400)
+      .json({ error: 'Video comment is not a thread.' })
+      .end()
+    return false
+  }
+  res.locals.videoCommentThread = videoComment
+  return true
+}
+async function doesVideoCommentExist (idArg: number | string, video: MVideoId, res: express.Response) {
+  const id = parseInt(idArg + '', 10)
+  const videoComment = await VideoCommentModel.loadByIdAndPopulateVideoAndAccountAndReply(id)
+  if (!videoComment) {
+    res.status(404)
+      .json({ error: 'Video comment thread not found' })
+      .end()
+    return false
+  }
+  if (videoComment.videoId !== video.id) {
+    res.status(400)
+      .json({ error: 'Video comment is not associated to this video.' })
+      .end()
+    return false
+  }
+  res.locals.videoCommentFull = videoComment
+  return true
+}
+async function doesCommentIdExist (idArg: number | string, res: express.Response) {
+  const id = parseInt(idArg + '', 10)
+  const videoComment = await VideoCommentModel.loadByIdAndPopulateVideoAndAccountAndReply(id)
+  if (!videoComment) {
+    res.status(404)
+      .json({ error: 'Video comment thread not found' })
+    return false
+  }
+  res.locals.videoCommentFull = videoComment
+  return true
+}
 // ---------------------------------------------------------------------------
 export {
-  isValidVideoCommentText
+  isValidVideoCommentText,
+  doesVideoCommentThreadExist,
+  doesVideoCommentExist,
+  doesCommentIdExist
 }
diff --git a/server/helpers/middlewares/abuses.ts b/server/helpers/middlewares/abuses.ts
new file mode 100644
index 000000000..be8c8b449
--- /dev/null
+++ b/server/helpers/middlewares/abuses.ts
@@ -0,0 +1,47 @@
+import { Response } from 'express'
+import { AbuseModel } from '../../models/abuse/abuse'
+import { fetchVideo } from '../video'
+// FIXME: deprecated in 2.3. Remove this function
+async function doesVideoAbuseExist (abuseIdArg: number | string, videoUUID: string, res: Response) {
+  const abuseId = parseInt(abuseIdArg + '', 10)
+  let abuse = await AbuseModel.loadByIdAndVideoId(abuseId, null, videoUUID)
+  if (!abuse) {
+    const userId = res.locals.oauth?.token.User.id
+    const video = await fetchVideo(videoUUID, 'all', userId)
+    if (video) abuse = await AbuseModel.loadByIdAndVideoId(abuseId, video.id)
+  }
+  if (abuse === null) {
+    res.status(404)
+       .json({ error: 'Video abuse not found' })
+    return false
+  }
+  res.locals.abuse = abuse
+  return true
+}
+async function doesAbuseExist (abuseId: number | string, res: Response) {
+  const abuse = await AbuseModel.loadById(parseInt(abuseId + '', 10))
+  if (!abuse) {
+    res.status(404)
+       .json({ error: 'Abuse not found' })
+    return false
+  }
+  res.locals.abuse = abuse
+  return true
+}
+// ---------------------------------------------------------------------------
+export {
+  doesAbuseExist,
+  doesVideoAbuseExist
+}
diff --git a/server/helpers/middlewares/accounts.ts b/server/helpers/middlewares/accounts.ts
index bddea7eaa..29b4ed1a6 100644
--- a/server/helpers/middlewares/accounts.ts
+++ b/server/helpers/middlewares/accounts.ts
@@ -3,8 +3,8 @@ import { AccountModel } from '../../models/account/account'
 import * as Bluebird from 'bluebird'
 import { MAccountDefault } from '../../types/models'
-function doesAccountIdExist (id: number, res: Response, sendNotFound = true) {
+function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
-  const promise = AccountModel.load(id)
+  const promise = AccountModel.load(parseInt(id + '', 10))
  return doesAccountExist(promise, res, sendNotFound)
 }
diff --git a/server/helpers/middlewares/index.ts b/server/helpers/middlewares/index.ts
index f91aeaa12..f57f3ad31 100644
--- a/server/helpers/middlewares/index.ts
+++ b/server/helpers/middlewares/index.ts
@@ -1,5 +1,5 @@
+export * from './abuses'
 export * from './accounts'
-export * from './video-abuses'
 export * from './video-blacklists'
 export * from './video-captions'
 export * from './video-channels'
diff --git a/server/helpers/middlewares/video-abuses.ts b/server/helpers/middlewares/video-abuses.ts
deleted file mode 100644
index 97a5724b6..000000000
--- a/server/helpers/middlewares/video-abuses.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Response } from 'express'
-import { VideoAbuseModel } from '../../models/video/video-abuse'
-import { fetchVideo } from '../video'
-async function doesVideoAbuseExist (abuseIdArg: number | string, videoUUID: string, res: Response) {
-  const abuseId = parseInt(abuseIdArg + '', 10)
-  let videoAbuse = await VideoAbuseModel.loadByIdAndVideoId(abuseId, null, videoUUID)
-  if (!videoAbuse) {
-    const userId = res.locals.oauth?.token.User.id
-    const video = await fetchVideo(videoUUID, 'all', userId)
-    if (video) videoAbuse = await VideoAbuseModel.loadByIdAndVideoId(abuseId, video.id)
-  }
-  if (videoAbuse === null) {
-    res.status(404)
-       .json({ error: 'Video abuse not found' })
-       .end()
-    return false
-  }
-  res.locals.videoAbuse = videoAbuse
-  return true
-}
-// ---------------------------------------------------------------------------
-export {
-  doesVideoAbuseExist
-}
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index e730e3c84..2e9d3956e 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -1,9 +1,17 @@
 import { join } from 'path'
 import { randomBytes } from 'crypto'
-import { JobType, VideoRateType, VideoResolution, VideoState } from '../../shared/models'
 import { ActivityPubActorType } from '../../shared/models/activitypub'
 import { FollowState } from '../../shared/models/actors'
-import { VideoAbuseState, VideoImportState, VideoPrivacy, VideoTranscodingFPS } from '../../shared/models/videos'
+import {
+  AbuseState,
+  VideoImportState,
+  VideoPrivacy,
+  VideoTranscodingFPS,
+  JobType,
+  VideoRateType,
+  VideoResolution,
+  VideoState
+} from '../../shared/models'
 // Do not use barrels, remain constants as independent as possible
 import { isTestInstance, sanitizeHost, sanitizeUrl, root } from '../helpers/core-utils'
 import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
@@ -15,7 +23,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
 // ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 515
+const LAST_MIGRATION_VERSION = 520
 // ---------------------------------------------------------------------------
@@ -51,7 +59,6 @@ const SORTABLE_COLUMNS = {
  USER_SUBSCRIPTIONS: [ 'id', 'createdAt' ],
  ACCOUNTS: [ 'createdAt' ],
  JOBS: [ 'createdAt' ],
-  VIDEO_ABUSES: [ 'id', 'createdAt', 'state' ],
  VIDEO_CHANNELS: [ 'id', 'name', 'updatedAt', 'createdAt' ],
  VIDEO_IMPORTS: [ 'createdAt' ],
  VIDEO_COMMENT_THREADS: [ 'createdAt', 'totalReplies' ],
@@ -66,6 +73,8 @@ const SORTABLE_COLUMNS = {
  VIDEOS_SEARCH: [ 'name', 'duration', 'createdAt', 'publishedAt', 'originallyPublishedAt', 'views', 'likes', 'match' ],
  VIDEO_CHANNELS_SEARCH: [ 'match', 'displayName', 'createdAt' ],
+  ABUSES: [ 'id', 'createdAt', 'state' ],
  ACCOUNTS_BLOCKLIST: [ 'createdAt' ],
  SERVERS_BLOCKLIST: [ 'createdAt' ],
@@ -193,7 +202,7 @@ const CONSTRAINTS_FIELDS = {
    VIDEO_LANGUAGES: { max: 500 }, // Array length
    BLOCKED_REASON: { min: 3, max: 250 } // Length
  },
-  VIDEO_ABUSES: {
+  ABUSES: {
    REASON: { min: 2, max: 3000 }, // Length
    MODERATION_COMMENT: { min: 2, max: 3000 } // Length
  },
@@ -378,10 +387,10 @@ const VIDEO_IMPORT_STATES = {
  [VideoImportState.REJECTED]: 'Rejected'
 }
-const VIDEO_ABUSE_STATES = {
+const ABUSE_STATES = {
-  [VideoAbuseState.PENDING]: 'Pending',
+  [AbuseState.PENDING]: 'Pending',
-  [VideoAbuseState.REJECTED]: 'Rejected',
+  [AbuseState.REJECTED]: 'Rejected',
-  [VideoAbuseState.ACCEPTED]: 'Accepted'
+  [AbuseState.ACCEPTED]: 'Accepted'
 }
 const VIDEO_PLAYLIST_PRIVACIES = {
@@ -778,7 +787,7 @@ export {
  VIDEO_RATE_TYPES,
  VIDEO_TRANSCODING_FPS,
  FFMPEG_NICE,
-  VIDEO_ABUSE_STATES,
+  ABUSE_STATES,
  VIDEO_CHANNELS,
  LRU_CACHE,
  JOB_REQUEST_TIMEOUT,
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 633d4f956..0775f1fad 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -1,44 +1,45 @@
+import { QueryTypes, Transaction } from 'sequelize'
 import { Sequelize as SequelizeTypescript } from 'sequelize-typescript'
+import { AbuseModel } from '@server/models/abuse/abuse'
+import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
+import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse'
 import { isTestInstance } from '../helpers/core-utils'
 import { logger } from '../helpers/logger'
 import { AccountModel } from '../models/account/account'
+import { AccountBlocklistModel } from '../models/account/account-blocklist'
 import { AccountVideoRateModel } from '../models/account/account-video-rate'
 import { UserModel } from '../models/account/user'
+import { UserNotificationModel } from '../models/account/user-notification'
+import { UserNotificationSettingModel } from '../models/account/user-notification-setting'
+import { UserVideoHistoryModel } from '../models/account/user-video-history'
 import { ActorModel } from '../models/activitypub/actor'
 import { ActorFollowModel } from '../models/activitypub/actor-follow'
 import { ApplicationModel } from '../models/application/application'
 import { AvatarModel } from '../models/avatar/avatar'
 import { OAuthClientModel } from '../models/oauth/oauth-client'
 import { OAuthTokenModel } from '../models/oauth/oauth-token'
+import { VideoRedundancyModel } from '../models/redundancy/video-redundancy'
+import { PluginModel } from '../models/server/plugin'
 import { ServerModel } from '../models/server/server'
+import { ServerBlocklistModel } from '../models/server/server-blocklist'
+import { ScheduleVideoUpdateModel } from '../models/video/schedule-video-update'
 import { TagModel } from '../models/video/tag'
+import { ThumbnailModel } from '../models/video/thumbnail'
 import { VideoModel } from '../models/video/video'
-import { VideoAbuseModel } from '../models/video/video-abuse'
 import { VideoBlacklistModel } from '../models/video/video-blacklist'
+import { VideoCaptionModel } from '../models/video/video-caption'
+import { VideoChangeOwnershipModel } from '../models/video/video-change-ownership'
 import { VideoChannelModel } from '../models/video/video-channel'
 import { VideoCommentModel } from '../models/video/video-comment'
 import { VideoFileModel } from '../models/video/video-file'
-import { VideoShareModel } from '../models/video/video-share'
-import { VideoTagModel } from '../models/video/video-tag'
-import { CONFIG } from './config'
-import { ScheduleVideoUpdateModel } from '../models/video/schedule-video-update'
-import { VideoCaptionModel } from '../models/video/video-caption'
 import { VideoImportModel } from '../models/video/video-import'
-import { VideoViewModel } from '../models/video/video-view'
-import { VideoChangeOwnershipModel } from '../models/video/video-change-ownership'
-import { VideoRedundancyModel } from '../models/redundancy/video-redundancy'
-import { UserVideoHistoryModel } from '../models/account/user-video-history'
-import { AccountBlocklistModel } from '../models/account/account-blocklist'
-import { ServerBlocklistModel } from '../models/server/server-blocklist'
-import { UserNotificationModel } from '../models/account/user-notification'
-import { UserNotificationSettingModel } from '../models/account/user-notification-setting'
-import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
 import { VideoPlaylistModel } from '../models/video/video-playlist'
 import { VideoPlaylistElementModel } from '../models/video/video-playlist-element'
-import { ThumbnailModel } from '../models/video/thumbnail'
+import { VideoShareModel } from '../models/video/video-share'
-import { PluginModel } from '../models/server/plugin'
+import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
-import { QueryTypes, Transaction } from 'sequelize'
+import { VideoTagModel } from '../models/video/video-tag'
+import { VideoViewModel } from '../models/video/video-view'
+import { CONFIG } from './config'
 require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
@@ -86,6 +87,8 @@ async function initDatabaseModels (silent: boolean) {
    TagModel,
    AccountVideoRateModel,
    UserModel,
+    AbuseModel,
+    VideoCommentAbuseModel,
    VideoAbuseModel,
    VideoModel,
    VideoChangeOwnershipModel,
diff --git a/server/initializers/migrations/0250-video-abuse-state.ts b/server/initializers/migrations/0250-video-abuse-state.ts
index 50de25182..e4993c393 100644
--- a/server/initializers/migrations/0250-video-abuse-state.ts
+++ b/server/initializers/migrations/0250-video-abuse-state.ts
@@ -1,5 +1,5 @@
 import * as Sequelize from 'sequelize'
-import { VideoAbuseState } from '../../../shared/models/videos'
+import { AbuseState } from '../../../shared/models'
 async function up (utils: {
  transaction: Sequelize.Transaction
@@ -16,7 +16,7 @@ async function up (utils: {
  }
  {
-    const query = 'UPDATE "videoAbuse" SET "state" = ' + VideoAbuseState.PENDING
+    const query = 'UPDATE "videoAbuse" SET "state" = ' + AbuseState.PENDING
    await utils.sequelize.query(query)
  }
diff --git a/server/initializers/migrations/0470-cleaup-indexes.ts b/server/initializers/migrations/0470-cleanup-indexes.ts
index 7365c30f8..7365c30f8 100644
--- a/server/initializers/migrations/0470-cleaup-indexes.ts
+++ b/server/initializers/migrations/0470-cleanup-indexes.ts
diff --git a/server/initializers/migrations/0520-abuses-split.ts b/server/initializers/migrations/0520-abuses-split.ts
new file mode 100644
index 000000000..b02a21989
--- /dev/null
+++ b/server/initializers/migrations/0520-abuses-split.ts
@@ -0,0 +1,90 @@
+import * as Sequelize from 'sequelize'
+async function up (utils: {
+  transaction: Sequelize.Transaction
+  queryInterface: Sequelize.QueryInterface
+  sequelize: Sequelize.Sequelize
+}): Promise<void> {
+  await utils.queryInterface.renameTable('videoAbuse', 'abuse')
+  await utils.sequelize.query(`
+    ALTER TABLE "abuse"
+    ADD COLUMN "flaggedAccountId" INTEGER REFERENCES "account" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+  `)
+  await utils.sequelize.query(`
+    UPDATE "abuse" SET "videoId" = NULL
+    WHERE "videoId" NOT IN (SELECT "id" FROM "video")
+  `)
+  await utils.sequelize.query(`
+    UPDATE "abuse" SET "flaggedAccountId" = "videoChannel"."accountId"
+    FROM "video" INNER JOIN "videoChannel" ON "video"."channelId" = "videoChannel"."id"
+    WHERE "abuse"."videoId" = "video"."id"
+  `)
+  await utils.sequelize.query('DROP INDEX IF EXISTS video_abuse_video_id;')
+  await utils.sequelize.query('DROP INDEX IF EXISTS video_abuse_reporter_account_id;')
+  await utils.sequelize.query(`
+    CREATE TABLE IF NOT EXISTS "videoAbuse" (
+      "id" serial,
+      "startAt" integer DEFAULT NULL,
+      "endAt" integer DEFAULT NULL,
+      "deletedVideo" jsonb DEFAULT NULL,
+      "abuseId" integer NOT NULL REFERENCES "abuse" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+      "videoId" integer REFERENCES "video" ("id") ON DELETE SET NULL ON UPDATE CASCADE,
+      "createdAt" TIMESTAMP WITH time zone NOT NULL,
+      "updatedAt" timestamp WITH time zone NOT NULL,
+      PRIMARY KEY ("id")
+    );
+  `)
+  await utils.sequelize.query(`
+    CREATE TABLE IF NOT EXISTS "commentAbuse" (
+      "id" serial,
+      "abuseId" integer NOT NULL REFERENCES "abuse" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+      "videoCommentId" integer REFERENCES "videoComment" ("id") ON DELETE SET NULL ON UPDATE CASCADE,
+      "createdAt" timestamp WITH time zone NOT NULL,
+      "updatedAt" timestamp WITH time zone NOT NULL,
+      PRIMARY KEY ("id")
+    );
+  `)
+  await utils.sequelize.query(`
+      INSERT INTO "videoAbuse" ("startAt", "endAt", "deletedVideo", "abuseId", "videoId", "createdAt", "updatedAt")
+      SELECT "abuse"."startAt", "abuse"."endAt", "abuse"."deletedVideo", "abuse"."id", "abuse"."videoId",
+      "abuse"."createdAt", "abuse"."updatedAt"
+      FROM "abuse"
+  `)
+  await utils.queryInterface.removeColumn('abuse', 'startAt')
+  await utils.queryInterface.removeColumn('abuse', 'endAt')
+  await utils.queryInterface.removeColumn('abuse', 'deletedVideo')
+  await utils.queryInterface.removeColumn('abuse', 'videoId')
+  await utils.sequelize.query('DROP INDEX IF EXISTS user_notification_video_abuse_id')
+  await utils.queryInterface.renameColumn('userNotification', 'videoAbuseId', 'abuseId')
+  await utils.sequelize.query(
+    'ALTER TABLE "userNotification" RENAME CONSTRAINT "userNotification_videoAbuseId_fkey" TO "userNotification_abuseId_fkey"'
+  )
+  await utils.sequelize.query(
+    'ALTER TABLE "abuse" RENAME CONSTRAINT "videoAbuse_reporterAccountId_fkey" TO "abuse_reporterAccountId_fkey"'
+  )
+  await utils.sequelize.query(
+    'ALTER INDEX IF EXISTS "videoAbuse_pkey" RENAME TO "abuse_pkey"'
+  )
+  await utils.queryInterface.renameColumn('userNotificationSetting', 'videoAbuseAsModerator', 'abuseAsModerator')
+}
+function down (options) {
+  throw new Error('Not implemented.')
+}
+export {
+  up,
+  down
+}
diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts
index 1d7132a3a..6350cee12 100644
--- a/server/lib/activitypub/process/process-flag.ts
+++ b/server/lib/activitypub/process/process-flag.ts
@@ -1,24 +1,19 @@
-import {
+import { createAccountAbuse, createVideoAbuse, createVideoCommentAbuse } from '@server/lib/moderation'
-  ActivityCreate,
+import { AccountModel } from '@server/models/account/account'
-  ActivityFlag,
+import { VideoModel } from '@server/models/video/video'
-  VideoAbuseState,
+import { VideoCommentModel } from '@server/models/video/video-comment'
-  videoAbusePredefinedReasonsMap
+import { AbuseObject, abusePredefinedReasonsMap, AbuseState, ActivityCreate, ActivityFlag } from '../../../../shared'
-} from '../../../../shared'
+import { getAPId } from '../../../helpers/activitypub'
-import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects'
 import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { logger } from '../../../helpers/logger'
 import { sequelizeTypescript } from '../../../initializers/database'
-import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { getOrCreateVideoAndAccountAndChannel } from '../videos'
-import { Notifier } from '../../notifier'
-import { getAPId } from '../../../helpers/activitypub'
 import { APProcessorOptions } from '../../../types/activitypub-processor.model'
-import { MActorSignature, MVideoAbuseAccountVideo } from '../../../types/models'
+import { MAccountDefault, MActorSignature, MCommentOwnerVideo } from '../../../types/models'
-import { AccountModel } from '@server/models/account/account'
 async function processFlagActivity (options: APProcessorOptions<ActivityCreate | ActivityFlag>) {
  const { activity, byActor } = options
-  return retryTransactionWrapper(processCreateVideoAbuse, activity, byActor)
+  return retryTransactionWrapper(processCreateAbuse, activity, byActor)
 }
 // ---------------------------------------------------------------------------
@@ -29,55 +24,79 @@ export {
 // ---------------------------------------------------------------------------
-async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, byActor: MActorSignature) {
+async function processCreateAbuse (activity: ActivityCreate | ActivityFlag, byActor: MActorSignature) {
-  const flag = activity.type === 'Flag' ? activity : (activity.object as VideoAbuseObject)
+  const flag = activity.type === 'Flag' ? activity : (activity.object as AbuseObject)
  const account = byActor.Account
-  if (!account) throw new Error('Cannot create video abuse with the non account actor ' + byActor.url)
+  if (!account) throw new Error('Cannot create abuse with the non account actor ' + byActor.url)
+  const reporterAccount = await AccountModel.load(account.id)
  const objects = Array.isArray(flag.object) ? flag.object : [ flag.object ]
+  const tags = Array.isArray(flag.tag) ? flag.tag : []
+  const predefinedReasons = tags.map(tag => abusePredefinedReasonsMap[tag.name])
+                                .filter(v => !isNaN(v))
+  const startAt = flag.startAt
+  const endAt = flag.endAt
  for (const object of objects) {
    try {
-      logger.debug('Reporting remote abuse for video %s.', getAPId(object))
+      const uri = getAPId(object)
-      const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: object })
-      const reporterAccount = await sequelizeTypescript.transaction(async t => AccountModel.load(account.id, t))
-      const tags = Array.isArray(flag.tag) ? flag.tag : []
-      const predefinedReasons = tags.map(tag => videoAbusePredefinedReasonsMap[tag.name])
-                                    .filter(v => !isNaN(v))
-      const startAt = flag.startAt
-      const endAt = flag.endAt
-      const videoAbuseInstance = await sequelizeTypescript.transaction(async t => {
-        const videoAbuseData = {
-          reporterAccountId: account.id,
-          reason: flag.content,
-          videoId: video.id,
-          state: VideoAbuseState.PENDING,
-          predefinedReasons,
-          startAt,
-          endAt
-        }
-        const videoAbuseInstance: MVideoAbuseAccountVideo = await VideoAbuseModel.create(videoAbuseData, { transaction: t })
+      logger.debug('Reporting remote abuse for object %s.', uri)
-        videoAbuseInstance.Video = video
-        videoAbuseInstance.Account = reporterAccount
-        logger.info('Remote abuse for video uuid %s created', flag.object)
+      await sequelizeTypescript.transaction(async t => {
-        return videoAbuseInstance
+        const video = await VideoModel.loadByUrlAndPopulateAccount(uri)
-      })
+        let videoComment: MCommentOwnerVideo
+        let flaggedAccount: MAccountDefault
+        if (!video) videoComment = await VideoCommentModel.loadByUrlAndPopulateAccountAndVideo(uri)
+        if (!videoComment) flaggedAccount = await AccountModel.loadByUrl(uri)
+        if (!video && !videoComment && !flaggedAccount) {
+          logger.warn('Cannot flag unknown entity %s.', object)
+          return
+        }
+        const baseAbuse = {
+          reporterAccountId: reporterAccount.id,
+          reason: flag.content,
+          state: AbuseState.PENDING,
+          predefinedReasons
+        }
-      const videoAbuseJSON = videoAbuseInstance.toFormattedJSON()
+        if (video) {
+          return createVideoAbuse({
+            baseAbuse,
+            startAt,
+            endAt,
+            reporterAccount,
+            transaction: t,
+            videoInstance: video
+          })
+        }
+        if (videoComment) {
+          return createVideoCommentAbuse({
+            baseAbuse,
+            reporterAccount,
+            transaction: t,
+            commentInstance: videoComment
+          })
+        }
-      Notifier.Instance.notifyOnNewVideoAbuse({
+        return await createAccountAbuse({
-        videoAbuse: videoAbuseJSON,
+          baseAbuse,
-        videoAbuseInstance,
+          reporterAccount,
-        reporter: reporterAccount.Actor.getIdentifier()
+          transaction: t,
+          accountInstance: flaggedAccount
+        })
      })
    } catch (err) {
-      logger.debug('Cannot process report of %s. (Maybe not a video abuse).', getAPId(object), { err })
+      logger.debug('Cannot process report of %s', getAPId(object), { err })
    }
  }
 }
diff --git a/server/lib/activitypub/send/send-flag.ts b/server/lib/activitypub/send/send-flag.ts
index 3a1fe0812..821637ec8 100644
--- a/server/lib/activitypub/send/send-flag.ts
+++ b/server/lib/activitypub/send/send-flag.ts
@@ -1,32 +1,31 @@
-import { getVideoAbuseActivityPubUrl } from '../url'
+import { Transaction } from 'sequelize'
-import { unicastTo } from './utils'
-import { logger } from '../../../helpers/logger'
 import { ActivityAudience, ActivityFlag } from '../../../../shared/models/activitypub'
+import { logger } from '../../../helpers/logger'
+import { MAbuseAP, MAccountLight, MActor } from '../../../types/models'
 import { audiencify, getAudience } from '../audience'
-import { Transaction } from 'sequelize'
+import { getAbuseActivityPubUrl } from '../url'
-import { MActor, MVideoFullLight } from '../../../types/models'
+import { unicastTo } from './utils'
-import { MVideoAbuseVideo } from '../../../types/models/video'
-function sendVideoAbuse (byActor: MActor, videoAbuse: MVideoAbuseVideo, video: MVideoFullLight, t: Transaction) {
+function sendAbuse (byActor: MActor, abuse: MAbuseAP, flaggedAccount: MAccountLight, t: Transaction) {
-  if (!video.VideoChannel.Account.Actor.serverId) return // Local user
+  if (!flaggedAccount.Actor.serverId) return // Local user
-  const url = getVideoAbuseActivityPubUrl(videoAbuse)
+  const url = getAbuseActivityPubUrl(abuse)
-  logger.info('Creating job to send video abuse %s.', url)
+  logger.info('Creating job to send abuse %s.', url)
  // Custom audience, we only send the abuse to the origin instance
-  const audience = { to: [ video.VideoChannel.Account.Actor.url ], cc: [] }
+  const audience = { to: [ flaggedAccount.Actor.url ], cc: [] }
-  const flagActivity = buildFlagActivity(url, byActor, videoAbuse, audience)
+  const flagActivity = buildFlagActivity(url, byActor, abuse, audience)
-  t.afterCommit(() => unicastTo(flagActivity, byActor, video.VideoChannel.Account.Actor.getSharedInbox()))
+  t.afterCommit(() => unicastTo(flagActivity, byActor, flaggedAccount.Actor.getSharedInbox()))
 }
-function buildFlagActivity (url: string, byActor: MActor, videoAbuse: MVideoAbuseVideo, audience: ActivityAudience): ActivityFlag {
+function buildFlagActivity (url: string, byActor: MActor, abuse: MAbuseAP, audience: ActivityAudience): ActivityFlag {
  if (!audience) audience = getAudience(byActor)
  const activity = Object.assign(
    { id: url, actor: byActor.url },
-    videoAbuse.toActivityPubObject()
+    abuse.toActivityPubObject()
  )
  return audiencify(activity, audience)
@@ -35,5 +34,5 @@ function buildFlagActivity (url: string, byActor: MActor, videoAbuse: MVideoAbus
 // ---------------------------------------------------------------------------
 export {
-  sendVideoAbuse
+  sendAbuse
 }
diff --git a/server/lib/activitypub/url.ts b/server/lib/activitypub/url.ts
index 7f98751a1..b54e038a4 100644
--- a/server/lib/activitypub/url.ts
+++ b/server/lib/activitypub/url.ts
@@ -5,10 +5,10 @@ import {
  MActorId,
  MActorUrl,
  MCommentId,
-  MVideoAbuseId,
  MVideoId,
  MVideoUrl,
-  MVideoUUID
+  MVideoUUID,
+  MAbuseId
 } from '../../types/models'
 import { MVideoPlaylist, MVideoPlaylistUUID } from '../../types/models/video/video-playlist'
 import { MVideoFileVideoUUID } from '../../types/models/video/video-file'
@@ -48,8 +48,8 @@ function getAccountActivityPubUrl (accountName: string) {
  return WEBSERVER.URL + '/accounts/' + accountName
 }
-function getVideoAbuseActivityPubUrl (videoAbuse: MVideoAbuseId) {
+function getAbuseActivityPubUrl (abuse: MAbuseId) {
-  return WEBSERVER.URL + '/admin/video-abuses/' + videoAbuse.id
+  return WEBSERVER.URL + '/admin/abuses/' + abuse.id
 }
 function getVideoViewActivityPubUrl (byActor: MActorUrl, video: MVideoId) {
@@ -118,7 +118,7 @@ export {
  getVideoCacheStreamingPlaylistActivityPubUrl,
  getVideoChannelActivityPubUrl,
  getAccountActivityPubUrl,
-  getVideoAbuseActivityPubUrl,
+  getAbuseActivityPubUrl,
  getActorFollowActivityPubUrl,
  getActorFollowAcceptActivityPubUrl,
  getVideoAnnounceActivityPubUrl,
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index c08732b48..d54eab966 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -1,26 +1,20 @@
+import { readFileSync } from 'fs-extra'
+import { merge } from 'lodash'
 import { createTransport, Transporter } from 'nodemailer'
+import { join } from 'path'
+import { VideoChannelModel } from '@server/models/video/video-channel'
+import { MVideoBlacklistLightVideo, MVideoBlacklistVideo } from '@server/types/models/video/video-blacklist'
+import { MVideoImport, MVideoImportVideo } from '@server/types/models/video/video-import'
+import { Abuse, EmailPayload } from '@shared/models'
+import { SendEmailOptions } from '../../shared/models/server/emailer.model'
 import { isTestInstance, root } from '../helpers/core-utils'
 import { bunyanLogger, logger } from '../helpers/logger'
 import { CONFIG, isEmailEnabled } from '../initializers/config'
-import { JobQueue } from './job-queue'
-import { readFileSync } from 'fs-extra'
 import { WEBSERVER } from '../initializers/constants'
-import {
+import { MAbuseFull, MActorFollowActors, MActorFollowFull, MUser } from '../types/models'
-  MCommentOwnerVideo,
+import { MCommentOwnerVideo, MVideo, MVideoAccountLight } from '../types/models/video'
-  MVideo,
+import { JobQueue } from './job-queue'
-  MVideoAbuseVideo,
-  MVideoAccountLight,
-  MVideoBlacklistLightVideo,
-  MVideoBlacklistVideo
-} from '../types/models/video'
-import { MActorFollowActors, MActorFollowFull, MUser } from '../types/models'
-import { MVideoImport, MVideoImportVideo } from '@server/types/models/video/video-import'
-import { EmailPayload } from '@shared/models'
-import { join } from 'path'
-import { VideoAbuse } from '../../shared/models/videos'
-import { SendEmailOptions } from '../../shared/models/server/emailer.model'
-import { merge } from 'lodash'
-import { VideoChannelModel } from '@server/models/video/video-channel'
 const Email = require('email-templates')
 class Emailer {
@@ -288,28 +282,74 @@ class Emailer {
    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
  }
-  addVideoAbuseModeratorsNotification (to: string[], parameters: {
+  addAbuseModeratorsNotification (to: string[], parameters: {
-    videoAbuse: VideoAbuse
+    abuse: Abuse
-    videoAbuseInstance: MVideoAbuseVideo
+    abuseInstance: MAbuseFull
    reporter: string
  }) {
-    const videoAbuseUrl = WEBSERVER.URL + '/admin/moderation/video-abuses/list?search=%23' + parameters.videoAbuse.id
+    const { abuse, abuseInstance, reporter } = parameters
-    const videoUrl = WEBSERVER.URL + parameters.videoAbuseInstance.Video.getWatchStaticPath()
-    const emailPayload: EmailPayload = {
+    const action = {
-      template: 'video-abuse-new',
+      text: 'View report #' + abuse.id,
-      to,
+      url: WEBSERVER.URL + '/admin/moderation/abuses/list?search=%23' + abuse.id
-      subject: `New video abuse report from ${parameters.reporter}`,
+    }
-      locals: {
-        videoUrl,
+    let emailPayload: EmailPayload
-        videoAbuseUrl,
-        videoCreatedAt: new Date(parameters.videoAbuseInstance.Video.createdAt).toLocaleString(),
+    if (abuseInstance.VideoAbuse) {
-        videoPublishedAt: new Date(parameters.videoAbuseInstance.Video.publishedAt).toLocaleString(),
+      const video = abuseInstance.VideoAbuse.Video
-        videoAbuse: parameters.videoAbuse,
+      const videoUrl = WEBSERVER.URL + video.getWatchStaticPath()
-        reporter: parameters.reporter,
-        action: {
+      emailPayload = {
-          text: 'View report #' + parameters.videoAbuse.id,
+        template: 'video-abuse-new',
-          url: videoAbuseUrl
+        to,
+        subject: `New video abuse report from ${reporter}`,
+        locals: {
+          videoUrl,
+          isLocal: video.remote === false,
+          videoCreatedAt: new Date(video.createdAt).toLocaleString(),
+          videoPublishedAt: new Date(video.publishedAt).toLocaleString(),
+          videoName: video.name,
+          reason: abuse.reason,
+          videoChannel: abuse.video.channel,
+          reporter,
+          action
+        }
+      }
+    } else if (abuseInstance.VideoCommentAbuse) {
+      const comment = abuseInstance.VideoCommentAbuse.VideoComment
+      const commentUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() + ';threadId=' + comment.getThreadId()
+      emailPayload = {
+        template: 'video-comment-abuse-new',
+        to,
+        subject: `New comment abuse report from ${reporter}`,
+        locals: {
+          commentUrl,
+          videoName: comment.Video.name,
+          isLocal: comment.isOwned(),
+          commentCreatedAt: new Date(comment.createdAt).toLocaleString(),
+          reason: abuse.reason,
+          flaggedAccount: abuseInstance.FlaggedAccount.getDisplayName(),
+          reporter,
+          action
+        }
+      }
+    } else {
+      const account = abuseInstance.FlaggedAccount
+      const accountUrl = account.getClientUrl()
+      emailPayload = {
+        template: 'account-abuse-new',
+        to,
+        subject: `New account abuse report from ${reporter}`,
+        locals: {
+          accountUrl,
+          accountDisplayName: account.getDisplayName(),
+          isLocal: account.isOwned(),
+          reason: abuse.reason,
+          reporter,
+          action
        }
      }
    }
diff --git a/server/lib/emails/account-abuse-new/html.pug b/server/lib/emails/account-abuse-new/html.pug
new file mode 100644
index 000000000..f1aa2886e
--- /dev/null
+++ b/server/lib/emails/account-abuse-new/html.pug
@@ -0,0 +1,14 @@
+extends ../common/greetings
+include ../common/mixins.pug
+block title
+  | An account is pending moderation
+block content
+  p
+    | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}account
+    a(href=accountUrl)  #{accountDisplayName}
+  p The reporter, #{reporter}, cited the following reason(s):
+  blockquote #{reason}
+  br(style="display: none;")
diff --git a/server/lib/emails/common/mixins.pug b/server/lib/emails/common/mixins.pug
index 76b805a24..831211864 100644
--- a/server/lib/emails/common/mixins.pug
+++ b/server/lib/emails/common/mixins.pug
@@ -1,3 +1,7 @@
 mixin channel(channel)
  - var handle = `${channel.name}@${channel.host}`
-  | #[a(href=`${WEBSERVER.URL}/video-channels/${handle}` title=handle) #{channel.displayName}]
-\ No newline at end of file
+  | #[a(href=`${WEBSERVER.URL}/video-channels/${handle}` title=handle) #{channel.displayName}]
+mixin account(account)
+  - var handle = `${account.name}@${account.host}`
+  | #[a(href=`${WEBSERVER.URL}/accounts/${handle}` title=handle) #{account.displayName}]
diff --git a/server/lib/emails/video-abuse-new/html.pug b/server/lib/emails/video-abuse-new/html.pug
index 999c89d26..a1acdabdc 100644
--- a/server/lib/emails/video-abuse-new/html.pug
+++ b/server/lib/emails/video-abuse-new/html.pug
@@ -6,13 +6,13 @@ block title
 block content
  p
-    | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{videoAbuse.video.channel.isLocal ? '' : 'remote '}video "
+    | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}video "
-    a(href=videoUrl) #{videoAbuse.video.name}
+    a(href=videoUrl) #{videoName}
-    | " by #[+channel(videoAbuse.video.channel)]
+    | " by #[+channel(videoChannel)]
    if videoPublishedAt
      | , published the #{videoPublishedAt}.
    else
      | , uploaded the #{videoCreatedAt} but not yet published.
  p The reporter, #{reporter}, cited the following reason(s):
-  blockquote #{videoAbuse.reason}
+  blockquote #{reason}
  br(style="display: none;")
diff --git a/server/lib/emails/video-comment-abuse-new/html.pug b/server/lib/emails/video-comment-abuse-new/html.pug
new file mode 100644
index 000000000..e92d986b5
--- /dev/null
+++ b/server/lib/emails/video-comment-abuse-new/html.pug
@@ -0,0 +1,16 @@
+extends ../common/greetings
+include ../common/mixins.pug
+block title
+  | A comment is pending moderation
+block content
+  p
+    | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}
+    a(href=commentUrl) comment on video "#{videoName}"
+    |  of #{flaggedAccount}
+    |  created on #{commentCreatedAt}
+  p The reporter, #{reporter}, cited the following reason(s):
+  blockquote #{reason}
+  br(style="display: none;")
diff --git a/server/lib/moderation.ts b/server/lib/moderation.ts
index 60d1b4053..4fc9cd747 100644
--- a/server/lib/moderation.ts
+++ b/server/lib/moderation.ts
@@ -1,15 +1,33 @@
-import { VideoModel } from '../models/video/video'
+import { PathLike } from 'fs-extra'
-import { VideoCommentModel } from '../models/video/video-comment'
+import { Transaction } from 'sequelize/types'
-import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model'
+import { AbuseAuditView, auditLoggerFactory } from '@server/helpers/audit-logger'
+import { logger } from '@server/helpers/logger'
+import { AbuseModel } from '@server/models/abuse/abuse'
+import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
+import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse'
+import { VideoFileModel } from '@server/models/video/video-file'
+import { FilteredModelAttributes } from '@server/types'
+import {
+  MAbuseFull,
+  MAccountDefault,
+  MAccountLight,
+  MCommentAbuseAccountVideo,
+  MCommentOwnerVideo,
+  MUser,
+  MVideoAbuseVideoFull,
+  MVideoAccountLightBlacklistAllFiles
+} from '@server/types/models'
+import { ActivityCreate } from '../../shared/models/activitypub'
+import { VideoTorrentObject } from '../../shared/models/activitypub/objects'
+import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object'
 import { VideoCreate, VideoImportCreate } from '../../shared/models/videos'
+import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model'
 import { UserModel } from '../models/account/user'
-import { VideoTorrentObject } from '../../shared/models/activitypub/objects'
-import { ActivityCreate } from '../../shared/models/activitypub'
 import { ActorModel } from '../models/activitypub/actor'
-import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object'
+import { VideoModel } from '../models/video/video'
-import { VideoFileModel } from '@server/models/video/video-file'
+import { VideoCommentModel } from '../models/video/video-comment'
-import { PathLike } from 'fs-extra'
+import { sendAbuse } from './activitypub/send/send-flag'
-import { MUser } from '@server/types/models'
+import { Notifier } from './notifier'
 export type AcceptResult = {
  accepted: boolean
@@ -73,6 +91,89 @@ function isPostImportVideoAccepted (object: {
  return { accepted: true }
 }
+async function createVideoAbuse (options: {
+  baseAbuse: FilteredModelAttributes<AbuseModel>
+  videoInstance: MVideoAccountLightBlacklistAllFiles
+  startAt: number
+  endAt: number
+  transaction: Transaction
+  reporterAccount: MAccountDefault
+}) {
+  const { baseAbuse, videoInstance, startAt, endAt, transaction, reporterAccount } = options
+  const associateFun = async (abuseInstance: MAbuseFull) => {
+    const videoAbuseInstance: MVideoAbuseVideoFull = await VideoAbuseModel.create({
+      abuseId: abuseInstance.id,
+      videoId: videoInstance.id,
+      startAt: startAt,
+      endAt: endAt
+    }, { transaction })
+    videoAbuseInstance.Video = videoInstance
+    abuseInstance.VideoAbuse = videoAbuseInstance
+    return { isOwned: videoInstance.isOwned() }
+  }
+  return createAbuse({
+    base: baseAbuse,
+    reporterAccount,
+    flaggedAccount: videoInstance.VideoChannel.Account,
+    transaction,
+    associateFun
+  })
+}
+function createVideoCommentAbuse (options: {
+  baseAbuse: FilteredModelAttributes<AbuseModel>
+  commentInstance: MCommentOwnerVideo
+  transaction: Transaction
+  reporterAccount: MAccountDefault
+}) {
+  const { baseAbuse, commentInstance, transaction, reporterAccount } = options
+  const associateFun = async (abuseInstance: MAbuseFull) => {
+    const commentAbuseInstance: MCommentAbuseAccountVideo = await VideoCommentAbuseModel.create({
+      abuseId: abuseInstance.id,
+      videoCommentId: commentInstance.id
+    }, { transaction })
+    commentAbuseInstance.VideoComment = commentInstance
+    abuseInstance.VideoCommentAbuse = commentAbuseInstance
+    return { isOwned: commentInstance.isOwned() }
+  }
+  return createAbuse({
+    base: baseAbuse,
+    reporterAccount,
+    flaggedAccount: commentInstance.Account,
+    transaction,
+    associateFun
+  })
+}
+function createAccountAbuse (options: {
+  baseAbuse: FilteredModelAttributes<AbuseModel>
+  accountInstance: MAccountDefault
+  transaction: Transaction
+  reporterAccount: MAccountDefault
+}) {
+  const { baseAbuse, accountInstance, transaction, reporterAccount } = options
+  const associateFun = async () => {
+    return { isOwned: accountInstance.isOwned() }
+  }
+  return createAbuse({
+    base: baseAbuse,
+    reporterAccount,
+    flaggedAccount: accountInstance,
+    transaction,
+    associateFun
+  })
+}
 export {
  isLocalVideoAccepted,
  isLocalVideoThreadAccepted,
@@ -80,5 +181,48 @@ export {
  isRemoteVideoCommentAccepted,
  isLocalVideoCommentReplyAccepted,
  isPreImportVideoAccepted,
-  isPostImportVideoAccepted
+  isPostImportVideoAccepted,
+  createAbuse,
+  createVideoAbuse,
+  createVideoCommentAbuse,
+  createAccountAbuse
+}
+// ---------------------------------------------------------------------------
+async function createAbuse (options: {
+  base: FilteredModelAttributes<AbuseModel>
+  reporterAccount: MAccountDefault
+  flaggedAccount: MAccountLight
+  associateFun: (abuseInstance: MAbuseFull) => Promise<{ isOwned: boolean} >
+  transaction: Transaction
+}) {
+  const { base, reporterAccount, flaggedAccount, associateFun, transaction } = options
+  const auditLogger = auditLoggerFactory('abuse')
+  const abuseAttributes = Object.assign({}, base, { flaggedAccountId: flaggedAccount.id })
+  const abuseInstance: MAbuseFull = await AbuseModel.create(abuseAttributes, { transaction })
+  abuseInstance.ReporterAccount = reporterAccount
+  abuseInstance.FlaggedAccount = flaggedAccount
+  const { isOwned } = await associateFun(abuseInstance)
+  if (isOwned === false) {
+    await sendAbuse(reporterAccount.Actor, abuseInstance, abuseInstance.FlaggedAccount, transaction)
+  }
+  const abuseJSON = abuseInstance.toFormattedJSON()
+  auditLogger.create(reporterAccount.Actor.getIdentifier(), new AbuseAuditView(abuseJSON))
+  Notifier.Instance.notifyOnNewAbuse({
+    abuse: abuseJSON,
+    abuseInstance,
+    reporter: reporterAccount.Actor.getIdentifier()
+  })
+  logger.info('Abuse report %d created.', abuseInstance.id)
+  return abuseJSON
 }
diff --git a/server/lib/notifier.ts b/server/lib/notifier.ts
index 943a087d2..c567e1c20 100644
--- a/server/lib/notifier.ts
+++ b/server/lib/notifier.ts
@@ -8,23 +8,18 @@ import {
  MUserWithNotificationSetting,
  UserNotificationModelForApi
 } from '@server/types/models/user'
+import { MVideoBlacklistLightVideo, MVideoBlacklistVideo } from '@server/types/models/video/video-blacklist'
 import { MVideoImportVideo } from '@server/types/models/video/video-import'
+import { Abuse } from '@shared/models'
 import { UserNotificationSettingValue, UserNotificationType, UserRight } from '../../shared/models/users'
-import { VideoAbuse, VideoPrivacy, VideoState } from '../../shared/models/videos'
+import { VideoPrivacy, VideoState } from '../../shared/models/videos'
 import { logger } from '../helpers/logger'
 import { CONFIG } from '../initializers/config'
 import { AccountBlocklistModel } from '../models/account/account-blocklist'
 import { UserModel } from '../models/account/user'
 import { UserNotificationModel } from '../models/account/user-notification'
-import { MAccountServer, MActorFollowFull } from '../types/models'
+import { MAbuseFull, MAccountServer, MActorFollowFull } from '../types/models'
-import {
+import { MCommentOwnerVideo, MVideoAccountLight, MVideoFullLight } from '../types/models/video'
-  MCommentOwnerVideo,
-  MVideoAbuseVideo,
-  MVideoAccountLight,
-  MVideoBlacklistLightVideo,
-  MVideoBlacklistVideo,
-  MVideoFullLight
-} from '../types/models/video'
 import { isBlockedByServerOrAccount } from './blocklist'
 import { Emailer } from './emailer'
 import { PeerTubeSocket } from './peertube-socket'
@@ -78,9 +73,9 @@ class Notifier {
        .catch(err => logger.error('Cannot notify mentions of comment %s.', comment.url, { err }))
  }
-  notifyOnNewVideoAbuse (parameters: { videoAbuse: VideoAbuse, videoAbuseInstance: MVideoAbuseVideo, reporter: string }): void {
+  notifyOnNewAbuse (parameters: { abuse: Abuse, abuseInstance: MAbuseFull, reporter: string }): void {
-    this.notifyModeratorsOfNewVideoAbuse(parameters)
+    this.notifyModeratorsOfNewAbuse(parameters)
-        .catch(err => logger.error('Cannot notify of new video abuse of video %s.', parameters.videoAbuseInstance.Video.url, { err }))
+        .catch(err => logger.error('Cannot notify of new abuse %d.', parameters.abuseInstance.id, { err }))
  }
  notifyOnVideoAutoBlacklist (videoBlacklist: MVideoBlacklistLightVideo): void {
@@ -354,33 +349,39 @@ class Notifier {
    return this.notify({ users: admins, settingGetter, notificationCreator, emailSender })
  }
-  private async notifyModeratorsOfNewVideoAbuse (parameters: {
+  private async notifyModeratorsOfNewAbuse (parameters: {
-    videoAbuse: VideoAbuse
+    abuse: Abuse
-    videoAbuseInstance: MVideoAbuseVideo
+    abuseInstance: MAbuseFull
    reporter: string
  }) {
-    const moderators = await UserModel.listWithRight(UserRight.MANAGE_VIDEO_ABUSES)
+    const { abuse, abuseInstance } = parameters
+    const moderators = await UserModel.listWithRight(UserRight.MANAGE_ABUSES)
    if (moderators.length === 0) return
-    logger.info('Notifying %s user/moderators of new video abuse %s.', moderators.length, parameters.videoAbuseInstance.Video.url)
+    const url = abuseInstance.VideoAbuse?.Video?.url ||
+                abuseInstance.VideoCommentAbuse?.VideoComment?.url ||
+                abuseInstance.FlaggedAccount.Actor.url
+    logger.info('Notifying %s user/moderators of new abuse %s.', moderators.length, url)
    function settingGetter (user: MUserWithNotificationSetting) {
-      return user.NotificationSetting.videoAbuseAsModerator
+      return user.NotificationSetting.abuseAsModerator
    }
    async function notificationCreator (user: MUserWithNotificationSetting) {
-      const notification: UserNotificationModelForApi = await UserNotificationModel.create<UserNotificationModelForApi>({
+      const notification = await UserNotificationModel.create<UserNotificationModelForApi>({
-        type: UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS,
+        type: UserNotificationType.NEW_ABUSE_FOR_MODERATORS,
        userId: user.id,
-        videoAbuseId: parameters.videoAbuse.id
+        abuseId: abuse.id
      })
-      notification.VideoAbuse = parameters.videoAbuseInstance
+      notification.Abuse = abuseInstance
      return notification
    }
    function emailSender (emails: string[]) {
-      return Emailer.Instance.addVideoAbuseModeratorsNotification(emails, parameters)
+      return Emailer.Instance.addAbuseModeratorsNotification(emails, parameters)
    }
    return this.notify({ users: moderators, settingGetter, notificationCreator, emailSender })
diff --git a/server/lib/user.ts b/server/lib/user.ts
index 43eef8ab1..642549879 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -133,7 +133,7 @@ function createDefaultUserNotificationSettings (user: MUserId, t: Transaction |
    newCommentOnMyVideo: UserNotificationSettingValue.WEB,
    myVideoImportFinished: UserNotificationSettingValue.WEB,
    myVideoPublished: UserNotificationSettingValue.WEB,
-    videoAbuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
+    abuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
    videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
    blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
    newUserRegistration: UserNotificationSettingValue.WEB,
diff --git a/server/middlewares/validators/abuse.ts b/server/middlewares/validators/abuse.ts
new file mode 100644
index 000000000..966d1f7fb
--- /dev/null
+++ b/server/middlewares/validators/abuse.ts
@@ -0,0 +1,277 @@
+import * as express from 'express'
+import { body, param, query } from 'express-validator'
+import {
+  isAbuseFilterValid,
+  isAbuseModerationCommentValid,
+  isAbusePredefinedReasonsValid,
+  isAbusePredefinedReasonValid,
+  isAbuseReasonValid,
+  isAbuseStateValid,
+  isAbuseTimestampCoherent,
+  isAbuseTimestampValid,
+  isAbuseVideoIsValid
+} from '@server/helpers/custom-validators/abuses'
+import { exists, isIdOrUUIDValid, isIdValid, toIntOrNull } from '@server/helpers/custom-validators/misc'
+import { doesCommentIdExist } from '@server/helpers/custom-validators/video-comments'
+import { logger } from '@server/helpers/logger'
+import { doesAbuseExist, doesAccountIdExist, doesVideoAbuseExist, doesVideoExist } from '@server/helpers/middlewares'
+import { AbuseCreate } from '@shared/models'
+import { areValidationErrors } from './utils'
+const abuseReportValidator = [
+  body('account.id')
+    .optional()
+    .custom(isIdValid)
+    .withMessage('Should have a valid accountId'),
+  body('video.id')
+    .optional()
+    .custom(isIdOrUUIDValid)
+    .withMessage('Should have a valid videoId'),
+  body('video.startAt')
+    .optional()
+    .customSanitizer(toIntOrNull)
+    .custom(isAbuseTimestampValid)
+    .withMessage('Should have valid starting time value'),
+  body('video.endAt')
+    .optional()
+    .customSanitizer(toIntOrNull)
+    .custom(isAbuseTimestampValid)
+    .withMessage('Should have valid ending time value')
+    .bail()
+    .custom(isAbuseTimestampCoherent)
+    .withMessage('Should have a startAt timestamp beginning before endAt'),
+  body('comment.id')
+    .optional()
+    .custom(isIdValid)
+    .withMessage('Should have a valid commentId'),
+  body('reason')
+    .custom(isAbuseReasonValid)
+    .withMessage('Should have a valid reason'),
+  body('predefinedReasons')
+    .optional()
+    .custom(isAbusePredefinedReasonsValid)
+    .withMessage('Should have a valid list of predefined reasons'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking abuseReport parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    const body: AbuseCreate = req.body
+    if (body.video?.id && !await doesVideoExist(body.video.id, res)) return
+    if (body.account?.id && !await doesAccountIdExist(body.account.id, res)) return
+    if (body.comment?.id && !await doesCommentIdExist(body.comment.id, res)) return
+    if (!body.video?.id && !body.account?.id && !body.comment?.id) {
+      res.status(400)
+        .json({ error: 'video id or account id or comment id is required.' })
+      return
+    }
+    return next()
+  }
+]
+const abuseGetValidator = [
+  param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking abuseGetValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    if (!await doesAbuseExist(req.params.id, res)) return
+    return next()
+  }
+]
+const abuseUpdateValidator = [
+  param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
+  body('state')
+    .optional()
+    .custom(isAbuseStateValid).withMessage('Should have a valid abuse state'),
+  body('moderationComment')
+    .optional()
+    .custom(isAbuseModerationCommentValid).withMessage('Should have a valid moderation comment'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking abuseUpdateValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    if (!await doesAbuseExist(req.params.id, res)) return
+    return next()
+  }
+]
+const abuseListValidator = [
+  query('id')
+    .optional()
+    .custom(isIdValid).withMessage('Should have a valid id'),
+  query('filter')
+    .optional()
+    .custom(isAbuseFilterValid)
+    .withMessage('Should have a valid filter'),
+  query('predefinedReason')
+    .optional()
+    .custom(isAbusePredefinedReasonValid)
+    .withMessage('Should have a valid predefinedReason'),
+  query('search')
+    .optional()
+    .custom(exists).withMessage('Should have a valid search'),
+  query('state')
+    .optional()
+    .custom(isAbuseStateValid).withMessage('Should have a valid abuse state'),
+  query('videoIs')
+    .optional()
+    .custom(isAbuseVideoIsValid).withMessage('Should have a valid "video is" attribute'),
+  query('searchReporter')
+    .optional()
+    .custom(exists).withMessage('Should have a valid reporter search'),
+  query('searchReportee')
+    .optional()
+    .custom(exists).withMessage('Should have a valid reportee search'),
+  query('searchVideo')
+    .optional()
+    .custom(exists).withMessage('Should have a valid video search'),
+  query('searchVideoChannel')
+    .optional()
+    .custom(exists).withMessage('Should have a valid video channel search'),
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking abuseListValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    return next()
+  }
+]
+// FIXME: deprecated in 2.3. Remove these validators
+const videoAbuseReportValidator = [
+  param('videoId')
+    .custom(isIdOrUUIDValid)
+    .not()
+    .isEmpty()
+    .withMessage('Should have a valid videoId'),
+  body('reason')
+    .custom(isAbuseReasonValid)
+    .withMessage('Should have a valid reason'),
+  body('predefinedReasons')
+    .optional()
+    .custom(isAbusePredefinedReasonsValid)
+    .withMessage('Should have a valid list of predefined reasons'),
+  body('startAt')
+    .optional()
+    .customSanitizer(toIntOrNull)
+    .custom(isAbuseTimestampValid)
+    .withMessage('Should have valid starting time value'),
+  body('endAt')
+    .optional()
+    .customSanitizer(toIntOrNull)
+    .custom(isAbuseTimestampValid)
+    .withMessage('Should have valid ending time value'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking videoAbuseReport parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    if (!await doesVideoExist(req.params.videoId, res)) return
+    return next()
+  }
+]
+const videoAbuseGetValidator = [
+  param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
+  param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking videoAbuseGetValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    if (!await doesVideoAbuseExist(req.params.id, req.params.videoId, res)) return
+    return next()
+  }
+]
+const videoAbuseUpdateValidator = [
+  param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
+  param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
+  body('state')
+    .optional()
+    .custom(isAbuseStateValid).withMessage('Should have a valid video abuse state'),
+  body('moderationComment')
+    .optional()
+    .custom(isAbuseModerationCommentValid).withMessage('Should have a valid video moderation comment'),
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking videoAbuseUpdateValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    if (!await doesVideoAbuseExist(req.params.id, req.params.videoId, res)) return
+    return next()
+  }
+]
+const videoAbuseListValidator = [
+  query('id')
+    .optional()
+    .custom(isIdValid).withMessage('Should have a valid id'),
+  query('predefinedReason')
+    .optional()
+    .custom(isAbusePredefinedReasonValid)
+    .withMessage('Should have a valid predefinedReason'),
+  query('search')
+    .optional()
+    .custom(exists).withMessage('Should have a valid search'),
+  query('state')
+    .optional()
+    .custom(isAbuseStateValid).withMessage('Should have a valid video abuse state'),
+  query('videoIs')
+    .optional()
+    .custom(isAbuseVideoIsValid).withMessage('Should have a valid "video is" attribute'),
+  query('searchReporter')
+    .optional()
+    .custom(exists).withMessage('Should have a valid reporter search'),
+  query('searchReportee')
+    .optional()
+    .custom(exists).withMessage('Should have a valid reportee search'),
+  query('searchVideo')
+    .optional()
+    .custom(exists).withMessage('Should have a valid video search'),
+  query('searchVideoChannel')
+    .optional()
+    .custom(exists).withMessage('Should have a valid video channel search'),
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking videoAbuseListValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+    return next()
+  }
+]
+// ---------------------------------------------------------------------------
+export {
+  abuseListValidator,
+  abuseReportValidator,
+  abuseGetValidator,
+  abuseUpdateValidator,
+  videoAbuseReportValidator,
+  videoAbuseGetValidator,
+  videoAbuseUpdateValidator,
+  videoAbuseListValidator
+}
diff --git a/server/middlewares/validators/index.ts b/server/middlewares/validators/index.ts
index 65dd00335..4086d77aa 100644
--- a/server/middlewares/validators/index.ts
+++ b/server/middlewares/validators/index.ts
@@ -1,3 +1,4 @@
+export * from './abuse'
 export * from './account'
 export * from './blocklist'
 export * from './oembed'
diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts
index b76dab722..29aba0436 100644
--- a/server/middlewares/validators/sort.ts
+++ b/server/middlewares/validators/sort.ts
@@ -5,7 +5,7 @@ import { checkSort, createSortableColumns } from './utils'
 const SORTABLE_USERS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.USERS)
 const SORTABLE_ACCOUNTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.ACCOUNTS)
 const SORTABLE_JOBS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.JOBS)
-const SORTABLE_VIDEO_ABUSES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_ABUSES)
+const SORTABLE_ABUSES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.ABUSES)
 const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS)
 const SORTABLE_VIDEOS_SEARCH_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS_SEARCH)
 const SORTABLE_VIDEO_CHANNELS_SEARCH_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_CHANNELS_SEARCH)
@@ -28,7 +28,7 @@ const SORTABLE_VIDEO_REDUNDANCIES_COLUMNS = createSortableColumns(SORTABLE_COLUM
 const usersSortValidator = checkSort(SORTABLE_USERS_COLUMNS)
 const accountsSortValidator = checkSort(SORTABLE_ACCOUNTS_COLUMNS)
 const jobsSortValidator = checkSort(SORTABLE_JOBS_COLUMNS)
-const videoAbusesSortValidator = checkSort(SORTABLE_VIDEO_ABUSES_COLUMNS)
+const abusesSortValidator = checkSort(SORTABLE_ABUSES_COLUMNS)
 const videosSortValidator = checkSort(SORTABLE_VIDEOS_COLUMNS)
 const videoImportsSortValidator = checkSort(SORTABLE_VIDEO_IMPORTS_COLUMNS)
 const videosSearchSortValidator = checkSort(SORTABLE_VIDEOS_SEARCH_COLUMNS)
@@ -52,7 +52,7 @@ const videoRedundanciesSortValidator = checkSort(SORTABLE_VIDEO_REDUNDANCIES_COL
 export {
  usersSortValidator,
-  videoAbusesSortValidator,
+  abusesSortValidator,
  videoChannelsSortValidator,
  videoImportsSortValidator,
  videosSearchSortValidator,
diff --git a/server/middlewares/validators/user-notifications.ts b/server/middlewares/validators/user-notifications.ts
index fbfcb0a4c..21a7be08d 100644
--- a/server/middlewares/validators/user-notifications.ts
+++ b/server/middlewares/validators/user-notifications.ts
@@ -25,8 +25,8 @@ const updateNotificationSettingsValidator = [
    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new video from subscription notification setting'),
  body('newCommentOnMyVideo')
    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new comment on my video notification setting'),
-  body('videoAbuseAsModerator')
+  body('abuseAsModerator')
-    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new video abuse as moderator notification setting'),
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid abuse as moderator notification setting'),
  body('videoAutoBlacklistAsModerator')
    .custom(isUserNotificationSettingValid).withMessage('Should have a valid video auto blacklist notification setting'),
  body('blacklistOnMyVideo')
diff --git a/server/middlewares/validators/videos/index.ts b/server/middlewares/validators/videos/index.ts
index a0d585b93..1eabada0a 100644
--- a/server/middlewares/validators/videos/index.ts
+++ b/server/middlewares/validators/videos/index.ts
@@ -1,4 +1,3 @@
-export * from './video-abuses'
 export * from './video-blacklist'
 export * from './video-captions'
 export * from './video-channels'
diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts
deleted file mode 100644
index 5bbd1e3c6..000000000
--- a/server/middlewares/validators/videos/video-abuses.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import * as express from 'express'
-import { body, param, query } from 'express-validator'
-import { exists, isIdOrUUIDValid, isIdValid, toIntOrNull } from '../../../helpers/custom-validators/misc'
-import {
-  isAbuseVideoIsValid,
-  isVideoAbuseModerationCommentValid,
-  isVideoAbuseReasonValid,
-  isVideoAbuseStateValid,
-  isVideoAbusePredefinedReasonsValid,
-  isVideoAbusePredefinedReasonValid,
-  isVideoAbuseTimestampValid,
-  isVideoAbuseTimestampCoherent
-} from '../../../helpers/custom-validators/video-abuses'
-import { logger } from '../../../helpers/logger'
-import { doesVideoAbuseExist, doesVideoExist } from '../../../helpers/middlewares'
-import { areValidationErrors } from '../utils'
-const videoAbuseReportValidator = [
-  param('videoId')
-    .custom(isIdOrUUIDValid)
-    .not()
-    .isEmpty()
-    .withMessage('Should have a valid videoId'),
-  body('reason')
-    .custom(isVideoAbuseReasonValid)
-    .withMessage('Should have a valid reason'),
-  body('predefinedReasons')
-    .optional()
-    .custom(isVideoAbusePredefinedReasonsValid)
-    .withMessage('Should have a valid list of predefined reasons'),
-  body('startAt')
-    .optional()
-    .customSanitizer(toIntOrNull)
-    .custom(isVideoAbuseTimestampValid)
-    .withMessage('Should have valid starting time value'),
-  body('endAt')
-    .optional()
-    .customSanitizer(toIntOrNull)
-    .custom(isVideoAbuseTimestampValid)
-    .withMessage('Should have valid ending time value')
-    .bail()
-    .custom(isVideoAbuseTimestampCoherent)
-    .withMessage('Should have a startAt timestamp beginning before endAt'),
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoAbuseReport parameters', { parameters: req.body })
-    if (areValidationErrors(req, res)) return
-    if (!await doesVideoExist(req.params.videoId, res)) return
-    return next()
-  }
-]
-const videoAbuseGetValidator = [
-  param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
-  param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoAbuseGetValidator parameters', { parameters: req.body })
-    if (areValidationErrors(req, res)) return
-    if (!await doesVideoAbuseExist(req.params.id, req.params.videoId, res)) return
-    return next()
-  }
-]
-const videoAbuseUpdateValidator = [
-  param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
-  param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
-  body('state')
-    .optional()
-    .custom(isVideoAbuseStateValid).withMessage('Should have a valid video abuse state'),
-  body('moderationComment')
-    .optional()
-    .custom(isVideoAbuseModerationCommentValid).withMessage('Should have a valid video moderation comment'),
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoAbuseUpdateValidator parameters', { parameters: req.body })
-    if (areValidationErrors(req, res)) return
-    if (!await doesVideoAbuseExist(req.params.id, req.params.videoId, res)) return
-    return next()
-  }
-]
-const videoAbuseListValidator = [
-  query('id')
-    .optional()
-    .custom(isIdValid).withMessage('Should have a valid id'),
-  query('predefinedReason')
-    .optional()
-    .custom(isVideoAbusePredefinedReasonValid)
-    .withMessage('Should have a valid predefinedReason'),
-  query('search')
-    .optional()
-    .custom(exists).withMessage('Should have a valid search'),
-  query('state')
-    .optional()
-    .custom(isVideoAbuseStateValid).withMessage('Should have a valid video abuse state'),
-  query('videoIs')
-    .optional()
-    .custom(isAbuseVideoIsValid).withMessage('Should have a valid "video is" attribute'),
-  query('searchReporter')
-    .optional()
-    .custom(exists).withMessage('Should have a valid reporter search'),
-  query('searchReportee')
-    .optional()
-    .custom(exists).withMessage('Should have a valid reportee search'),
-  query('searchVideo')
-    .optional()
-    .custom(exists).withMessage('Should have a valid video search'),
-  query('searchVideoChannel')
-    .optional()
-    .custom(exists).withMessage('Should have a valid video channel search'),
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoAbuseListValidator parameters', { parameters: req.body })
-    if (areValidationErrors(req, res)) return
-    return next()
-  }
-]
-// ---------------------------------------------------------------------------
-export {
-  videoAbuseListValidator,
-  videoAbuseReportValidator,
-  videoAbuseGetValidator,
-  videoAbuseUpdateValidator
-}
diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts
index ef019fcf9..77f5c6ff3 100644
--- a/server/middlewares/validators/videos/video-comments.ts
+++ b/server/middlewares/validators/videos/video-comments.ts
@@ -3,13 +3,16 @@ import { body, param } from 'express-validator'
 import { MUserAccountUrl } from '@server/types/models'
 import { UserRight } from '../../../../shared'
 import { isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc'
-import { isValidVideoCommentText } from '../../../helpers/custom-validators/video-comments'
+import {
+  doesVideoCommentExist,
+  doesVideoCommentThreadExist,
+  isValidVideoCommentText
+} from '../../../helpers/custom-validators/video-comments'
 import { logger } from '../../../helpers/logger'
 import { doesVideoExist } from '../../../helpers/middlewares'
 import { AcceptResult, isLocalVideoCommentReplyAccepted, isLocalVideoThreadAccepted } from '../../../lib/moderation'
 import { Hooks } from '../../../lib/plugins/hooks'
-import { VideoCommentModel } from '../../../models/video/video-comment'
+import { MCommentOwnerVideoReply, MVideo, MVideoFullLight } from '../../../types/models/video'
-import { MCommentOwnerVideoReply, MVideo, MVideoFullLight, MVideoId } from '../../../types/models/video'
 import { areValidationErrors } from '../utils'
 const listVideoCommentThreadsValidator = [
@@ -120,67 +123,10 @@ export {
 // ---------------------------------------------------------------------------
-async function doesVideoCommentThreadExist (idArg: number | string, video: MVideoId, res: express.Response) {
-  const id = parseInt(idArg + '', 10)
-  const videoComment = await VideoCommentModel.loadById(id)
-  if (!videoComment) {
-    res.status(404)
-      .json({ error: 'Video comment thread not found' })
-      .end()
-    return false
-  }
-  if (videoComment.videoId !== video.id) {
-    res.status(400)
-      .json({ error: 'Video comment is not associated to this video.' })
-      .end()
-    return false
-  }
-  if (videoComment.inReplyToCommentId !== null) {
-    res.status(400)
-      .json({ error: 'Video comment is not a thread.' })
-      .end()
-    return false
-  }
-  res.locals.videoCommentThread = videoComment
-  return true
-}
-async function doesVideoCommentExist (idArg: number | string, video: MVideoId, res: express.Response) {
-  const id = parseInt(idArg + '', 10)
-  const videoComment = await VideoCommentModel.loadByIdAndPopulateVideoAndAccountAndReply(id)
-  if (!videoComment) {
-    res.status(404)
-      .json({ error: 'Video comment thread not found' })
-      .end()
-    return false
-  }
-  if (videoComment.videoId !== video.id) {
-    res.status(400)
-      .json({ error: 'Video comment is not associated to this video.' })
-      .end()
-    return false
-  }
-  res.locals.videoCommentFull = videoComment
-  return true
-}
 function isVideoCommentsEnabled (video: MVideo, res: express.Response) {
  if (video.commentsEnabled !== true) {
    res.status(409)
      .json({ error: 'Video comments are disabled for this video.' })
-      .end()
    return false
  }
@@ -192,7 +138,7 @@ function checkUserCanDeleteVideoComment (user: MUserAccountUrl, videoComment: MC
  if (videoComment.isDeleted()) {
    res.status(409)
      .json({ error: 'This comment is already deleted' })
-      .end()
    return false
  }
@@ -240,7 +186,7 @@ async function isVideoCommentAccepted (req: express.Request, res: express.Respon
  if (!acceptedResult || acceptedResult.accepted !== true) {
    logger.info('Refused local comment.', { acceptedResult, acceptParameters })
    res.status(403)
-              .json({ error: acceptedResult.errorMessage || 'Refused local comment' })
+       .json({ error: acceptedResult.errorMessage || 'Refused local comment' })
    return false
  }
diff --git a/server/models/abuse/abuse-query-builder.ts b/server/models/abuse/abuse-query-builder.ts
new file mode 100644
index 000000000..5fddcf3c4
--- /dev/null
+++ b/server/models/abuse/abuse-query-builder.ts
@@ -0,0 +1,154 @@
+import { exists } from '@server/helpers/custom-validators/misc'
+import { AbuseFilter, AbuseState, AbuseVideoIs } from '@shared/models'
+import { buildBlockedAccountSQL, buildDirectionAndField } from '../utils'
+export type BuildAbusesQueryOptions = {
+  start: number
+  count: number
+  sort: string
+  // search
+  search?: string
+  searchReporter?: string
+  searchReportee?: string
+  // video releated
+  searchVideo?: string
+  searchVideoChannel?: string
+  videoIs?: AbuseVideoIs
+  // filters
+  id?: number
+  predefinedReasonId?: number
+  filter?: AbuseFilter
+  state?: AbuseState
+  // accountIds
+  serverAccountId: number
+  userAccountId: number
+}
+function buildAbuseListQuery (options: BuildAbusesQueryOptions, type: 'count' | 'id') {
+  const whereAnd: string[] = []
+  const replacements: any = {}
+  const joins = [
+    'LEFT JOIN "videoAbuse" ON "videoAbuse"."abuseId" = "abuse"."id"',
+    'LEFT JOIN "video" ON "videoAbuse"."videoId" = "video"."id"',
+    'LEFT JOIN "videoBlacklist" ON "videoBlacklist"."videoId" = "video"."id"',
+    'LEFT JOIN "videoChannel" ON "video"."channelId" = "videoChannel"."id"',
+    'LEFT JOIN "account" "reporterAccount" ON "reporterAccount"."id" = "abuse"."reporterAccountId"',
+    'LEFT JOIN "account" "flaggedAccount" ON "flaggedAccount"."id" = "abuse"."reporterAccountId"',
+    'LEFT JOIN "commentAbuse" ON "commentAbuse"."abuseId" = "abuse"."id"',
+    'LEFT JOIN "videoComment" ON "commentAbuse"."videoCommentId" = "videoComment"."id"'
+  ]
+  whereAnd.push('"abuse"."reporterAccountId" NOT IN (' + buildBlockedAccountSQL([ options.serverAccountId, options.userAccountId ]) + ')')
+  if (options.search) {
+    const searchWhereOr = [
+      '"video"."name" ILIKE :search',
+      '"videoChannel"."name" ILIKE :search',
+      `"videoAbuse"."deletedVideo"->>'name' ILIKE :search`,
+      `"videoAbuse"."deletedVideo"->'channel'->>'displayName' ILIKE :search`,
+      '"reporterAccount"."name" ILIKE :search',
+      '"flaggedAccount"."name" ILIKE :search'
+    ]
+    replacements.search = `%${options.search}%`
+    whereAnd.push('(' + searchWhereOr.join(' OR ') + ')')
+  }
+  if (options.searchVideo) {
+    whereAnd.push('"video"."name" ILIKE :searchVideo')
+    replacements.searchVideo = `%${options.searchVideo}%`
+  }
+  if (options.searchVideoChannel) {
+    whereAnd.push('"videoChannel"."name" ILIKE :searchVideoChannel')
+    replacements.searchVideoChannel = `%${options.searchVideoChannel}%`
+  }
+  if (options.id) {
+    whereAnd.push('"abuse"."id" = :id')
+    replacements.id = options.id
+  }
+  if (options.state) {
+    whereAnd.push('"abuse"."state" = :state')
+    replacements.state = options.state
+  }
+  if (options.videoIs === 'deleted') {
+    whereAnd.push('"videoAbuse"."deletedVideo" IS NOT NULL')
+  } else if (options.videoIs === 'blacklisted') {
+    whereAnd.push('"videoBlacklist"."id" IS NOT NULL')
+  }
+  if (options.predefinedReasonId) {
+    whereAnd.push(':predefinedReasonId = ANY("abuse"."predefinedReasons")')
+    replacements.predefinedReasonId = options.predefinedReasonId
+  }
+  if (options.filter === 'video') {
+    whereAnd.push('"videoAbuse"."id" IS NOT NULL')
+  } else if (options.filter === 'comment') {
+    whereAnd.push('"commentAbuse"."id" IS NOT NULL')
+  } else if (options.filter === 'account') {
+    whereAnd.push('"videoAbuse"."id" IS NULL AND "commentAbuse"."id" IS NULL')
+  }
+  if (options.searchReporter) {
+    whereAnd.push('"reporterAccount"."name" ILIKE :searchReporter')
+    replacements.searchReporter = `%${options.searchReporter}%`
+  }
+  if (options.searchReportee) {
+    whereAnd.push('"flaggedAccount"."name" ILIKE :searchReportee')
+    replacements.searchReportee = `%${options.searchReportee}%`
+  }
+  const prefix = type === 'count'
+    ? 'SELECT COUNT("abuse"."id") AS "total"'
+    : 'SELECT "abuse"."id" '
+  let suffix = ''
+  if (type !== 'count') {
+    if (options.sort) {
+      const order = buildAbuseOrder(options.sort)
+      suffix += `${order} `
+    }
+    if (exists(options.count)) {
+      const count = parseInt(options.count + '', 10)
+      suffix += `LIMIT ${count} `
+    }
+    if (exists(options.start)) {
+      const start = parseInt(options.start + '', 10)
+      suffix += `OFFSET ${start} `
+    }
+  }
+  const where = whereAnd.length !== 0
+    ? `WHERE ${whereAnd.join(' AND ')}`
+    : ''
+  return {
+    query: `${prefix} FROM "abuse" ${joins.join(' ')} ${where} ${suffix}`,
+    replacements
+  }
+}
+function buildAbuseOrder (value: string) {
+  const { direction, field } = buildDirectionAndField(value)
+  return `ORDER BY "abuse"."${field}" ${direction}`
+}
+export {
+  buildAbuseListQuery
+}
diff --git a/server/models/abuse/abuse.ts b/server/models/abuse/abuse.ts
new file mode 100644
index 000000000..bd96cf79c
--- /dev/null
+++ b/server/models/abuse/abuse.ts
@@ -0,0 +1,515 @@
+import * as Bluebird from 'bluebird'
+import { invert } from 'lodash'
+import { literal, Op, QueryTypes, WhereOptions } from 'sequelize'
+import {
+  AllowNull,
+  BelongsTo,
+  Column,
+  CreatedAt,
+  DataType,
+  Default,
+  ForeignKey,
+  HasOne,
+  Is,
+  Model,
+  Scopes,
+  Table,
+  UpdatedAt
+} from 'sequelize-typescript'
+import { isAbuseModerationCommentValid, isAbuseReasonValid, isAbuseStateValid } from '@server/helpers/custom-validators/abuses'
+import {
+  Abuse,
+  AbuseFilter,
+  AbuseObject,
+  AbusePredefinedReasons,
+  abusePredefinedReasonsMap,
+  AbusePredefinedReasonsString,
+  AbuseState,
+  AbuseVideoIs,
+  VideoAbuse,
+  VideoCommentAbuse
+} from '@shared/models'
+import { ABUSE_STATES, CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { MAbuse, MAbuseAP, MAbuseFormattable, MUserAccountId } from '../../types/models'
+import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions as AccountSummaryOptions } from '../account/account'
+import { getSort, throwIfNotValid } from '../utils'
+import { ThumbnailModel } from '../video/thumbnail'
+import { VideoModel } from '../video/video'
+import { VideoBlacklistModel } from '../video/video-blacklist'
+import { ScopeNames as VideoChannelScopeNames, SummaryOptions as ChannelSummaryOptions, VideoChannelModel } from '../video/video-channel'
+import { VideoCommentModel } from '../video/video-comment'
+import { buildAbuseListQuery, BuildAbusesQueryOptions } from './abuse-query-builder'
+import { VideoAbuseModel } from './video-abuse'
+import { VideoCommentAbuseModel } from './video-comment-abuse'
+export enum ScopeNames {
+  FOR_API = 'FOR_API'
+}
+@Scopes(() => ({
+  [ScopeNames.FOR_API]: () => {
+    return {
+      attributes: {
+        include: [
+          [
+            // we don't care about this count for deleted videos, so there are not included
+            literal(
+              '(' +
+                'SELECT count(*) ' +
+                'FROM "videoAbuse" ' +
+                'WHERE "videoId" = "VideoAbuse"."videoId" AND "videoId" IS NOT NULL' +
+              ')'
+            ),
+            'countReportsForVideo'
+          ],
+          [
+            // we don't care about this count for deleted videos, so there are not included
+            literal(
+              '(' +
+                'SELECT t.nth ' +
+                'FROM ( ' +
+                  'SELECT id, ' +
+                         'row_number() OVER (PARTITION BY "videoId" ORDER BY "createdAt") AS nth ' +
+                  'FROM "videoAbuse" ' +
+                ') t ' +
+                'WHERE t.id = "VideoAbuse".id AND t.id IS NOT NULL' +
+              ')'
+            ),
+            'nthReportForVideo'
+          ],
+          [
+            literal(
+              '(' +
+                'SELECT count("abuse"."id") ' +
+                'FROM "abuse" ' +
+                'WHERE "abuse"."reporterAccountId" = "AbuseModel"."reporterAccountId"' +
+              ')'
+            ),
+            'countReportsForReporter'
+          ],
+          [
+            literal(
+              '(' +
+                'SELECT count("abuse"."id") ' +
+                'FROM "abuse" ' +
+                'WHERE "abuse"."flaggedAccountId" = "AbuseModel"."flaggedAccountId"' +
+              ')'
+            ),
+            'countReportsForReportee'
+          ]
+        ]
+      },
+      include: [
+        {
+          model: AccountModel.scope({
+            method: [
+              AccountScopeNames.SUMMARY,
+              { actorRequired: false } as AccountSummaryOptions
+            ]
+          }),
+          as: 'ReporterAccount'
+        },
+        {
+          model: AccountModel.scope({
+            method: [
+              AccountScopeNames.SUMMARY,
+              { actorRequired: false } as AccountSummaryOptions
+            ]
+          }),
+          as: 'FlaggedAccount'
+        },
+        {
+          model: VideoCommentAbuseModel.unscoped(),
+          include: [
+            {
+              model: VideoCommentModel.unscoped(),
+              include: [
+                {
+                  model: VideoModel.unscoped(),
+                  attributes: [ 'name', 'id', 'uuid' ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          model: VideoAbuseModel.unscoped(),
+          include: [
+            {
+              attributes: [ 'id', 'uuid', 'name', 'nsfw' ],
+              model: VideoModel.unscoped(),
+              include: [
+                {
+                  attributes: [ 'filename', 'fileUrl', 'type' ],
+                  model: ThumbnailModel
+                },
+                {
+                  model: VideoChannelModel.scope({
+                    method: [
+                      VideoChannelScopeNames.SUMMARY,
+                      { withAccount: false, actorRequired: false } as ChannelSummaryOptions
+                    ]
+                  }),
+                  required: false
+                },
+                {
+                  attributes: [ 'id', 'reason', 'unfederated' ],
+                  required: false,
+                  model: VideoBlacklistModel
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+}))
+@Table({
+  tableName: 'abuse',
+  indexes: [
+    {
+      fields: [ 'reporterAccountId' ]
+    },
+    {
+      fields: [ 'flaggedAccountId' ]
+    }
+  ]
+})
+export class AbuseModel extends Model<AbuseModel> {
+  @AllowNull(false)
+  @Default(null)
+  @Is('AbuseReason', value => throwIfNotValid(value, isAbuseReasonValid, 'reason'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ABUSES.REASON.max))
+  reason: string
+  @AllowNull(false)
+  @Default(null)
+  @Is('AbuseState', value => throwIfNotValid(value, isAbuseStateValid, 'state'))
+  @Column
+  state: AbuseState
+  @AllowNull(true)
+  @Default(null)
+  @Is('AbuseModerationComment', value => throwIfNotValid(value, isAbuseModerationCommentValid, 'moderationComment', true))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ABUSES.MODERATION_COMMENT.max))
+  moderationComment: string
+  @AllowNull(true)
+  @Default(null)
+  @Column(DataType.ARRAY(DataType.INTEGER))
+  predefinedReasons: AbusePredefinedReasons[]
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @ForeignKey(() => AccountModel)
+  @Column
+  reporterAccountId: number
+  @BelongsTo(() => AccountModel, {
+    foreignKey: {
+      name: 'reporterAccountId',
+      allowNull: true
+    },
+    as: 'ReporterAccount',
+    onDelete: 'set null'
+  })
+  ReporterAccount: AccountModel
+  @ForeignKey(() => AccountModel)
+  @Column
+  flaggedAccountId: number
+  @BelongsTo(() => AccountModel, {
+    foreignKey: {
+      name: 'flaggedAccountId',
+      allowNull: true
+    },
+    as: 'FlaggedAccount',
+    onDelete: 'set null'
+  })
+  FlaggedAccount: AccountModel
+  @HasOne(() => VideoCommentAbuseModel, {
+    foreignKey: {
+      name: 'abuseId',
+      allowNull: false
+    },
+    onDelete: 'cascade'
+  })
+  VideoCommentAbuse: VideoCommentAbuseModel
+  @HasOne(() => VideoAbuseModel, {
+    foreignKey: {
+      name: 'abuseId',
+      allowNull: false
+    },
+    onDelete: 'cascade'
+  })
+  VideoAbuse: VideoAbuseModel
+  // FIXME: deprecated in 2.3. Remove these validators
+  static loadByIdAndVideoId (id: number, videoId?: number, uuid?: string): Bluebird<MAbuse> {
+    const videoWhere: WhereOptions = {}
+    if (videoId) videoWhere.videoId = videoId
+    if (uuid) videoWhere.deletedVideo = { uuid }
+    const query = {
+      include: [
+        {
+          model: VideoAbuseModel,
+          required: true,
+          where: videoWhere
+        }
+      ],
+      where: {
+        id
+      }
+    }
+    return AbuseModel.findOne(query)
+  }
+  static loadById (id: number): Bluebird<MAbuse> {
+    const query = {
+      where: {
+        id
+      }
+    }
+    return AbuseModel.findOne(query)
+  }
+  static async listForApi (parameters: {
+    start: number
+    count: number
+    sort: string
+    filter?: AbuseFilter
+    serverAccountId: number
+    user?: MUserAccountId
+    id?: number
+    predefinedReason?: AbusePredefinedReasonsString
+    state?: AbuseState
+    videoIs?: AbuseVideoIs
+    search?: string
+    searchReporter?: string
+    searchReportee?: string
+    searchVideo?: string
+    searchVideoChannel?: string
+  }) {
+    const {
+      start,
+      count,
+      sort,
+      search,
+      user,
+      serverAccountId,
+      state,
+      videoIs,
+      predefinedReason,
+      searchReportee,
+      searchVideo,
+      filter,
+      searchVideoChannel,
+      searchReporter,
+      id
+    } = parameters
+    const userAccountId = user ? user.Account.id : undefined
+    const predefinedReasonId = predefinedReason ? abusePredefinedReasonsMap[predefinedReason] : undefined
+    const queryOptions: BuildAbusesQueryOptions = {
+      start,
+      count,
+      sort,
+      id,
+      filter,
+      predefinedReasonId,
+      search,
+      state,
+      videoIs,
+      searchReportee,
+      searchVideo,
+      searchVideoChannel,
+      searchReporter,
+      serverAccountId,
+      userAccountId
+    }
+    const [ total, data ] = await Promise.all([
+      AbuseModel.internalCountForApi(queryOptions),
+      AbuseModel.internalListForApi(queryOptions)
+    ])
+    return { total, data }
+  }
+  toFormattedJSON (this: MAbuseFormattable): Abuse {
+    const predefinedReasons = AbuseModel.getPredefinedReasonsStrings(this.predefinedReasons)
+    const countReportsForVideo = this.get('countReportsForVideo') as number
+    const nthReportForVideo = this.get('nthReportForVideo') as number
+    const countReportsForReporter = this.get('countReportsForReporter') as number
+    const countReportsForReportee = this.get('countReportsForReportee') as number
+    let video: VideoAbuse = null
+    let comment: VideoCommentAbuse = null
+    if (this.VideoAbuse) {
+      const abuseModel = this.VideoAbuse
+      const entity = abuseModel.Video || abuseModel.deletedVideo
+      video = {
+        id: entity.id,
+        uuid: entity.uuid,
+        name: entity.name,
+        nsfw: entity.nsfw,
+        startAt: abuseModel.startAt,
+        endAt: abuseModel.endAt,
+        deleted: !abuseModel.Video,
+        blacklisted: abuseModel.Video?.isBlacklisted() || false,
+        thumbnailPath: abuseModel.Video?.getMiniatureStaticPath(),
+        channel: abuseModel.Video?.VideoChannel.toFormattedJSON() || abuseModel.deletedVideo?.channel,
+        countReports: countReportsForVideo,
+        nthReport: nthReportForVideo
+      }
+    }
+    if (this.VideoCommentAbuse) {
+      const abuseModel = this.VideoCommentAbuse
+      const entity = abuseModel.VideoComment
+      comment = {
+        id: entity.id,
+        threadId: entity.getThreadId(),
+        text: entity.text ?? '',
+        deleted: entity.isDeleted(),
+        video: {
+          id: entity.Video.id,
+          name: entity.Video.name,
+          uuid: entity.Video.uuid
+        }
+      }
+    }
+    return {
+      id: this.id,
+      reason: this.reason,
+      predefinedReasons,
+      reporterAccount: this.ReporterAccount
+        ? this.ReporterAccount.toFormattedJSON()
+        : null,
+      flaggedAccount: this.FlaggedAccount
+        ? this.FlaggedAccount.toFormattedJSON()
+        : null,
+      state: {
+        id: this.state,
+        label: AbuseModel.getStateLabel(this.state)
+      },
+      moderationComment: this.moderationComment,
+      video,
+      comment,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
+      countReportsForReporter: (countReportsForReporter || 0),
+      countReportsForReportee: (countReportsForReportee || 0),
+      // FIXME: deprecated in 2.3, remove this
+      startAt: null,
+      endAt: null,
+      count: countReportsForVideo || 0,
+      nth: nthReportForVideo || 0
+    }
+  }
+  toActivityPubObject (this: MAbuseAP): AbuseObject {
+    const predefinedReasons = AbuseModel.getPredefinedReasonsStrings(this.predefinedReasons)
+    const object = this.VideoAbuse?.Video?.url || this.VideoCommentAbuse?.VideoComment?.url || this.FlaggedAccount.Actor.url
+    const startAt = this.VideoAbuse?.startAt
+    const endAt = this.VideoAbuse?.endAt
+    return {
+      type: 'Flag' as 'Flag',
+      content: this.reason,
+      object,
+      tag: predefinedReasons.map(r => ({
+        type: 'Hashtag' as 'Hashtag',
+        name: r
+      })),
+      startAt,
+      endAt
+    }
+  }
+  private static async internalCountForApi (parameters: BuildAbusesQueryOptions) {
+    const { query, replacements } = buildAbuseListQuery(parameters, 'count')
+    const options = {
+      type: QueryTypes.SELECT as QueryTypes.SELECT,
+      replacements
+    }
+    const [ { total } ] = await AbuseModel.sequelize.query<{ total: string }>(query, options)
+    if (total === null) return 0
+    return parseInt(total, 10)
+  }
+  private static async internalListForApi (parameters: BuildAbusesQueryOptions) {
+    const { query, replacements } = buildAbuseListQuery(parameters, 'id')
+    const options = {
+      type: QueryTypes.SELECT as QueryTypes.SELECT,
+      replacements
+    }
+    const rows = await AbuseModel.sequelize.query<{ id: string }>(query, options)
+    const ids = rows.map(r => r.id)
+    if (ids.length === 0) return []
+    return AbuseModel.scope(ScopeNames.FOR_API)
+                     .findAll({
+                       order: getSort(parameters.sort),
+                       where: {
+                         id: {
+                           [Op.in]: ids
+                         }
+                       }
+                     })
+  }
+  private static getStateLabel (id: number) {
+    return ABUSE_STATES[id] || 'Unknown'
+  }
+  private static getPredefinedReasonsStrings (predefinedReasons: AbusePredefinedReasons[]): AbusePredefinedReasonsString[] {
+    return (predefinedReasons || [])
+      .filter(r => r in AbusePredefinedReasons)
+      .map(r => invert(abusePredefinedReasonsMap)[r] as AbusePredefinedReasonsString)
+  }
+}
diff --git a/server/models/abuse/video-abuse.ts b/server/models/abuse/video-abuse.ts
new file mode 100644
index 000000000..d92bcf19f
--- /dev/null
+++ b/server/models/abuse/video-abuse.ts
@@ -0,0 +1,63 @@
+import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { VideoDetails } from '@shared/models'
+import { VideoModel } from '../video/video'
+import { AbuseModel } from './abuse'
+@Table({
+  tableName: 'videoAbuse',
+  indexes: [
+    {
+      fields: [ 'abuseId' ]
+    },
+    {
+      fields: [ 'videoId' ]
+    }
+  ]
+})
+export class VideoAbuseModel extends Model<VideoAbuseModel> {
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @AllowNull(true)
+  @Default(null)
+  @Column
+  startAt: number
+  @AllowNull(true)
+  @Default(null)
+  @Column
+  endAt: number
+  @AllowNull(true)
+  @Default(null)
+  @Column(DataType.JSONB)
+  deletedVideo: VideoDetails
+  @ForeignKey(() => AbuseModel)
+  @Column
+  abuseId: number
+  @BelongsTo(() => AbuseModel, {
+    foreignKey: {
+      allowNull: false
+    },
+    onDelete: 'cascade'
+  })
+  Abuse: AbuseModel
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
+  @BelongsTo(() => VideoModel, {
+    foreignKey: {
+      allowNull: true
+    },
+    onDelete: 'set null'
+  })
+  Video: VideoModel
+}
diff --git a/server/models/abuse/video-comment-abuse.ts b/server/models/abuse/video-comment-abuse.ts
new file mode 100644
index 000000000..8b34009b4
--- /dev/null
+++ b/server/models/abuse/video-comment-abuse.ts
@@ -0,0 +1,47 @@
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { VideoCommentModel } from '../video/video-comment'
+import { AbuseModel } from './abuse'
+@Table({
+  tableName: 'commentAbuse',
+  indexes: [
+    {
+      fields: [ 'abuseId' ]
+    },
+    {
+      fields: [ 'videoCommentId' ]
+    }
+  ]
+})
+export class VideoCommentAbuseModel extends Model<VideoCommentAbuseModel> {
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @ForeignKey(() => AbuseModel)
+  @Column
+  abuseId: number
+  @BelongsTo(() => AbuseModel, {
+    foreignKey: {
+      allowNull: false
+    },
+    onDelete: 'cascade'
+  })
+  Abuse: AbuseModel
+  @ForeignKey(() => VideoCommentModel)
+  @Column
+  videoCommentId: number
+  @BelongsTo(() => VideoCommentModel, {
+    foreignKey: {
+      allowNull: true
+    },
+    onDelete: 'set null'
+  })
+  VideoComment: VideoCommentModel
+}
diff --git a/server/models/account/account-blocklist.ts b/server/models/account/account-blocklist.ts
index cf8872fd5..577b7dc19 100644
--- a/server/models/account/account-blocklist.ts
+++ b/server/models/account/account-blocklist.ts
@@ -1,12 +1,12 @@
-import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
-import { AccountModel } from './account'
-import { getSort, searchAttribute } from '../utils'
-import { AccountBlock } from '../../../shared/models/blocklist'
-import { Op } from 'sequelize'
 import * as Bluebird from 'bluebird'
+import { Op } from 'sequelize'
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
 import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/types/models'
+import { AccountBlock } from '../../../shared/models'
 import { ActorModel } from '../activitypub/actor'
 import { ServerModel } from '../server/server'
+import { getSort, searchAttribute } from '../utils'
+import { AccountModel } from './account'
 enum ScopeNames {
  WITH_ACCOUNTS = 'WITH_ACCOUNTS'
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 4395d179a..f97519b14 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -42,6 +42,7 @@ export enum ScopeNames {
 }
 export type SummaryOptions = {
+  actorRequired?: boolean // Default: true
  whereActor?: WhereOptions
  withAccountBlockerIds?: number[]
 }
@@ -65,12 +66,12 @@ export type SummaryOptions = {
    }
    const query: FindOptions = {
-      attributes: [ 'id', 'name' ],
+      attributes: [ 'id', 'name', 'actorId' ],
      include: [
        {
          attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
          model: ActorModel.unscoped(),
-          required: true,
+          required: options.actorRequired ?? true,
          where: whereActor,
          include: [
            serverInclude,
@@ -388,6 +389,10 @@ export class AccountModel extends Model<AccountModel> {
      .findAll(query)
  }
+  getClientUrl () {
+    return WEBSERVER.URL + '/accounts/' + this.Actor.getIdentifier()
+  }
  toFormattedJSON (this: MAccountFormattable): Account {
    const actor = this.Actor.toFormattedJSON()
    const account = {
diff --git a/server/models/account/user-notification-setting.ts b/server/models/account/user-notification-setting.ts
index b69b47265..d8f3f13da 100644
--- a/server/models/account/user-notification-setting.ts
+++ b/server/models/account/user-notification-setting.ts
@@ -51,11 +51,11 @@ export class UserNotificationSettingModel extends Model<UserNotificationSettingM
  @AllowNull(false)
  @Default(null)
  @Is(
-    'UserNotificationSettingVideoAbuseAsModerator',
+    'UserNotificationSettingAbuseAsModerator',
-    value => throwIfNotValid(value, isUserNotificationSettingValid, 'videoAbuseAsModerator')
+    value => throwIfNotValid(value, isUserNotificationSettingValid, 'abuseAsModerator')
  )
  @Column
-  videoAbuseAsModerator: UserNotificationSettingValue
+  abuseAsModerator: UserNotificationSettingValue
  @AllowNull(false)
  @Default(null)
@@ -166,7 +166,7 @@ export class UserNotificationSettingModel extends Model<UserNotificationSettingM
    return {
      newCommentOnMyVideo: this.newCommentOnMyVideo,
      newVideoFromSubscription: this.newVideoFromSubscription,
-      videoAbuseAsModerator: this.videoAbuseAsModerator,
+      abuseAsModerator: this.abuseAsModerator,
      videoAutoBlacklistAsModerator: this.videoAutoBlacklistAsModerator,
      blacklistOnMyVideo: this.blacklistOnMyVideo,
      myVideoPublished: this.myVideoPublished,
diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts
index 30985bb0f..2945bf709 100644
--- a/server/models/account/user-notification.ts
+++ b/server/models/account/user-notification.ts
@@ -1,22 +1,24 @@
+import { FindOptions, ModelIndexesOptions, Op, WhereOptions } from 'sequelize'
 import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/types/models/user'
 import { UserNotification, UserNotificationType } from '../../../shared'
-import { getSort, throwIfNotValid } from '../utils'
 import { isBooleanValid } from '../../helpers/custom-validators/misc'
 import { isUserNotificationTypeValid } from '../../helpers/custom-validators/user-notifications'
-import { UserModel } from './user'
+import { AbuseModel } from '../abuse/abuse'
-import { VideoModel } from '../video/video'
+import { VideoAbuseModel } from '../abuse/video-abuse'
-import { VideoCommentModel } from '../video/video-comment'
+import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse'
-import { FindOptions, ModelIndexesOptions, Op, WhereOptions } from 'sequelize'
-import { VideoChannelModel } from '../video/video-channel'
-import { AccountModel } from './account'
-import { VideoAbuseModel } from '../video/video-abuse'
-import { VideoBlacklistModel } from '../video/video-blacklist'
-import { VideoImportModel } from '../video/video-import'
 import { ActorModel } from '../activitypub/actor'
 import { ActorFollowModel } from '../activitypub/actor-follow'
 import { AvatarModel } from '../avatar/avatar'
 import { ServerModel } from '../server/server'
-import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/types/models/user'
+import { getSort, throwIfNotValid } from '../utils'
+import { VideoModel } from '../video/video'
+import { VideoBlacklistModel } from '../video/video-blacklist'
+import { VideoChannelModel } from '../video/video-channel'
+import { VideoCommentModel } from '../video/video-comment'
+import { VideoImportModel } from '../video/video-import'
+import { AccountModel } from './account'
+import { UserModel } from './user'
 enum ScopeNames {
  WITH_ALL = 'WITH_ALL'
@@ -87,9 +89,41 @@ function buildAccountInclude (required: boolean, withActor = false) {
      {
        attributes: [ 'id' ],
-        model: VideoAbuseModel.unscoped(),
+        model: AbuseModel.unscoped(),
        required: false,
-        include: [ buildVideoInclude(true) ]
+        include: [
+          {
+            attributes: [ 'id' ],
+            model: VideoAbuseModel.unscoped(),
+            required: false,
+            include: [ buildVideoInclude(true) ]
+          },
+          {
+            attributes: [ 'id' ],
+            model: VideoCommentAbuseModel.unscoped(),
+            required: false,
+            include: [
+              {
+                attributes: [ 'id', 'originCommentId' ],
+                model: VideoCommentModel,
+                required: true,
+                include: [
+                  {
+                    attributes: [ 'id', 'name', 'uuid' ],
+                    model: VideoModel.unscoped(),
+                    required: true
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            model: AccountModel,
+            as: 'FlaggedAccount',
+            required: true,
+            include: [ buildActorWithAvatarInclude() ]
+          }
+        ]
      },
      {
@@ -179,9 +213,9 @@ function buildAccountInclude (required: boolean, withActor = false) {
      }
    },
    {
-      fields: [ 'videoAbuseId' ],
+      fields: [ 'abuseId' ],
      where: {
-        videoAbuseId: {
+        abuseId: {
          [Op.ne]: null
        }
      }
@@ -276,17 +310,17 @@ export class UserNotificationModel extends Model<UserNotificationModel> {
  })
  Comment: VideoCommentModel
-  @ForeignKey(() => VideoAbuseModel)
+  @ForeignKey(() => AbuseModel)
  @Column
-  videoAbuseId: number
+  abuseId: number
-  @BelongsTo(() => VideoAbuseModel, {
+  @BelongsTo(() => AbuseModel, {
    foreignKey: {
      allowNull: true
    },
    onDelete: 'cascade'
  })
-  VideoAbuse: VideoAbuseModel
+  Abuse: AbuseModel
  @ForeignKey(() => VideoBlacklistModel)
  @Column
@@ -397,10 +431,7 @@ export class UserNotificationModel extends Model<UserNotificationModel> {
      video: this.formatVideo(this.Comment.Video)
    } : undefined
-    const videoAbuse = this.VideoAbuse ? {
+    const abuse = this.Abuse ? this.formatAbuse(this.Abuse) : undefined
-      id: this.VideoAbuse.id,
-      video: this.formatVideo(this.VideoAbuse.Video)
-    } : undefined
    const videoBlacklist = this.VideoBlacklist ? {
      id: this.VideoBlacklist.id,
@@ -439,7 +470,7 @@ export class UserNotificationModel extends Model<UserNotificationModel> {
      video,
      videoImport,
      comment,
-      videoAbuse,
+      abuse,
      videoBlacklist,
      account,
      actorFollow,
@@ -456,6 +487,29 @@ export class UserNotificationModel extends Model<UserNotificationModel> {
    }
  }
+  formatAbuse (this: UserNotificationModelForApi, abuse: UserNotificationIncludes.AbuseInclude) {
+    const commentAbuse = abuse.VideoCommentAbuse?.VideoComment ? {
+      threadId: abuse.VideoCommentAbuse.VideoComment.getThreadId(),
+      video: {
+        id: abuse.VideoCommentAbuse.VideoComment.Video.id,
+        name: abuse.VideoCommentAbuse.VideoComment.Video.name,
+        uuid: abuse.VideoCommentAbuse.VideoComment.Video.uuid
+      }
+    } : undefined
+    const videoAbuse = abuse.VideoAbuse?.Video ? this.formatVideo(abuse.VideoAbuse.Video) : undefined
+    const accountAbuse = (!commentAbuse && !videoAbuse) ? this.formatActor(abuse.FlaggedAccount) : undefined
+    return {
+      id: abuse.id,
+      video: videoAbuse,
+      comment: commentAbuse,
+      account: accountAbuse
+    }
+  }
  formatActor (
    this: UserNotificationModelForApi,
    accountOrChannel: UserNotificationIncludes.AccountIncludeActor | UserNotificationIncludes.VideoChannelIncludeActor
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index de193131a..5f45f8e7c 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -19,7 +19,7 @@ import {
  Table,
  UpdatedAt
 } from 'sequelize-typescript'
-import { hasUserRight, MyUser, USER_ROLE_LABELS, UserRight, VideoAbuseState, VideoPlaylistType, VideoPrivacy } from '../../../shared'
+import { hasUserRight, MyUser, USER_ROLE_LABELS, UserRight, AbuseState, VideoPlaylistType, VideoPrivacy } from '../../../shared'
 import { User, UserRole } from '../../../shared/models/users'
 import {
  isNoInstanceConfigWarningModal,
@@ -168,28 +168,26 @@ enum ScopeNames {
            '(' +
              `SELECT concat_ws(':', "abuses", "acceptedAbuses") ` +
              'FROM (' +
-                'SELECT COUNT("videoAbuse"."id") AS "abuses", ' +
+                'SELECT COUNT("abuse"."id") AS "abuses", ' +
-                       `COUNT("videoAbuse"."id") FILTER (WHERE "videoAbuse"."state" = ${VideoAbuseState.ACCEPTED}) AS "acceptedAbuses" ` +
+                       `COUNT("abuse"."id") FILTER (WHERE "abuse"."state" = ${AbuseState.ACCEPTED}) AS "acceptedAbuses" ` +
-                'FROM "videoAbuse" ' +
+                'FROM "abuse" ' +
-                'INNER JOIN "video" ON "videoAbuse"."videoId" = "video"."id" ' +
+                'INNER JOIN "account" ON "account"."id" = "abuse"."flaggedAccountId" ' +
-                'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
-                'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' +
                'WHERE "account"."userId" = "UserModel"."id"' +
              ') t' +
            ')'
          ),
-          'videoAbusesCount'
+          'abusesCount'
        ],
        [
          literal(
            '(' +
-              'SELECT COUNT("videoAbuse"."id") ' +
+              'SELECT COUNT("abuse"."id") ' +
-              'FROM "videoAbuse" ' +
+              'FROM "abuse" ' +
-              'INNER JOIN "account" ON "account"."id" = "videoAbuse"."reporterAccountId" ' +
+              'INNER JOIN "account" ON "account"."id" = "abuse"."reporterAccountId" ' +
              'WHERE "account"."userId" = "UserModel"."id"' +
            ')'
          ),
-          'videoAbusesCreatedCount'
+          'abusesCreatedCount'
        ],
        [
          literal(
@@ -780,8 +778,8 @@ export class UserModel extends Model<UserModel> {
    const videoQuotaUsed = this.get('videoQuotaUsed')
    const videoQuotaUsedDaily = this.get('videoQuotaUsedDaily')
    const videosCount = this.get('videosCount')
-    const [ videoAbusesCount, videoAbusesAcceptedCount ] = (this.get('videoAbusesCount') as string || ':').split(':')
+    const [ abusesCount, abusesAcceptedCount ] = (this.get('abusesCount') as string || ':').split(':')
-    const videoAbusesCreatedCount = this.get('videoAbusesCreatedCount')
+    const abusesCreatedCount = this.get('abusesCreatedCount')
    const videoCommentsCount = this.get('videoCommentsCount')
    const json: User = {
@@ -815,14 +813,14 @@ export class UserModel extends Model<UserModel> {
      videosCount: videosCount !== undefined
        ? parseInt(videosCount + '', 10)
        : undefined,
-      videoAbusesCount: videoAbusesCount
+      abusesCount: abusesCount
-        ? parseInt(videoAbusesCount, 10)
+        ? parseInt(abusesCount, 10)
        : undefined,
-      videoAbusesAcceptedCount: videoAbusesAcceptedCount
+      abusesAcceptedCount: abusesAcceptedCount
-        ? parseInt(videoAbusesAcceptedCount, 10)
+        ? parseInt(abusesAcceptedCount, 10)
        : undefined,
-      videoAbusesCreatedCount: videoAbusesCreatedCount !== undefined
+      abusesCreatedCount: abusesCreatedCount !== undefined
-        ? parseInt(videoAbusesCreatedCount + '', 10)
+        ? parseInt(abusesCreatedCount + '', 10)
        : undefined,
      videoCommentsCount: videoCommentsCount !== undefined
        ? parseInt(videoCommentsCount + '', 10)
diff --git a/server/models/server/server-blocklist.ts b/server/models/server/server-blocklist.ts
index 30f0525e5..68cd72ee7 100644
--- a/server/models/server/server-blocklist.ts
+++ b/server/models/server/server-blocklist.ts
@@ -1,11 +1,11 @@
+import * as Bluebird from 'bluebird'
+import { Op } from 'sequelize'
 import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { MServerBlocklist, MServerBlocklistAccountServer, MServerBlocklistFormattable } from '@server/types/models'
+import { ServerBlock } from '@shared/models'
 import { AccountModel } from '../account/account'
-import { ServerModel } from './server'
-import { ServerBlock } from '../../../shared/models/blocklist'
 import { getSort, searchAttribute } from '../utils'
-import * as Bluebird from 'bluebird'
+import { ServerModel } from './server'
-import { MServerBlocklist, MServerBlocklistAccountServer, MServerBlocklistFormattable } from '@server/types/models'
-import { Op } from 'sequelize'
 enum ScopeNames {
  WITH_ACCOUNT = 'WITH_ACCOUNT',
diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts
deleted file mode 100644
index 1319332f0..000000000
--- a/server/models/video/video-abuse.ts
+++ /dev/null
@@ -1,479 +0,0 @@
-import * as Bluebird from 'bluebird'
-import { literal, Op } from 'sequelize'
-import {
-  AllowNull,
-  BelongsTo,
-  Column,
-  CreatedAt,
-  DataType,
-  Default,
-  ForeignKey,
-  Is,
-  Model,
-  Scopes,
-  Table,
-  UpdatedAt
-} from 'sequelize-typescript'
-import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type'
-import {
-  VideoAbuseState,
-  VideoDetails,
-  VideoAbusePredefinedReasons,
-  VideoAbusePredefinedReasonsString,
-  videoAbusePredefinedReasonsMap
-} from '../../../shared'
-import { VideoAbuseObject } from '../../../shared/models/activitypub/objects'
-import { VideoAbuse } from '../../../shared/models/videos'
-import {
-  isVideoAbuseModerationCommentValid,
-  isVideoAbuseReasonValid,
-  isVideoAbuseStateValid
-} from '../../helpers/custom-validators/video-abuses'
-import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants'
-import { MUserAccountId, MVideoAbuse, MVideoAbuseFormattable, MVideoAbuseVideo } from '../../types/models'
-import { AccountModel } from '../account/account'
-import { buildBlockedAccountSQL, getSort, searchAttribute, throwIfNotValid } from '../utils'
-import { ThumbnailModel } from './thumbnail'
-import { VideoModel } from './video'
-import { VideoBlacklistModel } from './video-blacklist'
-import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel'
-import { invert } from 'lodash'
-export enum ScopeNames {
-  FOR_API = 'FOR_API'
-}
-@Scopes(() => ({
-  [ScopeNames.FOR_API]: (options: {
-    // search
-    search?: string
-    searchReporter?: string
-    searchReportee?: string
-    searchVideo?: string
-    searchVideoChannel?: string
-    // filters
-    id?: number
-    predefinedReasonId?: number
-    state?: VideoAbuseState
-    videoIs?: VideoAbuseVideoIs
-    // accountIds
-    serverAccountId: number
-    userAccountId: number
-  }) => {
-    const where = {
-      reporterAccountId: {
-        [Op.notIn]: literal('(' + buildBlockedAccountSQL([ options.serverAccountId, options.userAccountId ]) + ')')
-      }
-    }
-    if (options.search) {
-      Object.assign(where, {
-        [Op.or]: [
-          {
-            [Op.and]: [
-              { videoId: { [Op.not]: null } },
-              searchAttribute(options.search, '$Video.name$')
-            ]
-          },
-          {
-            [Op.and]: [
-              { videoId: { [Op.not]: null } },
-              searchAttribute(options.search, '$Video.VideoChannel.name$')
-            ]
-          },
-          {
-            [Op.and]: [
-              { deletedVideo: { [Op.not]: null } },
-              { deletedVideo: searchAttribute(options.search, 'name') }
-            ]
-          },
-          {
-            [Op.and]: [
-              { deletedVideo: { [Op.not]: null } },
-              { deletedVideo: { channel: searchAttribute(options.search, 'displayName') } }
-            ]
-          },
-          searchAttribute(options.search, '$Account.name$')
-        ]
-      })
-    }
-    if (options.id) Object.assign(where, { id: options.id })
-    if (options.state) Object.assign(where, { state: options.state })
-    if (options.videoIs === 'deleted') {
-      Object.assign(where, {
-        deletedVideo: {
-          [Op.not]: null
-        }
-      })
-    }
-    if (options.predefinedReasonId) {
-      Object.assign(where, {
-        predefinedReasons: {
-          [Op.contains]: [ options.predefinedReasonId ]
-        }
-      })
-    }
-    const onlyBlacklisted = options.videoIs === 'blacklisted'
-    return {
-      attributes: {
-        include: [
-          [
-            // we don't care about this count for deleted videos, so there are not included
-            literal(
-              '(' +
-                'SELECT count(*) ' +
-                'FROM "videoAbuse" ' +
-                'WHERE "videoId" = "VideoAbuseModel"."videoId" ' +
-              ')'
-            ),
-            'countReportsForVideo'
-          ],
-          [
-            // we don't care about this count for deleted videos, so there are not included
-            literal(
-              '(' +
-                'SELECT t.nth ' +
-                'FROM ( ' +
-                  'SELECT id, ' +
-                         'row_number() OVER (PARTITION BY "videoId" ORDER BY "createdAt") AS nth ' +
-                  'FROM "videoAbuse" ' +
-                ') t ' +
-                'WHERE t.id = "VideoAbuseModel".id ' +
-              ')'
-            ),
-            'nthReportForVideo'
-          ],
-          [
-            literal(
-              '(' +
-                'SELECT count("videoAbuse"."id") ' +
-                'FROM "videoAbuse" ' +
-                'INNER JOIN "video" ON "video"."id" = "videoAbuse"."videoId" ' +
-                'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
-                'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' +
-                'WHERE "account"."id" = "VideoAbuseModel"."reporterAccountId" ' +
-              ')'
-            ),
-            'countReportsForReporter__video'
-          ],
-          [
-            literal(
-              '(' +
-                'SELECT count(DISTINCT "videoAbuse"."id") ' +
-                'FROM "videoAbuse" ' +
-                `WHERE CAST("deletedVideo"->'channel'->'ownerAccount'->>'id' AS INTEGER) = "VideoAbuseModel"."reporterAccountId" ` +
-              ')'
-            ),
-            'countReportsForReporter__deletedVideo'
-          ],
-          [
-            literal(
-              '(' +
-                'SELECT count(DISTINCT "videoAbuse"."id") ' +
-                'FROM "videoAbuse" ' +
-                'INNER JOIN "video" ON "video"."id" = "videoAbuse"."videoId" ' +
-                'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
-                'INNER JOIN "account" ON ' +
-                      '"videoChannel"."accountId" = "Video->VideoChannel"."accountId" ' +
-                   `OR "videoChannel"."accountId" = CAST("VideoAbuseModel"."deletedVideo"->'channel'->'ownerAccount'->>'id' AS INTEGER) ` +
-              ')'
-            ),
-            'countReportsForReportee__video'
-          ],
-          [
-            literal(
-              '(' +
-                'SELECT count(DISTINCT "videoAbuse"."id") ' +
-                'FROM "videoAbuse" ' +
-                `WHERE CAST("deletedVideo"->'channel'->'ownerAccount'->>'id' AS INTEGER) = "Video->VideoChannel"."accountId" ` +
-                   `OR CAST("deletedVideo"->'channel'->'ownerAccount'->>'id' AS INTEGER) = ` +
-                      `CAST("VideoAbuseModel"."deletedVideo"->'channel'->'ownerAccount'->>'id' AS INTEGER) ` +
-              ')'
-            ),
-            'countReportsForReportee__deletedVideo'
-          ]
-        ]
-      },
-      include: [
-        {
-          model: AccountModel,
-          required: true,
-          where: searchAttribute(options.searchReporter, 'name')
-        },
-        {
-          model: VideoModel,
-          required: !!(onlyBlacklisted || options.searchVideo || options.searchReportee || options.searchVideoChannel),
-          where: searchAttribute(options.searchVideo, 'name'),
-          include: [
-            {
-              model: ThumbnailModel
-            },
-            {
-              model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, { withAccount: true } as SummaryOptions ] }),
-              where: searchAttribute(options.searchVideoChannel, 'name'),
-              include: [
-                {
-                  model: AccountModel,
-                  where: searchAttribute(options.searchReportee, 'name')
-                }
-              ]
-            },
-            {
-              attributes: [ 'id', 'reason', 'unfederated' ],
-              model: VideoBlacklistModel,
-              required: onlyBlacklisted
-            }
-          ]
-        }
-      ],
-      where
-    }
-  }
-}))
-@Table({
-  tableName: 'videoAbuse',
-  indexes: [
-    {
-      fields: [ 'videoId' ]
-    },
-    {
-      fields: [ 'reporterAccountId' ]
-    }
-  ]
-})
-export class VideoAbuseModel extends Model<VideoAbuseModel> {
-  @AllowNull(false)
-  @Default(null)
-  @Is('VideoAbuseReason', value => throwIfNotValid(value, isVideoAbuseReasonValid, 'reason'))
-  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_ABUSES.REASON.max))
-  reason: string
-  @AllowNull(false)
-  @Default(null)
-  @Is('VideoAbuseState', value => throwIfNotValid(value, isVideoAbuseStateValid, 'state'))
-  @Column
-  state: VideoAbuseState
-  @AllowNull(true)
-  @Default(null)
-  @Is('VideoAbuseModerationComment', value => throwIfNotValid(value, isVideoAbuseModerationCommentValid, 'moderationComment', true))
-  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_ABUSES.MODERATION_COMMENT.max))
-  moderationComment: string
-  @AllowNull(true)
-  @Default(null)
-  @Column(DataType.JSONB)
-  deletedVideo: VideoDetails
-  @AllowNull(true)
-  @Default(null)
-  @Column(DataType.ARRAY(DataType.INTEGER))
-  predefinedReasons: VideoAbusePredefinedReasons[]
-  @AllowNull(true)
-  @Default(null)
-  @Column
-  startAt: number
-  @AllowNull(true)
-  @Default(null)
-  @Column
-  endAt: number
-  @CreatedAt
-  createdAt: Date
-  @UpdatedAt
-  updatedAt: Date
-  @ForeignKey(() => AccountModel)
-  @Column
-  reporterAccountId: number
-  @BelongsTo(() => AccountModel, {
-    foreignKey: {
-      allowNull: true
-    },
-    onDelete: 'set null'
-  })
-  Account: AccountModel
-  @ForeignKey(() => VideoModel)
-  @Column
-  videoId: number
-  @BelongsTo(() => VideoModel, {
-    foreignKey: {
-      allowNull: true
-    },
-    onDelete: 'set null'
-  })
-  Video: VideoModel
-  static loadByIdAndVideoId (id: number, videoId?: number, uuid?: string): Bluebird<MVideoAbuse> {
-    const videoAttributes = {}
-    if (videoId) videoAttributes['videoId'] = videoId
-    if (uuid) videoAttributes['deletedVideo'] = { uuid }
-    const query = {
-      where: {
-        id,
-        ...videoAttributes
-      }
-    }
-    return VideoAbuseModel.findOne(query)
-  }
-  static listForApi (parameters: {
-    start: number
-    count: number
-    sort: string
-    serverAccountId: number
-    user?: MUserAccountId
-    id?: number
-    predefinedReason?: VideoAbusePredefinedReasonsString
-    state?: VideoAbuseState
-    videoIs?: VideoAbuseVideoIs
-    search?: string
-    searchReporter?: string
-    searchReportee?: string
-    searchVideo?: string
-    searchVideoChannel?: string
-  }) {
-    const {
-      start,
-      count,
-      sort,
-      search,
-      user,
-      serverAccountId,
-      state,
-      videoIs,
-      predefinedReason,
-      searchReportee,
-      searchVideo,
-      searchVideoChannel,
-      searchReporter,
-      id
-    } = parameters
-    const userAccountId = user ? user.Account.id : undefined
-    const predefinedReasonId = predefinedReason ? videoAbusePredefinedReasonsMap[predefinedReason] : undefined
-    const query = {
-      offset: start,
-      limit: count,
-      order: getSort(sort),
-      col: 'VideoAbuseModel.id',
-      distinct: true
-    }
-    const filters = {
-      id,
-      predefinedReasonId,
-      search,
-      state,
-      videoIs,
-      searchReportee,
-      searchVideo,
-      searchVideoChannel,
-      searchReporter,
-      serverAccountId,
-      userAccountId
-    }
-    return VideoAbuseModel
-      .scope([
-        { method: [ ScopeNames.FOR_API, filters ] }
-      ])
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
-  }
-  toFormattedJSON (this: MVideoAbuseFormattable): VideoAbuse {
-    const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons)
-    const countReportsForVideo = this.get('countReportsForVideo') as number
-    const nthReportForVideo = this.get('nthReportForVideo') as number
-    const countReportsForReporterVideo = this.get('countReportsForReporter__video') as number
-    const countReportsForReporterDeletedVideo = this.get('countReportsForReporter__deletedVideo') as number
-    const countReportsForReporteeVideo = this.get('countReportsForReportee__video') as number
-    const countReportsForReporteeDeletedVideo = this.get('countReportsForReportee__deletedVideo') as number
-    const video = this.Video
-      ? this.Video
-      : this.deletedVideo
-    return {
-      id: this.id,
-      reason: this.reason,
-      predefinedReasons,
-      reporterAccount: this.Account.toFormattedJSON(),
-      state: {
-        id: this.state,
-        label: VideoAbuseModel.getStateLabel(this.state)
-      },
-      moderationComment: this.moderationComment,
-      video: {
-        id: video.id,
-        uuid: video.uuid,
-        name: video.name,
-        nsfw: video.nsfw,
-        deleted: !this.Video,
-        blacklisted: this.Video?.isBlacklisted() || false,
-        thumbnailPath: this.Video?.getMiniatureStaticPath(),
-        channel: this.Video?.VideoChannel.toFormattedJSON() || this.deletedVideo?.channel
-      },
-      createdAt: this.createdAt,
-      updatedAt: this.updatedAt,
-      startAt: this.startAt,
-      endAt: this.endAt,
-      count: countReportsForVideo || 0,
-      nth: nthReportForVideo || 0,
-      countReportsForReporter: (countReportsForReporterVideo || 0) + (countReportsForReporterDeletedVideo || 0),
-      countReportsForReportee: (countReportsForReporteeVideo || 0) + (countReportsForReporteeDeletedVideo || 0)
-    }
-  }
-  toActivityPubObject (this: MVideoAbuseVideo): VideoAbuseObject {
-    const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons)
-    const startAt = this.startAt
-    const endAt = this.endAt
-    return {
-      type: 'Flag' as 'Flag',
-      content: this.reason,
-      object: this.Video.url,
-      tag: predefinedReasons.map(r => ({
-        type: 'Hashtag' as 'Hashtag',
-        name: r
-      })),
-      startAt,
-      endAt
-    }
-  }
-  private static getStateLabel (id: number) {
-    return VIDEO_ABUSE_STATES[id] || 'Unknown'
-  }
-  private static getPredefinedReasonsStrings (predefinedReasons: VideoAbusePredefinedReasons[]): VideoAbusePredefinedReasonsString[] {
-    return (predefinedReasons || [])
-      .filter(r => r in VideoAbusePredefinedReasons)
-      .map(r => invert(videoAbusePredefinedReasonsMap)[r] as VideoAbusePredefinedReasonsString)
-  }
-}
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index 9cee64229..03a3cdf81 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -61,6 +61,7 @@ type AvailableWithStatsOptions = {
 }
 export type SummaryOptions = {
+  actorRequired?: boolean // Default: true
  withAccount?: boolean // Default: false
  withAccountBlockerIds?: number[]
 }
@@ -121,7 +122,7 @@ export type SummaryOptions = {
        {
          attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
          model: ActorModel.unscoped(),
-          required: true,
+          required: options.actorRequired ?? true,
          include: [
            {
              attributes: [ 'host' ],
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 90625d987..75b914b8c 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -1,7 +1,20 @@
 import * as Bluebird from 'bluebird'
 import { uniq } from 'lodash'
 import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction } from 'sequelize'
-import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import {
+  AllowNull,
+  BelongsTo,
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  HasMany,
+  Is,
+  Model,
+  Scopes,
+  Table,
+  UpdatedAt
+} from 'sequelize-typescript'
 import { getServerActor } from '@server/models/application/application'
 import { MAccount, MAccountId, MUserAccountId } from '@server/types/models'
 import { VideoPrivacy } from '@shared/models'
@@ -24,6 +37,7 @@ import {
  MCommentOwnerVideoReply,
  MVideoImmutable
 } from '../../types/models/video'
+import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse'
 import { AccountModel } from '../account/account'
 import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor'
 import { buildBlockedAccountSQL, buildLocalAccountIdsIn, getCommentSort, throwIfNotValid } from '../utils'
@@ -224,6 +238,15 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
  })
  Account: AccountModel
+  @HasMany(() => VideoCommentAbuseModel, {
+    foreignKey: {
+      name: 'videoCommentId',
+      allowNull: true
+    },
+    onDelete: 'set null'
+  })
+  CommentAbuses: VideoCommentAbuseModel[]
  static loadById (id: number, t?: Transaction): Bluebird<MComment> {
    const query: FindOptions = {
      where: {
@@ -632,7 +655,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
      id: this.id,
      url: this.url,
      text: this.text,
-      threadId: this.originCommentId || this.id,
+      threadId: this.getThreadId(),
      inReplyToCommentId: this.inReplyToCommentId || null,
      videoId: this.videoId,
      createdAt: this.createdAt,
diff --git a/server/models/video/video-query-builder.ts b/server/models/video/video-query-builder.ts
index 984b0e6af..466890364 100644
--- a/server/models/video/video-query-builder.ts
+++ b/server/models/video/video-query-builder.ts
@@ -327,7 +327,7 @@ function buildListQuery (model: typeof Model, options: BuildVideosQueryOptions)
        attributes.push('COALESCE("video"."originallyPublishedAt", "video"."publishedAt") AS "publishedAtForOrder"')
      }
-      order = buildOrder(model, options.sort)
+      order = buildOrder(options.sort)
      suffix += `${order} `
    }
@@ -357,7 +357,7 @@ function buildListQuery (model: typeof Model, options: BuildVideosQueryOptions)
  return { query, replacements, order }
 }
-function buildOrder (model: typeof Model, value: string) {
+function buildOrder (value: string) {
  const { direction, field } = buildDirectionAndField(value)
  if (field.match(/^[a-zA-Z."]+$/) === null) throw new Error('Invalid sort column ' + field)
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index e2718300e..43609587c 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1,4 +1,5 @@
 import * as Bluebird from 'bluebird'
+import { remove } from 'fs-extra'
 import { maxBy, minBy, pick } from 'lodash'
 import { join } from 'path'
 import { FindOptions, IncludeOptions, Op, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
@@ -23,10 +24,18 @@ import {
  Table,
  UpdatedAt
 } from 'sequelize-typescript'
-import { UserRight, VideoPrivacy, VideoState, ResultList } from '../../../shared'
+import { buildNSFWFilter } from '@server/helpers/express-utils'
+import { getPrivaciesForFederation, isPrivacyForFederation } from '@server/helpers/video'
+import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
+import { getServerActor } from '@server/models/application/application'
+import { ModelCache } from '@server/models/model-cache'
+import { VideoFile } from '@shared/models/videos/video-file.model'
+import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared'
 import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
 import { Video, VideoDetails } from '../../../shared/models/videos'
+import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type'
 import { VideoFilter } from '../../../shared/models/videos/video-query.type'
+import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type'
 import { peertubeTruncate } from '../../helpers/core-utils'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
 import { isBooleanValid } from '../../helpers/custom-validators/misc'
@@ -43,6 +52,7 @@ import {
 } from '../../helpers/custom-validators/videos'
 import { getVideoFileResolution } from '../../helpers/ffmpeg-utils'
 import { logger } from '../../helpers/logger'
+import { CONFIG } from '../../initializers/config'
 import {
  ACTIVITY_PUB,
  API_VERSION,
@@ -59,40 +69,6 @@ import {
  WEBSERVER
 } from '../../initializers/constants'
 import { sendDeleteVideo } from '../../lib/activitypub/send'
-import { AccountModel } from '../account/account'
-import { AccountVideoRateModel } from '../account/account-video-rate'
-import { ActorModel } from '../activitypub/actor'
-import { AvatarModel } from '../avatar/avatar'
-import { ServerModel } from '../server/server'
-import { buildTrigramSearchIndex, buildWhereIdOrUUID, getVideoSort, isOutdated, throwIfNotValid } from '../utils'
-import { TagModel } from './tag'
-import { VideoAbuseModel } from './video-abuse'
-import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel'
-import { VideoCommentModel } from './video-comment'
-import { VideoFileModel } from './video-file'
-import { VideoShareModel } from './video-share'
-import { VideoTagModel } from './video-tag'
-import { ScheduleVideoUpdateModel } from './schedule-video-update'
-import { VideoCaptionModel } from './video-caption'
-import { VideoBlacklistModel } from './video-blacklist'
-import { remove } from 'fs-extra'
-import { VideoViewModel } from './video-view'
-import { VideoRedundancyModel } from '../redundancy/video-redundancy'
-import {
-  videoFilesModelToFormattedJSON,
-  VideoFormattingJSONOptions,
-  videoModelToActivityPubObject,
-  videoModelToFormattedDetailsJSON,
-  videoModelToFormattedJSON
-} from './video-format-utils'
-import { UserVideoHistoryModel } from '../account/user-video-history'
-import { VideoImportModel } from './video-import'
-import { VideoStreamingPlaylistModel } from './video-streaming-playlist'
-import { VideoPlaylistElementModel } from './video-playlist-element'
-import { CONFIG } from '../../initializers/config'
-import { ThumbnailModel } from './thumbnail'
-import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type'
-import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type'
 import {
  MChannel,
  MChannelAccountDefault,
@@ -118,15 +94,39 @@ import {
  MVideoWithFile,
  MVideoWithRights
 } from '../../types/models'
-import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../types/models/video/video-file'
 import { MThumbnail } from '../../types/models/video/thumbnail'
-import { VideoFile } from '@shared/models/videos/video-file.model'
+import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../types/models/video/video-file'
-import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
+import { VideoAbuseModel } from '../abuse/video-abuse'
-import { ModelCache } from '@server/models/model-cache'
+import { AccountModel } from '../account/account'
+import { AccountVideoRateModel } from '../account/account-video-rate'
+import { UserVideoHistoryModel } from '../account/user-video-history'
+import { ActorModel } from '../activitypub/actor'
+import { AvatarModel } from '../avatar/avatar'
+import { VideoRedundancyModel } from '../redundancy/video-redundancy'
+import { ServerModel } from '../server/server'
+import { buildTrigramSearchIndex, buildWhereIdOrUUID, getVideoSort, isOutdated, throwIfNotValid } from '../utils'
+import { ScheduleVideoUpdateModel } from './schedule-video-update'
+import { TagModel } from './tag'
+import { ThumbnailModel } from './thumbnail'
+import { VideoBlacklistModel } from './video-blacklist'
+import { VideoCaptionModel } from './video-caption'
+import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel'
+import { VideoCommentModel } from './video-comment'
+import { VideoFileModel } from './video-file'
+import {
+  videoFilesModelToFormattedJSON,
+  VideoFormattingJSONOptions,
+  videoModelToActivityPubObject,
+  videoModelToFormattedDetailsJSON,
+  videoModelToFormattedJSON
+} from './video-format-utils'
+import { VideoImportModel } from './video-import'
+import { VideoPlaylistElementModel } from './video-playlist-element'
 import { buildListQuery, BuildVideosQueryOptions, wrapForAPIResults } from './video-query-builder'
-import { buildNSFWFilter } from '@server/helpers/express-utils'
+import { VideoShareModel } from './video-share'
-import { getServerActor } from '@server/models/application/application'
+import { VideoStreamingPlaylistModel } from './video-streaming-playlist'
-import { getPrivaciesForFederation, isPrivacyForFederation } from "@server/helpers/video"
+import { VideoTagModel } from './video-tag'
+import { VideoViewModel } from './video-view'
 export enum ScopeNames {
  AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS',
@@ -803,14 +803,14 @@ export class VideoModel extends Model<VideoModel> {
  static async saveEssentialDataToAbuses (instance: VideoModel, options) {
    const tasks: Promise<any>[] = []
-    logger.info('Saving video abuses details of video %s.', instance.url)
    if (!Array.isArray(instance.VideoAbuses)) {
      instance.VideoAbuses = await instance.$get('VideoAbuses')
      if (instance.VideoAbuses.length === 0) return undefined
    }
+    logger.info('Saving video abuses details of video %s.', instance.url)
    const details = instance.toFormattedDetailsJSON()
    for (const abuse of instance.VideoAbuses) {
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.abusesCount).to.be.a('number')
-      expect(userGet.videoAbusesCount).to.equal(0)
+      expect(userGet.abusesCount).to.equal(0)
-      expect(userGet.videoAbusesAcceptedCount).to.be.a('number')
+      expect(userGet.abusesAcceptedCount).to.be.a('number')
-      expect(userGet.videoAbusesAcceptedCount).to.equal(0)
+      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.abusesCount).to.equal(0)
-      expect(user.videoAbusesCreatedCount).to.equal(0)
+      expect(user.abusesCreatedCount).to.equal(0)
-      expect(user.videoAbusesAcceptedCount).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.abusesCount).to.equal(1) // number of incriminations
-      expect(user2.videoAbusesCreatedCount).to.equal(1) // number of reports created
+      expect(user2.abusesCreatedCount).to.equal(1) // number of reports created
-      const body: VideoAbuseUpdate = { state: VideoAbuseState.ACCEPTED }
+      const body: AbuseUpdate = { state: AbuseState.ACCEPTED }
-      await updateVideoAbuse(server.url, server.accessToken, videoId, abuseId, body)
+      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.video.countReports).to.equal(1)
-    expect(abuse.nth).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.video.countReports).to.equal(1)
-    expect(abuse1.nth).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.video.countReports).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.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.video.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.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: AbuseState.ACCEPTED })).to.have.lengthOf(0)
-    expect(await list({ state: VideoAbuseState.PENDING })).to.have.lengthOf(6)
+    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)
diff --git a/server/types/models/index.ts b/server/types/models/index.ts
index 78b4948ce..affa17425 100644
--- a/server/types/models/index.ts
+++ b/server/types/models/index.ts
@@ -1,4 +1,5 @@
 export * from './account'
+export * from './moderation'
 export * from './oauth'
 export * from './server'
 export * from './user'
diff --git a/server/types/models/moderation/abuse.ts b/server/types/models/moderation/abuse.ts
new file mode 100644
index 000000000..a0bf4b08f
--- /dev/null
+++ b/server/types/models/moderation/abuse.ts
@@ -0,0 +1,103 @@
+import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
+import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse'
+import { PickWith } from '@shared/core-utils'
+import { AbuseModel } from '../../../models/abuse/abuse'
+import { MAccountDefault, MAccountFormattable, MAccountLight, MAccountUrl } from '../account'
+import { MCommentOwner, MCommentUrl, MVideoUrl, MCommentOwnerVideo, MComment, MCommentVideo } from '../video'
+import { MVideo, MVideoAccountLightBlacklistAllFiles } from '../video/video'
+type Use<K extends keyof AbuseModel, M> = PickWith<AbuseModel, K, M>
+type UseVideoAbuse<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M>
+type UseCommentAbuse<K extends keyof VideoCommentAbuseModel, M> = PickWith<VideoCommentAbuseModel, K, M>
+// ############################################################################
+export type MAbuse = Omit<AbuseModel, 'VideoCommentAbuse' | 'VideoAbuse' | 'ReporterAccount' | 'FlaggedAccount' | 'toActivityPubObject'>
+export type MVideoAbuse = Omit<VideoAbuseModel, 'Abuse' | 'Video'>
+export type MCommentAbuse = Omit<VideoCommentAbuseModel, 'Abuse' | 'VideoComment'>
+// ############################################################################
+export type MVideoAbuseVideo =
+  MVideoAbuse &
+  UseVideoAbuse<'Video', MVideo>
+export type MVideoAbuseVideoUrl =
+  MVideoAbuse &
+  UseVideoAbuse<'Video', MVideoUrl>
+export type MVideoAbuseVideoFull =
+  MVideoAbuse &
+  UseVideoAbuse<'Video', MVideoAccountLightBlacklistAllFiles>
+export type MVideoAbuseFormattable =
+  MVideoAbuse &
+  UseVideoAbuse<'Video', Pick<MVideoAccountLightBlacklistAllFiles,
+  'id' | 'uuid' | 'name' | 'nsfw' | 'getMiniatureStaticPath' | 'isBlacklisted' | 'VideoChannel'>>
+// ############################################################################
+export type MCommentAbuseAccount =
+  MCommentAbuse &
+  UseCommentAbuse<'VideoComment', MCommentOwner>
+export type MCommentAbuseAccountVideo =
+  MCommentAbuse &
+  UseCommentAbuse<'VideoComment', MCommentOwnerVideo>
+export type MCommentAbuseUrl =
+  MCommentAbuse &
+  UseCommentAbuse<'VideoComment', MCommentUrl>
+export type MCommentAbuseFormattable =
+  MCommentAbuse &
+  UseCommentAbuse<'VideoComment', MComment & PickWith<MCommentVideo, 'Video', Pick<MVideo, 'id' | 'uuid' | 'name'>>>
+// ############################################################################
+export type MAbuseId = Pick<AbuseModel, 'id'>
+export type MAbuseVideo =
+  MAbuse &
+  Pick<AbuseModel, 'toActivityPubObject'> &
+  Use<'VideoAbuse', MVideoAbuseVideo>
+export type MAbuseUrl =
+  MAbuse &
+  Use<'VideoAbuse', MVideoAbuseVideoUrl> &
+  Use<'VideoCommentAbuse', MCommentAbuseUrl>
+export type MAbuseAccountVideo =
+  MAbuse &
+  Pick<AbuseModel, 'toActivityPubObject'> &
+  Use<'VideoAbuse', MVideoAbuseVideoFull> &
+  Use<'ReporterAccount', MAccountDefault>
+export type MAbuseAP =
+  MAbuse &
+  Pick<AbuseModel, 'toActivityPubObject'> &
+  Use<'ReporterAccount', MAccountUrl> &
+  Use<'FlaggedAccount', MAccountUrl> &
+  Use<'VideoAbuse', MVideoAbuseVideo> &
+  Use<'VideoCommentAbuse', MCommentAbuseAccount>
+export type MAbuseFull =
+  MAbuse &
+  Pick<AbuseModel, 'toActivityPubObject'> &
+  Use<'ReporterAccount', MAccountLight> &
+  Use<'FlaggedAccount', MAccountLight> &
+  Use<'VideoAbuse', MVideoAbuseVideoFull> &
+  Use<'VideoCommentAbuse', MCommentAbuseAccountVideo>
+// ############################################################################
+// Format for API or AP object
+export type MAbuseFormattable =
+  MAbuse &
+  Use<'ReporterAccount', MAccountFormattable> &
+  Use<'FlaggedAccount', MAccountFormattable> &
+  Use<'VideoAbuse', MVideoAbuseFormattable> &
+  Use<'VideoCommentAbuse', MCommentAbuseFormattable>
diff --git a/server/types/models/moderation/index.ts b/server/types/models/moderation/index.ts
new file mode 100644
index 000000000..8bea1708f
--- /dev/null
+++ b/server/types/models/moderation/index.ts
@@ -0,0 +1 @@
+export * from './abuse'
diff --git a/server/types/models/user/user-notification.ts b/server/types/models/user/user-notification.ts
index dd3de423b..f59eb7260 100644
--- a/server/types/models/user/user-notification.ts
+++ b/server/types/models/user/user-notification.ts
@@ -1,16 +1,18 @@
-import { UserNotificationModel } from '../../../models/account/user-notification'
+import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
+import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse'
 import { PickWith, PickWithOpt } from '@shared/core-utils'
-import { VideoModel } from '../../../models/video/video'
+import { AbuseModel } from '../../../models/abuse/abuse'
+import { AccountModel } from '../../../models/account/account'
+import { UserNotificationModel } from '../../../models/account/user-notification'
 import { ActorModel } from '../../../models/activitypub/actor'
-import { ServerModel } from '../../../models/server/server'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
 import { AvatarModel } from '../../../models/avatar/avatar'
+import { ServerModel } from '../../../models/server/server'
+import { VideoModel } from '../../../models/video/video'
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
 import { VideoChannelModel } from '../../../models/video/video-channel'
-import { AccountModel } from '../../../models/account/account'
 import { VideoCommentModel } from '../../../models/video/video-comment'
-import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
 import { VideoImportModel } from '../../../models/video/video-import'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
 type Use<K extends keyof UserNotificationModel, M> = PickWith<UserNotificationModel, K, M>
@@ -47,6 +49,18 @@ export module UserNotificationIncludes {
    Pick<VideoAbuseModel, 'id'> &
    PickWith<VideoAbuseModel, 'Video', VideoInclude>
+  export type VideoCommentAbuseInclude =
+    Pick<VideoCommentAbuseModel, 'id'> &
+    PickWith<VideoCommentAbuseModel, 'VideoComment',
+    Pick<VideoCommentModel, 'id' | 'originCommentId' | 'getThreadId'> &
+    PickWith<VideoCommentModel, 'Video', Pick<VideoModel, 'id' | 'name' | 'uuid'>>>
+  export type AbuseInclude =
+    Pick<AbuseModel, 'id'> &
+    PickWith<AbuseModel, 'VideoAbuse', VideoAbuseInclude> &
+    PickWith<AbuseModel, 'VideoCommentAbuse', VideoCommentAbuseInclude> &
+    PickWith<AbuseModel, 'FlaggedAccount', AccountIncludeActor>
  export type VideoBlacklistInclude =
    Pick<VideoBlacklistModel, 'id'> &
    PickWith<VideoAbuseModel, 'Video', VideoInclude>
@@ -76,7 +90,7 @@ export module UserNotificationIncludes {
 // ############################################################################
 export type MUserNotification =
-  Omit<UserNotificationModel, 'User' | 'Video' | 'Comment' | 'VideoAbuse' | 'VideoBlacklist' |
+  Omit<UserNotificationModel, 'User' | 'Video' | 'Comment' | 'Abuse' | 'VideoBlacklist' |
  'VideoImport' | 'Account' | 'ActorFollow'>
 // ############################################################################
@@ -85,7 +99,7 @@ export type UserNotificationModelForApi =
  MUserNotification &
  Use<'Video', UserNotificationIncludes.VideoIncludeChannel> &
  Use<'Comment', UserNotificationIncludes.VideoCommentInclude> &
-  Use<'VideoAbuse', UserNotificationIncludes.VideoAbuseInclude> &
+  Use<'Abuse', UserNotificationIncludes.AbuseInclude> &
  Use<'VideoBlacklist', UserNotificationIncludes.VideoBlacklistInclude> &
  Use<'VideoImport', UserNotificationIncludes.VideoImportInclude> &
  Use<'ActorFollow', UserNotificationIncludes.ActorFollowInclude> &
diff --git a/server/types/models/video/index.ts b/server/types/models/video/index.ts
index bd69c8a4b..25db23898 100644
--- a/server/types/models/video/index.ts
+++ b/server/types/models/video/index.ts
@@ -2,7 +2,6 @@ export * from './schedule-video-update'
 export * from './tag'
 export * from './thumbnail'
 export * from './video'
-export * from './video-abuse'
 export * from './video-blacklist'
 export * from './video-caption'
 export * from './video-change-ownership'
diff --git a/server/types/models/video/video-abuse.ts b/server/types/models/video/video-abuse.ts
deleted file mode 100644
index 279a87cf3..000000000
--- a/server/types/models/video/video-abuse.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { PickWith } from '@shared/core-utils'
-import { MVideoAccountLightBlacklistAllFiles, MVideo } from './video'
-import { MAccountDefault, MAccountFormattable } from '../account'
-type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M>
-// ############################################################################
-export type MVideoAbuse = Omit<VideoAbuseModel, 'Account' | 'Video' | 'toActivityPubObject'>
-// ############################################################################
-export type MVideoAbuseId = Pick<VideoAbuseModel, 'id'>
-export type MVideoAbuseVideo =
-  MVideoAbuse &
-  Pick<VideoAbuseModel, 'toActivityPubObject'> &
-  Use<'Video', MVideo>
-export type MVideoAbuseAccountVideo =
-  MVideoAbuse &
-  Pick<VideoAbuseModel, 'toActivityPubObject'> &
-  Use<'Video', MVideoAccountLightBlacklistAllFiles> &
-  Use<'Account', MAccountDefault>
-// ############################################################################
-// Format for API or AP object
-export type MVideoAbuseFormattable =
-  MVideoAbuse &
-  Use<'Account', MAccountFormattable> &
-  Use<'Video', Pick<MVideoAccountLightBlacklistAllFiles,
-  'id' | 'uuid' | 'name' | 'nsfw' | 'getMiniatureStaticPath' | 'isBlacklisted' | 'VideoChannel'>>
diff --git a/server/typings/express/index.d.ts b/server/typings/express/index.d.ts
index cac801e55..7595e6d86 100644
--- a/server/typings/express/index.d.ts
+++ b/server/typings/express/index.d.ts
@@ -1,5 +1,6 @@
 import { RegisterServerAuthExternalOptions } from '@server/types'
 import {
+  MAbuse,
  MAccountBlocklist,
  MActorUrl,
  MStreamingPlaylist,
@@ -26,7 +27,6 @@ import {
  MComment,
  MCommentOwnerVideoReply,
  MUserDefault,
-  MVideoAbuse,
  MVideoBlacklist,
  MVideoCaptionVideo,
  MVideoFullLight,
@@ -77,7 +77,7 @@ declare module 'express' {
      videoCaption?: MVideoCaptionVideo
-      videoAbuse?: MVideoAbuse
+      abuse?: MAbuse
      videoStreamingPlaylist?: MStreamingPlaylist