X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fmodels%2Fmoderation%2Fabuse%2Fabuse.model.ts;h=7f126ba4a0a15bb4a6100ab6aefb82ef5c63a995;hb=edbc9325462ddf4536775871ebc25e06f46612d1;hp=e241dbd819b18fe5e233ef19db37e80e9df71429;hpb=811cef146c841ef8530bc812c05dfee77e0f2998;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/models/moderation/abuse/abuse.model.ts b/shared/models/moderation/abuse/abuse.model.ts
index e241dbd81..7f126ba4a 100644
--- a/shared/models/moderation/abuse/abuse.model.ts
+++ b/shared/models/moderation/abuse/abuse.model.ts
@@ -4,7 +4,7 @@ import { AbusePredefinedReasonsString } from './abuse-reason.model'
 import { VideoConstant } from '../../videos/video-constant.model'
 import { VideoChannel } from '../../videos/channel/video-channel.model'
 
-export interface VideoAbuse {
+export interface AdminVideoAbuse {
   id: number
   name: string
   uuid: string
@@ -23,8 +23,9 @@ export interface VideoAbuse {
   nthReport: number
 }
 
-export interface VideoCommentAbuse {
+export interface AdminVideoCommentAbuse {
   id: number
+  threadId: number
 
   video: {
     id: number
@@ -37,7 +38,7 @@ export interface VideoCommentAbuse {
   deleted: boolean
 }
 
-export interface Abuse {
+export interface AdminAbuse {
   id: number
 
   reason: string
@@ -49,8 +50,8 @@ export interface Abuse {
   state: VideoConstant<AbuseState>
   moderationComment?: string
 
-  video?: VideoAbuse
-  comment?: VideoCommentAbuse
+  video?: AdminVideoAbuse
+  comment?: AdminVideoCommentAbuse
 
   createdAt: Date
   updatedAt: Date
@@ -58,15 +59,24 @@ export interface Abuse {
   countReportsForReporter?: number
   countReportsForReportee?: number
 
+  countMessages: number
+
   // FIXME: deprecated in 2.3, remove the following properties
 
   // @deprecated
-  startAt: null
+  startAt?: null
   // @deprecated
-  endAt: null
+  endAt?: null
 
   // @deprecated
   count?: number
   // @deprecated
   nth?: number
 }
+
+export type UserVideoAbuse = Omit<AdminVideoAbuse, 'countReports' | 'nthReport'>
+
+export type UserVideoCommentAbuse = AdminVideoCommentAbuse
+
+export type UserAbuse = Omit<AdminAbuse, 'reporterAccount' | 'countReportsForReportee' | 'countReportsForReporter' | 'startAt' | 'endAt'
+| 'count' | 'nth'>