-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 } from '../../activitypub/actor'
-import { refreshVideoIfNeeded } from '../../activitypub/videos'
-import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorModel } from '../../../models/actor/actor'
import { VideoPlaylistModel } from '../../../models/video/video-playlist'
-import { RefreshPayload } from '@shared/models'
-import { refreshVideoPlaylistIfNeeded } from '@server/lib/activitypub/playlist'
+import { refreshActorIfNeeded } from '../../activitypub/actors'
-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)
async function refreshVideo (videoUrl: string) {
const fetchType = 'all' as 'all'
- const syncParam = { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true }
+ const syncParam = { rates: 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,
const actor = await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorUrl)
if (actor) {
- await refreshActorIfNeeded(actor, fetchType)
+ await refreshActorIfNeeded({ actor, fetchedType: fetchType })
}
}