4 files changed, 59 insertions, 2 deletions

diff --git a/shared/core-utils/users/user-role.ts b/shared/core-utils/users/user-role.ts
index 2b322faf3..81cba1dad 100644
--- a/shared/core-utils/users/user-role.ts
+++ b/shared/core-utils/users/user-role.ts
@@ -22,7 +22,8 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = {
     UserRight.SEE_ALL_VIDEOS,
     UserRight.MANAGE_ACCOUNTS_BLOCKLIST,
     UserRight.MANAGE_SERVERS_BLOCKLIST,
-    UserRight.MANAGE_USERS
+    UserRight.MANAGE_USERS,
+    UserRight.SEE_ALL_COMMENTS
   ],
 
   [UserRole.USER]: []
diff --git a/shared/extra-utils/videos/video-comments.ts b/shared/extra-utils/videos/video-comments.ts
index 831e5e7d4..0b0df81dc 100644
--- a/shared/extra-utils/videos/video-comments.ts
+++ b/shared/extra-utils/videos/video-comments.ts
@@ -1,7 +1,41 @@
 /* eslint-disable @typescript-eslint/no-floating-promises */
 
 import * as request from 'supertest'
-import { makeDeleteRequest } from '../requests/requests'
+import { makeDeleteRequest, makeGetRequest } from '../requests/requests'
+
+function getAdminVideoComments (options: {
+  url: string
+  token: string
+  start: number
+  count: number
+  sort?: string
+  isLocal?: boolean
+  search?: string
+  searchAccount?: string
+  searchVideo?: string
+}) {
+  const { url, token, start, count, sort, isLocal, search, searchAccount, searchVideo } = options
+  const path = '/api/v1/videos/comments'
+
+  const query = {
+    start,
+    count,
+    sort: sort || '-createdAt'
+  }
+
+  if (isLocal !== undefined) Object.assign(query, { isLocal })
+  if (search !== undefined) Object.assign(query, { search })
+  if (searchAccount !== undefined) Object.assign(query, { searchAccount })
+  if (searchVideo !== undefined) Object.assign(query, { searchVideo })
+
+  return makeGetRequest({
+    url,
+    path,
+    token,
+    query,
+    statusCodeExpected: 200
+  })
+}
 
 function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string, token?: string) {
   const path = '/api/v1/videos/' + videoId + '/comment-threads'
@@ -88,6 +122,7 @@ function deleteVideoComment (
 
 export {
   getVideoCommentThreads,
+  getAdminVideoComments,
   getVideoThreadComments,
   addVideoCommentThread,
   addVideoCommentReply,
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
index e815fa893..bbedc9f00 100644
--- a/shared/models/users/user-right.enum.ts
+++ b/shared/models/users/user-right.enum.ts
@@ -32,6 +32,7 @@ export const enum UserRight {
 
   GET_ANY_LIVE,
   SEE_ALL_VIDEOS,
+  SEE_ALL_COMMENTS,
   CHANGE_VIDEO_OWNERSHIP,
 
   MANAGE_PLUGINS,
diff --git a/shared/models/videos/video-comment.model.ts b/shared/models/videos/video-comment.model.ts
index eec7dba1c..9730a3f76 100644
--- a/shared/models/videos/video-comment.model.ts
+++ b/shared/models/videos/video-comment.model.ts
@@ -16,6 +16,26 @@ export interface VideoComment {
   account: Account
 }
 
+export interface VideoCommentAdmin {
+  id: number
+  url: string
+  text: string
+
+  threadId: number
+  inReplyToCommentId: number
+
+  createdAt: Date | string
+  updatedAt: Date | string
+
+  account: Account
+
+  video: {
+    id: number
+    uuid: string
+    name: string
+  }
+}
+
 export interface VideoCommentThreadTree {
   comment: VideoComment
   children: VideoCommentThreadTree[]