+import { isRedundancyAccepted } from '@server/lib/redundancy'
import { ActivityUpdate, CacheFileObject, VideoObject } from '../../../../shared/models/activitypub'
import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
-import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils'
+import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
+import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file'
+import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { sequelizeTypescript } from '../../../initializers/database'
-import { AccountModel } from '../../../models/account/account'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { VideoChannelModel } from '../../../models/video/video-channel'
-import { getImageInfoIfExists, updateActorImageInstance, updateActorInstance } from '../actor'
-import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannelFromVideoObject, updateVideoFromAP } from '../videos'
-import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
-import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file'
-import { createOrUpdateCacheFile } from '../cache-file'
-import { forwardVideoRelatedActivity } from '../send/utils'
-import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
-import { createOrUpdateVideoPlaylist } from '../playlist'
+import { ActorModel } from '../../../models/actor/actor'
import { APProcessorOptions } from '../../../types/activitypub-processor.model'
-import { MActorSignature, MAccountIdActor } from '../../../types/models'
-import { isRedundancyAccepted } from '@server/lib/redundancy'
-import { ActorImageType } from '@shared/models'
+import { MActorFull, MActorSignature } from '../../../types/models'
+import { APActorUpdater } from '../actors/updater'
+import { createOrUpdateCacheFile } from '../cache-file'
+import { createOrUpdateVideoPlaylist } from '../playlists'
+import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
+import { APVideoUpdater, getOrCreateAPVideo } from '../videos'
async function processUpdateActivity (options: APProcessorOptions<ActivityUpdate>) {
const { activity, byActor } = options
const objectType = activity.object.type
if (objectType === 'Video') {
- return retryTransactionWrapper(processUpdateVideo, byActor, activity)
+ return retryTransactionWrapper(processUpdateVideo, activity)
}
if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') {
// ---------------------------------------------------------------------------
-async function processUpdateVideo (actor: MActorSignature, activity: ActivityUpdate) {
+async function processUpdateVideo (activity: ActivityUpdate) {
const videoObject = activity.object as VideoObject
if (sanitizeAndCheckVideoTorrentObject(videoObject) === false) {
return undefined
}
- const { video, created } = await getOrCreateVideoAndAccountAndChannel({
+ const { video, created } = await getOrCreateAPVideo({
videoObject: videoObject.id,
allowRefresh: false,
fetchType: 'all'
// We did not have this video, it has been created so no need to update
if (created) return
- // Load new channel
- const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject)
-
- const account = actor.Account as MAccountIdActor
- account.Actor = actor
-
- const updateOptions = {
- video,
- videoObject,
- account,
- channel: channelActor.VideoChannel,
- overrideTo: activity.to
- }
- return updateVideoFromAP(updateOptions)
+ const updater = new APVideoUpdater(videoObject, video)
+ return updater.update(activity.to)
}
async function processUpdateCacheFile (byActor: MActorSignature, activity: ActivityUpdate) {
return undefined
}
- const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFileObject.object })
+ const { video } = await getOrCreateAPVideo({ videoObject: cacheFileObject.object })
await sequelizeTypescript.transaction(async t => {
await createOrUpdateCacheFile(cacheFileObject, video, byActor, t)
}
}
-async function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) {
- const actorAttributesToUpdate = activity.object as ActivityPubActor
-
- logger.debug('Updating remote account "%s".', actorAttributesToUpdate.url)
- let accountOrChannelInstance: AccountModel | VideoChannelModel
- let actorFieldsSave: object
- let accountOrChannelFieldsSave: object
+async function processUpdateActor (actor: MActorFull, activity: ActivityUpdate) {
+ const actorObject = activity.object as ActivityPubActor
- // Fetch icon?
- const avatarInfo = getImageInfoIfExists(actorAttributesToUpdate, ActorImageType.AVATAR)
- const bannerInfo = getImageInfoIfExists(actorAttributesToUpdate, ActorImageType.BANNER)
+ logger.debug('Updating remote account "%s".', actorObject.url)
- try {
- await sequelizeTypescript.transaction(async t => {
- actorFieldsSave = actor.toJSON()
-
- if (actorAttributesToUpdate.type === 'Group') accountOrChannelInstance = actor.VideoChannel
- else accountOrChannelInstance = actor.Account
-
- accountOrChannelFieldsSave = accountOrChannelInstance.toJSON()
-
- await updateActorInstance(actor, actorAttributesToUpdate)
-
- for (const imageInfo of [ avatarInfo, bannerInfo ]) {
- if (!imageInfo) continue
-
- const imageOptions = Object.assign({}, imageInfo, { onDisk: false })
-
- await updateActorImageInstance(actor, imageOptions, t)
- }
-
- await actor.save({ transaction: t })
-
- accountOrChannelInstance.name = actorAttributesToUpdate.name || actorAttributesToUpdate.preferredUsername
- accountOrChannelInstance.description = actorAttributesToUpdate.summary
-
- if (accountOrChannelInstance instanceof VideoChannelModel) accountOrChannelInstance.support = actorAttributesToUpdate.support
-
- await accountOrChannelInstance.save({ transaction: t })
- })
-
- logger.info('Remote account %s updated', actorAttributesToUpdate.url)
- } catch (err) {
- if (actor !== undefined && actorFieldsSave !== undefined) {
- resetSequelizeInstance(actor, actorFieldsSave)
- }
-
- if (accountOrChannelInstance !== undefined && accountOrChannelFieldsSave !== undefined) {
- resetSequelizeInstance(accountOrChannelInstance, accountOrChannelFieldsSave)
- }
-
- // This is just a debug because we will retry the insert
- logger.debug('Cannot update the remote account.', { err })
- throw err
- }
+ const updater = new APActorUpdater(actorObject, actor)
+ return updater.update()
}
async function processUpdatePlaylist (byActor: MActorSignature, activity: ActivityUpdate) {
if (!byAccount) throw new Error('Cannot update video playlist with the non account actor ' + byActor.url)
- await createOrUpdateVideoPlaylist(playlistObject, byAccount, activity.to)
+ await createOrUpdateVideoPlaylist(playlistObject, activity.to)
}