Don't guess remote tracker URL

[github/Chocobozzz/PeerTube.git] / shared / models / moderation / abuse / abuse.model.ts

diff --git a/shared/models/moderation/abuse/abuse.model.ts b/shared/models/moderation/abuse/abuse.model.ts
index 0a0c6bd3583751beffafd3c586bb90761446f40c..6048777ffc6689054656a5d5bc987674cc24c1bf 100644 (file)
--- 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,7 +23,7 @@ export interface VideoAbuse {
   nthReport: number
 }
 
-export interface VideoCommentAbuse {
+export interface AdminVideoCommentAbuse {
   id: number
   threadId: number
 
@@ -38,7 +38,7 @@ export interface VideoCommentAbuse {
   deleted: boolean
 }
 
-export interface Abuse {
+export interface AdminAbuse {
   id: number
 
   reason: string
@@ -50,8 +50,8 @@ export interface Abuse {
   state: VideoConstant<AbuseState>
   moderationComment?: string
 
-  video?: VideoAbuse
-  comment?: VideoCommentAbuse
+  video?: AdminVideoAbuse
+  comment?: AdminVideoCommentAbuse
 
   createdAt: Date
   updatedAt: Date
@@ -59,15 +59,12 @@ export interface Abuse {
   countReportsForReporter?: number
   countReportsForReportee?: number
 
-  // FIXME: deprecated in 2.3, remove the following properties
+  countMessages: number
+}
 
-  // @deprecated
-  startAt?: null
-  // @deprecated
-  endAt?: null
+export type UserVideoAbuse = Omit<AdminVideoAbuse, 'countReports' | 'nthReport'>
 
-  // @deprecated
-  count?: number
-  // @deprecated
-  nth?: number
-}
+export type UserVideoCommentAbuse = AdminVideoCommentAbuse
+
+export type UserAbuse = Omit<AdminAbuse, 'reporterAccount' | 'countReportsForReportee' | 'countReportsForReporter' | 'startAt' | 'endAt'
+| 'count' | 'nth' | 'moderationComment'>