13 files changed, 478 insertions, 170 deletions

diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts
index 45ff969d9..ccd76c093 100644
--- a/server/controllers/api/videos/comment.ts
+++ b/server/controllers/api/videos/comment.ts
@@ -1,5 +1,5 @@
 import * as express from 'express'
-import { ResultList } from '../../../../shared/models'
+import { ResultList, UserRight } from '../../../../shared/models'
 import { VideoCommentCreate } from '../../../../shared/models/videos/video-comment.model'
 import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger'
 import { getFormattedObjects } from '../../../helpers/utils'
@@ -11,6 +11,7 @@ import {
   asyncMiddleware,
   asyncRetryTransactionMiddleware,
   authenticate,
+  ensureUserHasRight,
   optionalAuthenticate,
   paginationValidator,
   setDefaultPagination,
@@ -19,9 +20,11 @@ import {
 import {
   addVideoCommentReplyValidator,
   addVideoCommentThreadValidator,
+  listVideoCommentsValidator,
   listVideoCommentThreadsValidator,
   listVideoThreadCommentsValidator,
   removeVideoCommentValidator,
+  videoCommentsValidator,
   videoCommentThreadsSortValidator
 } from '../../../middlewares/validators'
 import { AccountModel } from '../../../models/account/account'
@@ -61,6 +64,17 @@ videoCommentRouter.delete('/:videoId/comments/:commentId',
   asyncRetryTransactionMiddleware(removeVideoComment)
 )
 
+videoCommentRouter.get('/comments',
+  authenticate,
+  ensureUserHasRight(UserRight.SEE_ALL_COMMENTS),
+  paginationValidator,
+  videoCommentsValidator,
+  setDefaultSort,
+  setDefaultPagination,
+  listVideoCommentsValidator,
+  asyncMiddleware(listComments)
+)
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -69,6 +83,26 @@ export {
 
 // ---------------------------------------------------------------------------
 
+async function listComments (req: express.Request, res: express.Response) {
+  const options = {
+    start: req.query.start,
+    count: req.query.count,
+    sort: req.query.sort,
+
+    isLocal: req.query.isLocal,
+    search: req.query.search,
+    searchAccount: req.query.searchAccount,
+    searchVideo: req.query.searchVideo
+  }
+
+  const resultList = await VideoCommentModel.listCommentsForApi(options)
+
+  return res.json({
+    total: resultList.total,
+    data: resultList.data.map(c => c.toFormattedAdminJSON())
+  })
+}
+
 async function listVideoThreads (req: express.Request, res: express.Response) {
   const video = res.locals.onlyVideo
   const user = res.locals.oauth ? res.locals.oauth.token.User : undefined
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 02e42a594..fde87d9f8 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -63,7 +63,10 @@ const SORTABLE_COLUMNS = {
   JOBS: [ 'createdAt' ],
   VIDEO_CHANNELS: [ 'id', 'name', 'updatedAt', 'createdAt' ],
   VIDEO_IMPORTS: [ 'createdAt' ],
+
   VIDEO_COMMENT_THREADS: [ 'createdAt', 'totalReplies' ],
+  VIDEO_COMMENTS: [ 'createdAt' ],
+
   VIDEO_RATES: [ 'createdAt' ],
   BLACKLISTS: [ 'id', 'name', 'duration', 'views', 'likes', 'dislikes', 'uuid', 'createdAt' ],
   FOLLOWERS: [ 'createdAt', 'state', 'score' ],
diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts
index 29aba0436..e93ceb200 100644
--- a/server/middlewares/validators/sort.ts
+++ b/server/middlewares/validators/sort.ts
@@ -10,6 +10,7 @@ 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)
 const SORTABLE_VIDEO_IMPORTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_IMPORTS)
+const SORTABLE_VIDEO_COMMENTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_COMMENT_THREADS)
 const SORTABLE_VIDEO_COMMENT_THREADS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_COMMENT_THREADS)
 const SORTABLE_VIDEO_RATES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_RATES)
 const SORTABLE_BLACKLISTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.BLACKLISTS)
