13 files changed, 72 insertions, 2 deletions

diff --git a/shared/extra-utils/bulk/bulk.ts b/shared/extra-utils/bulk/bulk.ts
new file mode 100644
index 000000000..d6798ceb7
--- /dev/null
+++ b/shared/extra-utils/bulk/bulk.ts
@@ -0,0 +1,24 @@
+import { BulkRemoveCommentsOfBody } from "@shared/models/bulk/bulk-remove-comments-of-body.model"
+import { makePostBodyRequest } from "../requests/requests"
+
+function bulkRemoveCommentsOf (options: {
+  url: string
+  token: string
+  attributes: BulkRemoveCommentsOfBody
+  expectedStatus?: number
+}) {
+  const { url, token, attributes, expectedStatus } = options
+  const path = '/api/v1/bulk/remove-comments-of'
+
+  return makePostBodyRequest({
+    url,
+    path,
+    token,
+    fields: attributes,
+    statusCodeExpected: expectedStatus || 204
+  })
+}
+
+export {
+  bulkRemoveCommentsOf
+}
diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index d3f010b20..2ac0c6338 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,4 +1,5 @@
 export * from './server/activitypub'
+export * from './bulk/bulk'
 export * from './cli/cli'
 export * from './server/clients'
 export * from './server/config'
diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts
index 743d10316..98cd435f6 100644
--- a/shared/extra-utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -159,6 +159,12 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
           enabled: false
         }
       }
+    },
+    broadcastMessage: {
+      enabled: true,
+      level: 'warning',
+      message: 'hello',
+      dismissable: true
     }
   }
 
diff --git a/shared/extra-utils/videos/video-comments.ts b/shared/extra-utils/videos/video-comments.ts
index 81c48412d..831e5e7d4 100644
--- a/shared/extra-utils/videos/video-comments.ts
+++ b/shared/extra-utils/videos/video-comments.ts
@@ -61,6 +61,12 @@ function addVideoCommentReply (
     .expect(expectedStatus)
 }
 
+async function findCommentId (url: string, videoId: number | string, text: string) {
+  const res = await getVideoCommentThreads(url, videoId, 0, 25, '-createdAt')
+
+  return res.body.data.find(c => c.text === text).id as number
+}
+
 function deleteVideoComment (
   url: string,
   token: string,
@@ -85,5 +91,6 @@ export {
   getVideoThreadComments,
   addVideoCommentThread,
   addVideoCommentReply,
+  findCommentId,
   deleteVideoComment
 }
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts
index 0d36a38a2..99e591cb2 100644
--- a/shared/extra-utils/videos/videos.ts
+++ b/shared/extra-utils/videos/videos.ts
@@ -95,6 +95,12 @@ function getVideo (url: string, id: number | string, expectedStatus = 200) {
           .expect(expectedStatus)
 }
 
+async function getVideoIdFromUUID (url: string, uuid: string) {
+  const res = await getVideo(url, uuid)
+
+  return res.body.id
+}
+
 function getVideoFileMetadataUrl (url: string) {
   return request(url)
     .get('/')
@@ -669,5 +675,6 @@ export {
   checkVideoFilesWereRemoved,
   getPlaylistVideos,
   uploadVideoAndGetId,
-  getLocalIdByUUID
+  getLocalIdByUUID,
+  getVideoIdFromUUID
 }
diff --git a/shared/models/bulk/bulk-remove-comments-of-body.model.ts b/shared/models/bulk/bulk-remove-comments-of-body.model.ts
new file mode 100644
index 000000000..31e018c2a
--- /dev/null
+++ b/shared/models/bulk/bulk-remove-comments-of-body.model.ts
@@ -0,0 +1,4 @@
+export interface BulkRemoveCommentsOfBody {
+  accountName: string
+  scope: 'my-videos' | 'instance'
+}
diff --git a/shared/models/bulk/index.ts b/shared/models/bulk/index.ts
new file mode 100644
index 000000000..168c8cd48
--- /dev/null
+++ b/shared/models/bulk/index.ts
@@ -0,0 +1 @@
+export * from './bulk-remove-comments-of-body.model'
diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts
index 46940772f..9a5ea27dc 100644
--- a/shared/models/i18n/i18n.ts
+++ b/shared/models/i18n/i18n.ts
@@ -18,6 +18,7 @@ export const I18N_LOCALES = {
   'it-IT': 'Italiano',
   'ja-JP': '日本語',
   'nl-NL': 'Nederlands',
+  'oc': 'Occitan',
   'pl-PL': 'Polski',
   'pt-BR': 'Português (Brasil)',
   'pt-PT': 'Português (Portugal)',
diff --git a/shared/models/index.ts b/shared/models/index.ts
index 062533834..b562e04a3 100644
--- a/shared/models/index.ts
+++ b/shared/models/index.ts
@@ -2,6 +2,7 @@ export * from './activitypub'
 export * from './actors'
 export * from './avatars'
 export * from './blocklist'
+export * from './bulk'
 export * from './redundancy'
 export * from './users'
 export * from './videos'
diff --git a/shared/models/server/broadcast-message-level.type.ts b/shared/models/server/broadcast-message-level.type.ts
new file mode 100644
index 000000000..bf43e18b5
--- /dev/null
+++ b/shared/models/server/broadcast-message-level.type.ts
@@ -0,0 +1 @@
+export type BroadcastMessageLevel = 'info' | 'warning' | 'error'
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 07e17bda2..851bf1854 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -1,4 +1,5 @@
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
+import { BroadcastMessageLevel } from './broadcast-message-level.type'
 
 export interface CustomConfig {
   instance: {
@@ -131,4 +132,11 @@ export interface CustomConfig {
       }
     }
   }
+
+  broadcastMessage: {
+    enabled: boolean
+    message: string
+    level: BroadcastMessageLevel
+    dismissable: boolean
+  }
 }
diff --git a/shared/models/server/index.ts b/shared/models/server/index.ts
index b0afb2c66..2bb443d46 100644
--- a/shared/models/server/index.ts
+++ b/shared/models/server/index.ts
@@ -1,4 +1,5 @@
 export * from './about.model'
+export * from './broadcast-message-level.type'
 export * from './contact-form.model'
 export * from './custom-config.model'
 export * from './debug.model'
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index a1f9b3b5d..9c903b7ee 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,5 +1,6 @@
-import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 import { ClientScript } from '../plugins/plugin-package-json.model'
+import { NSFWPolicyType } from '../videos/nsfw-policy.type'
+import { BroadcastMessageLevel } from './broadcast-message-level.type'
 
 export interface ServerConfigPlugin {
   name: string
@@ -161,4 +162,11 @@ export interface ServerConfig {
       }
     }
   }
+
+  broadcastMessage: {
+    enabled: boolean
+    message: string
+    level: BroadcastMessageLevel
+    dismissable: boolean
+  }
 }