Merge branch 'master' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / schedulers / update-videos-scheduler.ts

diff --git a/server/lib/schedulers/update-videos-scheduler.ts b/server/lib/schedulers/update-videos-scheduler.ts
index 293bba91f671e74fb028854b5a8b21050a8d9397..d32c1c06897573cdc0e83b1c867634da72503d40 100644 (file)
--- a/server/lib/schedulers/update-videos-scheduler.ts
+++ b/server/lib/schedulers/update-videos-scheduler.ts
@@ -2,9 +2,8 @@ import { logger } from '../../helpers/logger'
 import { AbstractScheduler } from './abstract-scheduler'
 import { ScheduleVideoUpdateModel } from '../../models/video/schedule-video-update'
 import { retryTransactionWrapper } from '../../helpers/database-utils'
-import { federateVideoIfNeeded } from '../activitypub'
+import { federateVideoIfNeeded } from '../activitypub/videos'
 import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants'
-import { VideoPrivacy } from '../../../shared/models/videos'
 import { Notifier } from '../notifier'
 import { sequelizeTypescript } from '../../initializers/database'
 import { MVideoFullLight } from '@server/typings/models'
@@ -35,16 +34,14 @@ export class UpdateVideosScheduler extends AbstractScheduler {
         logger.info('Executing scheduled video update on %s.', video.uuid)
 
         if (schedule.privacy) {
-          const oldPrivacy = video.privacy
-          const isNewVideo = oldPrivacy === VideoPrivacy.PRIVATE
-
-          video.privacy = schedule.privacy
-          if (isNewVideo === true) video.publishedAt = new Date()
+          const wasConfidentialVideo = video.isConfidential()
+          const isNewVideo = video.isNewVideo(schedule.privacy)
 
+          video.setPrivacy(schedule.privacy)
           await video.save({ transaction: t })
           await federateVideoIfNeeded(video, isNewVideo, t)
 
-          if (oldPrivacy === VideoPrivacy.UNLISTED || oldPrivacy === VideoPrivacy.PRIVATE) {
+          if (wasConfidentialVideo) {
             const videoToPublish: MVideoFullLight = Object.assign(video, { ScheduleVideoUpdate: schedule, UserVideoHistories: [] })
             publishedVideos.push(videoToPublish)
           }