@@ -33,6 +34,7 @@ const videosSortValidator = checkSort(SORTABLE_VIDEOS_COLUMNS)
 const videoImportsSortValidator = checkSort(SORTABLE_VIDEO_IMPORTS_COLUMNS)
 const videosSearchSortValidator = checkSort(SORTABLE_VIDEOS_SEARCH_COLUMNS)
 const videoChannelsSearchSortValidator = checkSort(SORTABLE_VIDEO_CHANNELS_SEARCH_COLUMNS)
+const videoCommentsValidator = checkSort(SORTABLE_VIDEO_COMMENTS_COLUMNS)
 const videoCommentThreadsSortValidator = checkSort(SORTABLE_VIDEO_COMMENT_THREADS_COLUMNS)
 const videoRatesSortValidator = checkSort(SORTABLE_VIDEO_RATES_COLUMNS)
 const blacklistSortValidator = checkSort(SORTABLE_BLACKLISTS_COLUMNS)
@@ -55,6 +57,7 @@ export {
   abusesSortValidator,
   videoChannelsSortValidator,
   videoImportsSortValidator,
+  videoCommentsValidator,
   videosSearchSortValidator,
   videosSortValidator,
   blacklistSortValidator,
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index 452c7fb93..c91c378b3 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -41,6 +41,7 @@ import { Hooks } from '@server/lib/plugins/hooks'
 const usersListValidator = [
   query('blocked')
     .optional()
+    .customSanitizer(toBooleanOrNull)
     .isBoolean().withMessage('Should be a valid boolean banned state'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts
index 77f5c6ff3..a3c9febc4 100644
--- a/server/middlewares/validators/videos/video-comments.ts
+++ b/server/middlewares/validators/videos/video-comments.ts
@@ -1,8 +1,8 @@
 import * as express from 'express'
-import { body, param } from 'express-validator'
+import { body, param, query } from 'express-validator'
 import { MUserAccountUrl } from '@server/types/models'
 import { UserRight } from '../../../../shared'
-import { isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc'
+import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc'
 import {
   doesVideoCommentExist,
   doesVideoCommentThreadExist,
@@ -15,6 +15,34 @@ import { Hooks } from '../../../lib/plugins/hooks'
 import { MCommentOwnerVideoReply, MVideo, MVideoFullLight } from '../../../types/models/video'
 import { areValidationErrors } from '../utils'
 
+const listVideoCommentsValidator = [
+  query('isLocal')
+  .optional()
+  .customSanitizer(toBooleanOrNull)
+  .custom(isBooleanValid)
+  .withMessage('Should have a valid is local boolean'),
+
+  query('search')
+    .optional()
+    .custom(exists).withMessage('Should have a valid search'),
+
+  query('searchAccount')
+    .optional()
+    .custom(exists).withMessage('Should have a valid account search'),
+
+  query('searchVideo')
+    .optional()
+    .custom(exists).withMessage('Should have a valid video search'),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking listVideoCommentsValidator parameters.', { parameters: req.query })
+
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
+]
+
 const listVideoCommentThreadsValidator = [
   param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
 
@@ -116,6 +144,7 @@ export {
   listVideoCommentThreadsValidator,
   listVideoThreadCommentsValidator,
   addVideoCommentThreadValidator,
+  listVideoCommentsValidator,
   addVideoCommentReplyValidator,
   videoCommentGetValidator,
   removeVideoCommentValidator
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index de27b3d87..ed4a345eb 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -1,6 +1,6 @@
 import * as Bluebird from 'bluebird'
 import { uniq } from 'lodash'
-import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
+import { FindAndCountOptions, FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
 import {
   AllowNull,
   BelongsTo,
@@ -20,13 +20,14 @@ import { MAccount, MAccountId, MUserAccountId } from '@server/types/models'
 import { VideoPrivacy } from '@shared/models'
 import { ActivityTagObject, ActivityTombstoneObject } from '../../../shared/models/activitypub/objects/common-objects'
 import { VideoCommentObject } from '../../../shared/models/activitypub/objects/video-comment-object'
-import { VideoComment } from '../../../shared/models/videos/video-comment.model'
+import { VideoComment, VideoCommentAdmin } from '../../../shared/models/videos/video-comment.model'
 import { actorNameAlphabet } from '../../helpers/custom-validators/activitypub/actor'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
 import { regexpCapture } from '../../helpers/regexp'
 import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
 import {
   MComment,
+  MCommentAdminFormattable,
   MCommentAP,
   MCommentFormattable,
   MCommentId,
@@ -40,7 +41,14 @@ import {
 import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse'
 import { AccountModel } from '../account/account'
 import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor'
-import { buildBlockedAccountSQL, buildBlockedAccountSQLOptimized, buildLocalAccountIdsIn, getCommentSort, throwIfNotValid } from '../utils'
+import {
+  buildBlockedAccountSQL,
+  buildBlockedAccountSQLOptimized,
+  buildLocalAccountIdsIn,
+  getCommentSort,
+  searchAttribute,
+  throwIfNotValid
+} from '../utils'
 import { VideoModel } from './video'
 import { VideoChannelModel } from './video-channel'
 
@@ -303,6 +311,98 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
     return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_ACCOUNT ]).findOne(query)
   }
 
+  static listCommentsForApi (parameters: {
+    start: number
+    count: number
+    sort: string
+
+    isLocal?: boolean
+    search?: string
+    searchAccount?: string
+    searchVideo?: string
+  }) {
+    const { start, count, sort, isLocal, search, searchAccount, searchVideo } = parameters
+
+    const where: WhereOptions = {
+      deletedAt: null
+    }
+
+    const whereAccount: WhereOptions = {}
+    const whereActor: WhereOptions = {}
+    const whereVideo: WhereOptions = {}
+
+    if (isLocal === true) {
+      Object.assign(whereActor, {
+        serverId: null
+      })
+    } else if (isLocal === false) {
+      Object.assign(whereActor, {
+        serverId: {
+          [Op.ne]: null
+        }
+      })
+    }
+
+    if (search) {
+      Object.assign(where, {
+        [Op.or]: [
+          searchAttribute(search, 'text'),
+          searchAttribute(search, '$Account.Actor.preferredUsername$'),
+          searchAttribute(search, '$Account.name$'),
+          searchAttribute(search, '$Video.name$')
+        ]
+      })
+    }
+
+    if (searchAccount) {
+      Object.assign(whereActor, {
+        [Op.or]: [
+          searchAttribute(searchAccount, '$Account.Actor.preferredUsername$'),
+          searchAttribute(searchAccount, '$Account.name$')
+        ]
+      })
+    }
+
+    if (searchVideo) {
+      Object.assign(whereVideo, searchAttribute(searchVideo, 'name'))
+    }
+
+    const query: FindAndCountOptions = {
+      offset: start,
+      limit: count,
+      order: getCommentSort(sort),
+      where,
+      include: [
+        {
+          model: AccountModel.unscoped(),
+          required: true,
+          where: whereAccount,
+          include: [
+            {
+              attributes: {
+                exclude: unusedActorAttributesForAPI
+              },
+              model: ActorModel, // Default scope includes avatar and server
+              required: true,
+              where: whereActor
+            }
+          ]
+        },
+        {
+          model: VideoModel.unscoped(),
+          required: true,
+          where: whereVideo
+        }
+      ]
+    }
+
+    return VideoCommentModel
+      .findAndCountAll(query)
+      .then(({ rows, count }) => {
+        return { total: count, data: rows }
+      })
+  }
+
   static async listThreadsForApi (parameters: {
     videoId: number
     isVideoOwned: boolean
@@ -656,19 +756,51 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
       id: this.id,
       url: this.url,
       text: this.text,
+
       threadId: this.getThreadId(),
       inReplyToCommentId: this.inReplyToCommentId || null,
       videoId: this.videoId,
+
       createdAt: this.createdAt,
       updatedAt: this.updatedAt,
       deletedAt: this.deletedAt,
+
       isDeleted: this.isDeleted(),
+
       totalRepliesFromVideoAuthor: this.get('totalRepliesFromVideoAuthor') || 0,
       totalReplies: this.get('totalReplies') || 0,
-      account: this.Account ? this.Account.toFormattedJSON() : null
+
+      account: this.Account
+        ? this.Account.toFormattedJSON()
+        : null
     } as VideoComment
   }
 
+  toFormattedAdminJSON (this: MCommentAdminFormattable) {
+    return {
+      id: this.id,
+      url: this.url,
+      text: this.text,
+
+      threadId: this.getThreadId(),
+      inReplyToCommentId: this.inReplyToCommentId || null,
+      videoId: this.videoId,
+
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
+
+      video: {
+        id: this.Video.id,
+        uuid: this.Video.uuid,
+        name: this.Video.name
+      },
+
+      account: this.Account
+        ? this.Account.toFormattedJSON()
+        : null
+    } as VideoCommentAdmin
+  }
+
   toActivityPubObject (this: MCommentAP, threadParentComments: MCommentOwner[]): VideoCommentObject | ActivityTombstoneObject {
     let inReplyTo: string
     // New thread, so in AS we reply to the video
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index 3e53c445d..2a220be83 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -154,18 +154,6 @@ describe('Test users API validators', function () {
       await checkBadSortPagination(server.url, path, server.accessToken)
     })
 
-    it('Should fail with a bad blocked/banned user filter', async function () {
-      await makeGetRequest({
-        url: server.url,
-        path,
-        query: {
-          blocked: 42
-        },
-        token: server.accessToken,
-        statusCodeExpected: 400
-      })
-    })
-
     it('Should fail with a non authenticated user', async function () {
       await makeGetRequest({
         url: server.url,
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index 181282ce1..662d4a70d 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -296,6 +296,54 @@ describe('Test video comments API validator', function () {
     it('Should return conflict on comment thread add')
   })
 
+  describe('When listing admin comments threads', function () {
+    const path = '/api/v1/videos/comments'
+
+    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 succeed with the correct params', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        token: server.accessToken,
+        query: {
+          isLocal: false,
+          search: 'toto',
+          searchAccount: 'toto',
+          searchVideo: 'toto'
+        },
+        statusCodeExpected: 200
+      })
+    })
+  })
+
   after(async function () {
     await cleanupTests([ server ])
   })
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts
index aa2e1318a..94c966c9f 100644
--- a/server/tests/api/live/live.ts
+++ b/server/tests/api/live/live.ts
@@ -10,7 +10,6 @@ import {
   checkLiveCleanup,
   checkLiveSegmentHash,
   checkResolutionsInMasterPlaylist,
-  checkSegmentHash,
   cleanupTests,
   createLive,
   doubleFollow,
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index d7b04373f..c90fd09fb 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -158,7 +158,7 @@ describe('Test multiple servers', function () {
     })
 
     it('Should upload the video on server 2 and propagate on each server', async function () {
-      this.timeout(50000)
+      this.timeout(100000)
 
       const user = {
         username: 'user1',
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index afb58e95a..141a80690 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import * as chai from 'chai'
+
 import { cleanupTests, testImage } from '../../../../shared/extra-utils'
 import {
   createUser,
@@ -18,9 +18,11 @@ import {
   addVideoCommentReply,
   addVideoCommentThread,
   deleteVideoComment,
+  getAdminVideoComments,
   getVideoCommentThreads,
   getVideoThreadComments
 } from '../../../../shared/extra-utils/videos/video-comments'
+import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 
 const expect = chai.expect
 
@@ -59,186 +61,248 @@ describe('Test video comments', function () {
     userAccessTokenServer1 = await getAccessToken(server.url, 'user1', 'password')
   })
 
-  it('Should not have threads on this video', async function () {
-    const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+  describe('User comments', function () {
 
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data).to.have.lengthOf(0)
-  })
+    it('Should not have threads on this video', async function () {
+      const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
 
-  it('Should create a thread in this video', async function () {
-    const text = 'my super first comment'
-
-    const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
-    const comment = res.body.comment
-
-    expect(comment.inReplyToCommentId).to.be.null
-    expect(comment.text).equal('my super first comment')
-    expect(comment.videoId).to.equal(videoId)
-    expect(comment.id).to.equal(comment.threadId)
-    expect(comment.account.name).to.equal('root')
-    expect(comment.account.host).to.equal('localhost:' + server.port)
-    expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root')
-    expect(comment.totalReplies).to.equal(0)
-    expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
-    expect(dateIsValid(comment.createdAt as string)).to.be.true
-    expect(dateIsValid(comment.updatedAt as string)).to.be.true
-  })
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(0)
+    })
 
-  it('Should list threads of this video', async function () {
-    const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+    it('Should create a thread in this video', async function () {
+      const text = 'my super first comment'
+
+      const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
+      const comment = res.body.comment
+
+      expect(comment.inReplyToCommentId).to.be.null
+      expect(comment.text).equal('my super first comment')
+      expect(comment.videoId).to.equal(videoId)
+      expect(comment.id).to.equal(comment.threadId)
+      expect(comment.account.name).to.equal('root')
+      expect(comment.account.host).to.equal('localhost:' + server.port)
+      expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root')
+      expect(comment.totalReplies).to.equal(0)
+      expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
+      expect(dateIsValid(comment.createdAt as string)).to.be.true
+      expect(dateIsValid(comment.updatedAt as string)).to.be.true
+    })
 
-    expect(res.body.total).to.equal(1)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data).to.have.lengthOf(1)
+    it('Should list threads of this video', async function () {
+      const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
 
-    const comment: VideoComment = res.body.data[0]
-    expect(comment.inReplyToCommentId).to.be.null
-    expect(comment.text).equal('my super first comment')
-    expect(comment.videoId).to.equal(videoId)
-    expect(comment.id).to.equal(comment.threadId)
-    expect(comment.account.name).to.equal('root')
-    expect(comment.account.host).to.equal('localhost:' + server.port)
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
 
-    await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
+      const comment: VideoComment = res.body.data[0]
+      expect(comment.inReplyToCommentId).to.be.null
+      expect(comment.text).equal('my super first comment')
+      expect(comment.videoId).to.equal(videoId)
+      expect(comment.id).to.equal(comment.threadId)
+      expect(comment.account.name).to.equal('root')
+      expect(comment.account.host).to.equal('localhost:' + server.port)
 
-    expect(comment.totalReplies).to.equal(0)
-    expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
-    expect(dateIsValid(comment.createdAt as string)).to.be.true
-    expect(dateIsValid(comment.updatedAt as string)).to.be.true
+      await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
 
-    threadId = comment.threadId
-  })
+      expect(comment.totalReplies).to.equal(0)
+      expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
+      expect(dateIsValid(comment.createdAt as string)).to.be.true
+      expect(dateIsValid(comment.updatedAt as string)).to.be.true
 
-  it('Should get all the thread created', async function () {
-    const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+      threadId = comment.threadId
+    })
 
-    const rootComment = res.body.comment
-    expect(rootComment.inReplyToCommentId).to.be.null
-    expect(rootComment.text).equal('my super first comment')
-    expect(rootComment.videoId).to.equal(videoId)
-    expect(dateIsValid(rootComment.createdAt as string)).to.be.true
-    expect(dateIsValid(rootComment.updatedAt as string)).to.be.true
-  })
+    it('Should get all the thread created', async function () {
+      const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+
+      const rootComment = res.body.comment
+      expect(rootComment.inReplyToCommentId).to.be.null
+      expect(rootComment.text).equal('my super first comment')
+      expect(rootComment.videoId).to.equal(videoId)
+      expect(dateIsValid(rootComment.createdAt as string)).to.be.true
+      expect(dateIsValid(rootComment.updatedAt as string)).to.be.true
+    })
 
-  it('Should create multiple replies in this thread', async function () {
-    const text1 = 'my super answer to thread 1'
-    const childCommentRes = await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text1)
-    const childCommentId = childCommentRes.body.comment.id
+    it('Should create multiple replies in this thread', async function () {
+      const text1 = 'my super answer to thread 1'
+      const childCommentRes = await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text1)
+      const childCommentId = childCommentRes.body.comment.id
 
-    const text2 = 'my super answer to answer of thread 1'
-    await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2)
+      const text2 = 'my super answer to answer of thread 1'
+      await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2)
 
-    const text3 = 'my second answer to thread 1'
-    await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3)
-  })
+      const text3 = 'my second answer to thread 1'
+      await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3)
+    })
 
-  it('Should get correctly the replies', async function () {
-    const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+    it('Should get correctly the replies', async function () {
+      const res = await getVideoThreadComments(server.url, videoUUID, threadId)
 
-    const tree: VideoCommentThreadTree = res.body
-    expect(tree.comment.text).equal('my super first comment')
-    expect(tree.children).to.have.lengthOf(2)
+      const tree: VideoCommentThreadTree = res.body
+      expect(tree.comment.text).equal('my super first comment')
+      expect(tree.children).to.have.lengthOf(2)
 
-    const firstChild = tree.children[0]
-    expect(firstChild.comment.text).to.equal('my super answer to thread 1')
-    expect(firstChild.children).to.have.lengthOf(1)
+      const firstChild = tree.children[0]
+      expect(firstChild.comment.text).to.equal('my super answer to thread 1')
+      expect(firstChild.children).to.have.lengthOf(1)
 
-    const childOfFirstChild = firstChild.children[0]
-    expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
-    expect(childOfFirstChild.children).to.have.lengthOf(0)
+      const childOfFirstChild = firstChild.children[0]
+      expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
+      expect(childOfFirstChild.children).to.have.lengthOf(0)
 
-    const secondChild = tree.children[1]
-    expect(secondChild.comment.text).to.equal('my second answer to thread 1')
-    expect(secondChild.children).to.have.lengthOf(0)
+      const secondChild = tree.children[1]
+      expect(secondChild.comment.text).to.equal('my second answer to thread 1')
+      expect(secondChild.children).to.have.lengthOf(0)
 
-    replyToDeleteId = secondChild.comment.id
-  })
+      replyToDeleteId = secondChild.comment.id
+    })
 
-  it('Should create other threads', async function () {
-    const text1 = 'super thread 2'
-    await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1)
+    it('Should create other threads', async function () {
+      const text1 = 'super thread 2'
+      await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1)
 
-    const text2 = 'super thread 3'
-    await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2)
-  })
+      const text2 = 'super thread 3'
+      await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2)
+    })
 
-  it('Should list the threads', async function () {
-    const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
+    it('Should list the threads', async function () {
+      const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
 
-    expect(res.body.total).to.equal(3)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data).to.have.lengthOf(3)
+      expect(res.body.total).to.equal(3)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(3)
 
-    expect(res.body.data[0].text).to.equal('my super first comment')
-    expect(res.body.data[0].totalReplies).to.equal(3)
-    expect(res.body.data[1].text).to.equal('super thread 2')
-    expect(res.body.data[1].totalReplies).to.equal(0)
-    expect(res.body.data[2].text).to.equal('super thread 3')
-    expect(res.body.data[2].totalReplies).to.equal(0)
-  })
+      expect(res.body.data[0].text).to.equal('my super first comment')
+      expect(res.body.data[0].totalReplies).to.equal(3)
+      expect(res.body.data[1].text).to.equal('super thread 2')
+      expect(res.body.data[1].totalReplies).to.equal(0)
+      expect(res.body.data[2].text).to.equal('super thread 3')
+      expect(res.body.data[2].totalReplies).to.equal(0)
+    })
 
-  it('Should delete a reply', async function () {
-    await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId)
+    it('Should delete a reply', async function () {
+      await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId)
 
-    const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+      const res = await getVideoThreadComments(server.url, videoUUID, threadId)
 
-    const tree: VideoCommentThreadTree = res.body
-    expect(tree.comment.text).equal('my super first comment')
-    expect(tree.children).to.have.lengthOf(2)
+      const tree: VideoCommentThreadTree = res.body
+      expect(tree.comment.text).equal('my super first comment')
+      expect(tree.children).to.have.lengthOf(2)
 
-    const firstChild = tree.children[0]
-    expect(firstChild.comment.text).to.equal('my super answer to thread 1')
-    expect(firstChild.children).to.have.lengthOf(1)
+      const firstChild = tree.children[0]
+      expect(firstChild.comment.text).to.equal('my super answer to thread 1')
+      expect(firstChild.children).to.have.lengthOf(1)
 
-    const childOfFirstChild = firstChild.children[0]
-    expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
-    expect(childOfFirstChild.children).to.have.lengthOf(0)
+      const childOfFirstChild = firstChild.children[0]
+      expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
+      expect(childOfFirstChild.children).to.have.lengthOf(0)
 
-    const deletedChildOfFirstChild = tree.children[1]
-    expect(deletedChildOfFirstChild.comment.text).to.equal('')
-    expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true
-    expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null
-    expect(deletedChildOfFirstChild.comment.account).to.be.null
-    expect(deletedChildOfFirstChild.children).to.have.lengthOf(0)
-  })
+      const deletedChildOfFirstChild = tree.children[1]
+      expect(deletedChildOfFirstChild.comment.text).to.equal('')
+      expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true
+      expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null
+      expect(deletedChildOfFirstChild.comment.account).to.be.null
+      expect(deletedChildOfFirstChild.children).to.have.lengthOf(0)
+    })
 
-  it('Should delete a complete thread', async function () {
-    await deleteVideoComment(server.url, server.accessToken, videoId, threadId)
-
-    const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
-    expect(res.body.total).to.equal(3)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data).to.have.lengthOf(3)
-
-    expect(res.body.data[0].text).to.equal('')
-    expect(res.body.data[0].isDeleted).to.be.true
-    expect(res.body.data[0].deletedAt).to.not.be.null
-    expect(res.body.data[0].account).to.be.null
-    expect(res.body.data[0].totalReplies).to.equal(3)
-    expect(res.body.data[1].text).to.equal('super thread 2')
-    expect(res.body.data[1].totalReplies).to.equal(0)
-    expect(res.body.data[2].text).to.equal('super thread 3')
-    expect(res.body.data[2].totalReplies).to.equal(0)
+    it('Should delete a complete thread', async function () {
+      await deleteVideoComment(server.url, server.accessToken, videoId, threadId)
+
+      const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
+      expect(res.body.total).to.equal(3)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(3)
+
+      expect(res.body.data[0].text).to.equal('')
+      expect(res.body.data[0].isDeleted).to.be.true
+      expect(res.body.data[0].deletedAt).to.not.be.null
+      expect(res.body.data[0].account).to.be.null
+      expect(res.body.data[0].totalReplies).to.equal(3)
+      expect(res.body.data[1].text).to.equal('super thread 2')
+      expect(res.body.data[1].totalReplies).to.equal(0)
+      expect(res.body.data[2].text).to.equal('super thread 3')
+      expect(res.body.data[2].totalReplies).to.equal(0)
+    })
+
+    it('Should count replies from the video author correctly', async function () {
+      const text = 'my super first comment'
+      await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
+      let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+      const comment: VideoComment = res.body.data[0]
+      const threadId2 = comment.threadId
+
+      const text2 = 'a first answer to thread 4 by a third party'
+      await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2)
+
+      const text3 = 'my second answer to thread 4'
+      await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3)
+
+      res = await getVideoThreadComments(server.url, videoUUID, threadId2)
+      const tree: VideoCommentThreadTree = res.body
+      expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1)
+    })
   })
 
