From: Chocobozzz <me@florianbigard.com>
Date: Tue, 25 Sep 2018 16:05:54 +0000 (+0200)
Subject: Only duplicate public videos
X-Git-Tag: v1.0.0-beta.15~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a08f6692780fa5147d85126af3089fc7891e436;p=oweals%2Fpeertube.git

Only duplicate public videos
---

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 8e019f61e..de426c16e 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -119,7 +119,7 @@ const JOB_TTL: { [ id in JobType ]: number } = {
   'activitypub-follow': 60000 * 10, // 10 minutes
   'video-file-import': 1000 * 3600, // 1 hour
   'video-file': 1000 * 3600 * 48, // 2 days, transcoding could be long
-  'video-import': 1000 * 3600 * 5, // 1 hour
+  'video-import': 1000 * 3600, // 1 hour
   'email': 60000 * 10, // 10 minutes
   'videos-views': undefined // Unlimited
 }
diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts
index 58c4f354c..3c87ec2c1 100644
--- a/server/models/redundancy/video-redundancy.ts
+++ b/server/models/redundancy/video-redundancy.ts
@@ -21,7 +21,7 @@ import { getServerActor } from '../../helpers/utils'
 import { VideoModel } from '../video/video'
 import { VideoRedundancyStrategy } from '../../../shared/models/redundancy'
 import { logger } from '../../helpers/logger'
-import { CacheFileObject } from '../../../shared'
+import { CacheFileObject, VideoPrivacy } from '../../../shared'
 import { VideoChannelModel } from '../video/video-channel'
 import { ServerModel } from '../server/server'
 import { sample } from 'lodash'
@@ -160,6 +160,9 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> {
       attributes: [ 'id', 'views' ],
       limit: randomizedFactor,
       order: getVideoSort('-views'),
+      where: {
+        privacy: VideoPrivacy.PUBLIC
+      },
       include: [
         await VideoRedundancyModel.buildVideoFileForDuplication(),
         VideoRedundancyModel.buildServerRedundancyInclude()
@@ -177,6 +180,9 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> {
       group: 'VideoModel.id',
       limit: randomizedFactor,
       order: getVideoSort('-trending'),
+      where: {
+        privacy: VideoPrivacy.PUBLIC
+      },
       include: [
         await VideoRedundancyModel.buildVideoFileForDuplication(),
         VideoRedundancyModel.buildServerRedundancyInclude(),
@@ -195,6 +201,7 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> {
       limit: randomizedFactor,
       order: getVideoSort('-publishedAt'),
       where: {
+        privacy: VideoPrivacy.PUBLIC,
         views: {
           [ Sequelize.Op.gte ]: minViews
         }