2 files changed, 19 insertions, 29 deletions

diff --git a/server/lib/job-queue/handlers/video-views.ts b/server/lib/job-queue/handlers/video-views-stats.ts
index 86d0a271f..caf5f6962 100644
--- a/server/lib/job-queue/handlers/video-views.ts
+++ b/server/lib/job-queue/handlers/video-views-stats.ts
@@ -1,11 +1,10 @@
-import { Redis } from '../../redis'
+import { isTestInstance } from '../../../helpers/core-utils'
 import { logger } from '../../../helpers/logger'
 import { VideoModel } from '../../../models/video/video'
 import { VideoViewModel } from '../../../models/video/video-view'
-import { isTestInstance } from '../../../helpers/core-utils'
-import { federateVideoIfNeeded } from '../../activitypub/videos'
+import { Redis } from '../../redis'
 
-async function processVideosViews () {
+async function processVideosViewsStats () {
   const lastHour = new Date()
 
   // In test mode, we run this function multiple times per hour, so we don't want the values of the previous hour
@@ -15,23 +14,23 @@ async function processVideosViews () {
   const startDate = lastHour.setMinutes(0, 0, 0)
   const endDate = lastHour.setMinutes(59, 59, 999)
 
-  const videoIds = await Redis.Instance.getVideosIdViewed(hour)
+  const videoIds = await Redis.Instance.listVideosViewedForStats(hour)
   if (videoIds.length === 0) return
 
-  logger.info('Processing videos views in job for hour %d.', hour)
+  logger.info('Processing videos views stats in job for hour %d.', hour)
 
   for (const videoId of videoIds) {
     try {
-      const views = await Redis.Instance.getVideoViews(videoId, hour)
-      await Redis.Instance.deleteVideoViews(videoId, hour)
+      const views = await Redis.Instance.getVideoViewsStats(videoId, hour)
+      await Redis.Instance.deleteVideoViewsStats(videoId, hour)
 
       if (views) {
-        logger.debug('Adding %d views to video %d in hour %d.', views, videoId, hour)
+        logger.debug('Adding %d views to video %d stats in hour %d.', views, videoId, hour)
 
         try {
-          const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
+          const video = await VideoModel.load(videoId)
           if (!video) {
-            logger.debug('Video %d does not exist anymore, skipping videos view addition.', videoId)
+            logger.debug('Video %d does not exist anymore, skipping videos view stats.', videoId)
             continue
           }
 
@@ -41,21 +40,12 @@ async function processVideosViews () {
             views,
             videoId
           })
-
-          if (video.isOwned()) {
-            // If this is a remote video, the origin instance will send us an update
-            await VideoModel.incrementViews(videoId, views)
-
-            // Send video update
-            video.views += views
-            await federateVideoIfNeeded(video, false)
-          }
         } catch (err) {
-          logger.error('Cannot create video views for video %d in hour %d.', videoId, hour, { err })
+          logger.error('Cannot create video views stats for video %d in hour %d.', videoId, hour, { err })
         }
       }
     } catch (err) {
-      logger.error('Cannot update video views of video %d in hour %d.', videoId, hour, { err })
+      logger.error('Cannot update video views stats of video %d in hour %d.', videoId, hour, { err })
     }
   }
 }
@@ -63,5 +53,5 @@ async function processVideosViews () {
 // ---------------------------------------------------------------------------
 
 export {
-  processVideosViews
+  processVideosViewsStats
 }
diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts
index 0eab720d9..4c1597b33 100644
--- a/server/lib/job-queue/job-queue.ts
+++ b/server/lib/job-queue/job-queue.ts
@@ -36,7 +36,7 @@ import { processVideoFileImport } from './handlers/video-file-import'
 import { processVideoImport } from './handlers/video-import'
 import { processVideoLiveEnding } from './handlers/video-live-ending'
 import { processVideoTranscoding } from './handlers/video-transcoding'
-import { processVideosViews } from './handlers/video-views'
+import { processVideosViewsStats } from './handlers/video-views-stats'
 
 type CreateJobArgument =
   { type: 'activitypub-http-broadcast', payload: ActivitypubHttpBroadcastPayload } |
@@ -49,7 +49,7 @@ type CreateJobArgument =
   { type: 'email', payload: EmailPayload } |
   { type: 'video-import', payload: VideoImportPayload } |
   { type: 'activitypub-refresher', payload: RefreshPayload } |
-  { type: 'videos-views', payload: {} } |
+  { type: 'videos-views-stats', payload: {} } |
   { type: 'video-live-ending', payload: VideoLiveEndingPayload } |
   { type: 'actor-keys', payload: ActorKeysPayload } |
   { type: 'video-redundancy', payload: VideoRedundancyPayload } |
@@ -71,7 +71,7 @@ const handlers: { [id in JobType]: (job: Job) => Promise<any> } = {
   'video-transcoding': processVideoTranscoding,
   'email': processEmail,
   'video-import': processVideoImport,
-  'videos-views': processVideosViews,
+  'videos-views-stats': processVideosViewsStats,
   'activitypub-refresher': refreshAPObject,
   'video-live-ending': processVideoLiveEnding,
   'actor-keys': processActorKeys,
@@ -89,7 +89,7 @@ const jobTypes: JobType[] = [
   'video-transcoding',
   'video-file-import',
   'video-import',
-  'videos-views',
+  'videos-views-stats',
   'activitypub-refresher',
   'video-redundancy',
   'actor-keys',
@@ -247,8 +247,8 @@ class JobQueue {
   }
 
   private addRepeatableJobs () {
-    this.queues['videos-views'].add({}, {
-      repeat: REPEAT_JOBS['videos-views']
+    this.queues['videos-views-stats'].add({}, {
+      repeat: REPEAT_JOBS['videos-views-stats']
     }).catch(err => logger.error('Cannot add repeatable job.', { err }))
 
     if (CONFIG.FEDERATION.VIDEOS.CLEANUP_REMOTE_INTERACTIONS) {