From: Chocobozzz <me@florianbigard.com>
Date: Fri, 13 Mar 2020 12:43:26 +0000 (+0100)
Subject: Fix total videos stats
X-Git-Tag: v2.2.0-rc.1~367
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=baab47ca81742deae15acd671e8c332a4e1d6eb7;p=oweals%2Fpeertube.git

Fix total videos stats
---

diff --git a/server/controllers/api/server/stats.ts b/server/controllers/api/server/stats.ts
index 6d508a481..f6a85d0c0 100644
--- a/server/controllers/api/server/stats.ts
+++ b/server/controllers/api/server/stats.ts
@@ -26,11 +26,12 @@ async function getStats (req: express.Request, res: express.Response) {
   const { totalInstanceFollowers, totalInstanceFollowing } = await ActorFollowModel.getStats()
   const { totalLocalVideoFilesSize } = await VideoFileModel.getStats()
 
-  const strategies: { strategy: VideoRedundancyStrategyWithManual, size: number }[] = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES
-                                                                                            .map(r => ({
-                                                                                              strategy: r.strategy,
-                                                                                              size: r.size
-                                                                                            }))
+  const strategies = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES
+                          .map(r => ({
+                            strategy: r.strategy as VideoRedundancyStrategyWithManual,
+                            size: r.size
+                          }))
+
   strategies.push({ strategy: 'manual', size: null })
 
   const videosRedundancyStats = await Promise.all(
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 958a49e65..0e7505af5 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -125,6 +125,7 @@ import { VideoFile } from '@shared/models/videos/video-file.model'
 import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
 import { ModelCache } from '@server/models/model-cache'
 import { buildListQuery, BuildVideosQueryOptions, wrapForAPIResults } from './video-query-builder'
+import { buildNSFWFilter } from '@server/helpers/express-utils'
 
 export enum ScopeNames {
   AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS',
@@ -1301,16 +1302,25 @@ export class VideoModel extends Model<VideoModel> {
         remote: false
       }
     })
-    const totalVideos = await VideoModel.count()
 
     let totalLocalVideoViews = await VideoModel.sum('views', {
       where: {
         remote: false
       }
     })
+
     // Sequelize could return null...
     if (!totalLocalVideoViews) totalLocalVideoViews = 0
 
+    const { total: totalVideos } = await VideoModel.listForApi({
+      start: 0,
+      count: 0,
+      sort: '-publishedAt',
+      nsfw: buildNSFWFilter(),
+      includeLocalVideos: true,
+      withFiles: false
+    })
+
     return {
       totalLocalVideos,
       totalLocalVideoViews,
@@ -1419,6 +1429,8 @@ export class VideoModel extends Model<VideoModel> {
     }
 
     function getModels () {
+      if (options.count === 0) return Promise.resolve([])
+
       const { query, replacements, order } = buildListQuery(VideoModel, options)
       const queryModels = wrapForAPIResults(query, replacements, options, order)
 
diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts
index c207bb5f0..fe956413c 100644
--- a/server/tests/api/server/stats.ts
+++ b/server/tests/api/server/stats.ts
@@ -9,7 +9,7 @@ import {
   doubleFollow,
   flushAndRunMultipleServers,
   follow,
-  ServerInfo,
+  ServerInfo, unfollow,
   uploadVideo,
   viewVideo,
   wait
@@ -95,6 +95,16 @@ describe('Test stats (excluding redundancy)', function () {
     expect(data.totalInstanceFollowers).to.equal(0)
   })
 
+  it('Should have the correct total videos stats after an unfollow', async function () {
+    await unfollow(servers[2].url, servers[2].accessToken, servers[0])
+    await waitJobs(servers)
+
+    const res = await getStats(servers[2].url)
+    const data: ServerStats = res.body
+
+    expect(data.totalVideos).to.equal(0)
+  })
+
   after(async function () {
     await cleanupTests(servers)
   })