Implement abuses check params

5 files changed, 16 insertions, 4 deletions

diff --git a/shared/models/moderation/abuse/abuse-create.model.ts b/shared/models/moderation/abuse/abuse-create.model.ts
index c0d04e46d..b0358dbb9 100644
--- a/shared/models/moderation/abuse/abuse-create.model.ts
+++ b/shared/models/moderation/abuse/abuse-create.model.ts
@@ -1,11 +1,14 @@
 import { AbusePredefinedReasonsString } from './abuse-reason.model'
 
 export interface AbuseCreate {
-  accountId: number
-
   reason: string
+
   predefinedReasons?: AbusePredefinedReasonsString[]
 
+  account?: {
+    id: number
+  }
+
   video?: {
     id: number
     startAt?: number
diff --git a/shared/models/moderation/abuse/abuse-filter.ts b/shared/models/moderation/abuse/abuse-filter.ts
deleted file mode 100644
index 03303bbab..000000000
--- a/shared/models/moderation/abuse/abuse-filter.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type AbuseFilter = 'video' | 'comment'
diff --git a/shared/models/moderation/abuse/abuse-filter.type.ts b/shared/models/moderation/abuse/abuse-filter.type.ts
new file mode 100644
index 000000000..7dafc6d77
--- /dev/null
+++ b/shared/models/moderation/abuse/abuse-filter.type.ts
@@ -0,0 +1 @@
+export type AbuseFilter = 'video' | 'comment' | 'account'
diff --git a/shared/models/moderation/abuse/abuse.model.ts b/shared/models/moderation/abuse/abuse.model.ts
index 9ff150c4a..a120803e6 100644
--- a/shared/models/moderation/abuse/abuse.model.ts
+++ b/shared/models/moderation/abuse/abuse.model.ts
@@ -9,6 +9,7 @@ export interface VideoAbuse {
   name: string
   uuid: string
   nsfw: boolean
+
   deleted: boolean
   blacklisted: boolean
 
@@ -21,8 +22,15 @@ export interface VideoAbuse {
 
 export interface VideoCommentAbuse {
   id: number
-  account?: Account
+
+  video: {
+    id: number
+    name: string
+    uuid: string
+  }
+
   text: string
+
   deleted: boolean
 }
 
diff --git a/shared/models/moderation/abuse/index.ts b/shared/models/moderation/abuse/index.ts
index 32a6b4e6c..55046426a 100644
--- a/shared/models/moderation/abuse/index.ts
+++ b/shared/models/moderation/abuse/index.ts
@@ -1,4 +1,5 @@
 export * from './abuse-create.model'
+export * from './abuse-filter.type'
 export * from './abuse-reason.model'
 export * from './abuse-state.model'
 export * from './abuse-update.model'