Merge branch 'release/4.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / job-queue / handlers / activitypub-refresher.ts

diff --git a/server/lib/job-queue/handlers/activitypub-refresher.ts b/server/lib/job-queue/handlers/activitypub-refresher.ts
index 4d6c38cfa0136ee122af6dc839c49fb6e4861362..5037992d2271f5091789942c06eaec8520fe2e4b 100644 (file)
--- a/server/lib/job-queue/handlers/activitypub-refresher.ts
+++ b/server/lib/job-queue/handlers/activitypub-refresher.ts
@@ -1,16 +1,14 @@
-import * as Bull from 'bull'
+import { Job } from 'bull'
+import { refreshVideoPlaylistIfNeeded } from '@server/lib/activitypub/playlists'
+import { refreshVideoIfNeeded } from '@server/lib/activitypub/videos'
+import { loadVideoByUrl } from '@server/lib/model-loaders'
+import { RefreshPayload } from '@shared/models'
 import { logger } from '../../../helpers/logger'
-import { fetchVideoByUrl } from '../../../helpers/video'
-import { refreshActorIfNeeded, refreshVideoIfNeeded, refreshVideoPlaylistIfNeeded } from '../../activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorModel } from '../../../models/actor/actor'
 import { VideoPlaylistModel } from '../../../models/video/video-playlist'
+import { refreshActorIfNeeded } from '../../activitypub/actors'
 
-export type RefreshPayload = {
-  type: 'video' | 'video-playlist' | 'actor'
-  url: string
-}
-
-async function refreshAPObject (job: Bull.Job) {
+async function refreshAPObject (job: Job) {
   const payload = job.data as RefreshPayload
 
   logger.info('Processing AP refresher in job %d for %s.', job.id, payload.url)
@@ -32,7 +30,7 @@ async function refreshVideo (videoUrl: string) {
   const fetchType = 'all' as 'all'
   const syncParam = { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true }
 
-  const videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType)
+  const videoFromDatabase = await loadVideoByUrl(videoUrl, fetchType)
   if (videoFromDatabase) {
     const refreshOptions = {
       video: videoFromDatabase,
@@ -49,7 +47,7 @@ async function refreshActor (actorUrl: string) {
   const actor = await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorUrl)
 
   if (actor) {
-    await refreshActorIfNeeded(actor, fetchType)
+    await refreshActorIfNeeded({ actor, fetchedType: fetchType })
   }
 }