Merge branch 'release/4.3.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / server / server-stats.model.ts

diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts
index b1dcf20658ff6838f044e11c2ced782e7d313d98..82f5a737f3a1cec4a1da396d52d3f12dab5363d4 100644 (file)
--- a/shared/models/server/server-stats.model.ts
+++ b/shared/models/server/server-stats.model.ts
@@ -1,5 +1,10 @@
+import { ActivityType } from '../activitypub'
 import { VideoRedundancyStrategyWithManual } from '../redundancy'
-export interface ServerStats {
+
+type ActivityPubMessagesSuccess = Record<`totalActivityPub${ActivityType}MessagesSuccesses`, number>
+type ActivityPubMessagesErrors = Record<`totalActivityPub${ActivityType}MessagesErrors`, number>
+
+export interface ServerStats extends ActivityPubMessagesSuccess, ActivityPubMessagesErrors {
   totalUsers: number
   totalDailyActiveUsers: number
   totalWeeklyActiveUsers: number
@@ -29,32 +34,6 @@ export interface ServerStats {
   totalActivityPubMessagesSuccesses: number
   totalActivityPubMessagesErrors: number
 
-  totalActivityPubCreateMessagesSuccesses: number
-  totalActivityPubUpdateMessagesSuccesses: number
-  totalActivityPubDeleteMessagesSuccesses: number
-  totalActivityPubFollowMessagesSuccesses: number
-  totalActivityPubAcceptMessagesSuccesses: number
-  totalActivityPubRejectMessagesSuccesses: number
-  totalActivityPubAnnounceMessagesSuccesses: number
-  totalActivityPubUndoMessagesSuccesses: number
-  totalActivityPubLikeMessagesSuccesses: number
-  totalActivityPubDislikeMessagesSuccesses: number
-  totalActivityPubFlagMessagesSuccesses: number
-  totalActivityPubViewMessagesSuccesses: number
-
-  totalActivityPubCreateMessagesErrors: number
-  totalActivityPubUpdateMessagesErrors: number
-  totalActivityPubDeleteMessagesErrors: number
-  totalActivityPubFollowMessagesErrors: number
-  totalActivityPubAcceptMessagesErrors: number
-  totalActivityPubRejectMessagesErrors: number
-  totalActivityPubAnnounceMessagesErrors: number
-  totalActivityPubUndoMessagesErrors: number
-  totalActivityPubLikeMessagesErrors: number
-  totalActivityPubDislikeMessagesErrors: number
-  totalActivityPubFlagMessagesErrors: number
-  totalActivityPubViewMessagesErrors: number
-
   activityPubMessagesProcessedPerSecond: number
   totalActivityPubMessagesWaiting: number
 }