Merge branch 'develop' into cli-wrapper

2 files changed, 26 insertions, 3 deletions

diff --git a/shared/models/redundancy/videos-redundancy.model.ts b/shared/models/redundancy/videos-redundancy.model.ts
index eb84964e0..436394c1e 100644
--- a/shared/models/redundancy/videos-redundancy.model.ts
+++ b/shared/models/redundancy/videos-redundancy.model.ts
@@ -1,6 +1,19 @@
-export type VideoRedundancyStrategy = 'most-views'
+export type VideoRedundancyStrategy = 'most-views' | 'trending' | 'recently-added'
 
-export interface VideosRedundancy {
-  strategy: VideoRedundancyStrategy
+export type MostViewsRedundancyStrategy = {
+  strategy: 'most-views'
   size: number
 }
+
+export type TrendingRedundancyStrategy = {
+  strategy: 'trending'
+  size: number
+}
+
+export type RecentlyAddedStrategy = {
+  strategy: 'recently-added'
+  size: number
+  minViews: number
+}
+
+export type VideosRedundancy = MostViewsRedundancyStrategy | TrendingRedundancyStrategy | RecentlyAddedStrategy
diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts
index 5c1bf3468..a6bd2d4d3 100644
--- a/shared/models/server/server-stats.model.ts
+++ b/shared/models/server/server-stats.model.ts
@@ -1,3 +1,5 @@
+import { VideoRedundancyStrategy } from '../redundancy'
+
 export interface ServerStats {
   totalUsers: number
   totalLocalVideos: number
@@ -9,4 +11,12 @@ export interface ServerStats {
 
   totalInstanceFollowers: number
   totalInstanceFollowing: number
+
+  videosRedundancy: {
+    strategy: VideoRedundancyStrategy
+    totalSize: number
+    totalUsed: number
+    totalVideoFiles: number
+    totalVideos: number
+  }[]
 }