-  it('Should count replies from the video author correctly', async function () {
-    const text = 'my super first comment'
-    await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
-    let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
-    const comment: VideoComment = res.body.data[0]
-    const threadId2 = comment.threadId
+  describe('All instance comments', function () {
+    async function getComments (options: any = {}) {
+      const res = await getAdminVideoComments(Object.assign({
+        url: server.url,
+        token: server.accessToken,
+        start: 0,
+        count: 10
+      }, options))
+
+      return { comments: res.body.data as VideoCommentAdmin[], total: res.body.total as number }
+    }
+
+    it('Should list instance comments as admin', async function () {
+      const { comments } = await getComments({ start: 0, count: 1 })
+
+      expect(comments[0].text).to.equal('my second answer to thread 4')
+    })
+
+    it('Should filter instance comments by isLocal', async function () {
+      const { total, comments } = await getComments({ isLocal: false })
 
-    const text2 = 'a first answer to thread 4 by a third party'
-    await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2)
+      expect(comments).to.have.lengthOf(0)
+      expect(total).to.equal(0)
+    })
+
+    it('Should search instance comments by account', async function () {
+      const { total, comments } = await getComments({ searchAccount: 'user' })
+
+      expect(comments).to.have.lengthOf(1)
+      expect(total).to.equal(1)
+
+      expect(comments[0].text).to.equal('a first answer to thread 4 by a third party')
+    })
+
+    it('Should search instance comments by video', async function () {
+      {
+        const { total, comments } = await getComments({ searchVideo: 'video' })
 
-    const text3 = 'my second answer to thread 4'
-    await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3)
+        expect(comments).to.have.lengthOf(7)
+        expect(total).to.equal(7)
+      }
 
-    res = await getVideoThreadComments(server.url, videoUUID, threadId2)
-    const tree: VideoCommentThreadTree = res.body
-    expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1)
+      {
+        const { total, comments } = await getComments({ searchVideo: 'hello' })
+
+        expect(comments).to.have.lengthOf(0)
+        expect(total).to.equal(0)
+      }
+    })
+
+    it('Should search instance comments', async function () {
+      const { total, comments } = await getComments({ search: 'super thread 3' })
+
+      expect(comments).to.have.lengthOf(1)
+      expect(total).to.equal(1)
+      expect(comments[0].text).to.equal('super thread 3')
+    })
   })
 
   after(async function () {
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index 0bfb5bcd4..b194665ba 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -628,7 +628,7 @@ describe('Test video playlists', function () {
     let video3: string
 
     before(async function () {
-      this.timeout(30000)
+      this.timeout(60000)
 
       groupUser1 = [ Object.assign({}, servers[0], { accessToken: userAccessTokenServer1 }) ]
       groupWithoutToken1 = [ Object.assign({}, servers[0], { accessToken: undefined }) ]
@@ -656,6 +656,8 @@ describe('Test video playlists', function () {
       video2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 90' })).uuid
       video3 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 91', nsfw: true })).uuid
 
+      await waitJobs(servers)
+
       await addVideo({ videoId: video1, startTimestamp: 15, stopTimestamp: 28 })
       await addVideo({ videoId: video2, startTimestamp: 35 })
       await addVideo({ videoId: video3 })
diff --git a/server/types/models/video/video-comment.ts b/server/types/models/video/video-comment.ts
index f1c50c753..83479e7b2 100644
--- a/server/types/models/video/video-comment.ts
+++ b/server/types/models/video/video-comment.ts
@@ -1,7 +1,7 @@
-import { VideoCommentModel } from '../../../models/video/video-comment'
 import { PickWith, PickWithOpt } from '@shared/core-utils'
+import { VideoCommentModel } from '../../../models/video/video-comment'
 import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account'
-import { MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video'
+import { MVideo, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video'
 
 type Use<K extends keyof VideoCommentModel, M> = PickWith<VideoCommentModel, K, M>
 
@@ -59,6 +59,11 @@ export type MCommentFormattable =
   MCommentTotalReplies &
   Use<'Account', MAccountFormattable>
 
+export type MCommentAdminFormattable =
+  MComment &
+  Use<'Account', MAccountFormattable> &
+  Use<'Video', MVideo>
+
 export type MCommentAP =
   MComment &
   Use<'Account', MAccountUrl> &