X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-update.ts;h=4afdbd430576edecfe86043db69fc55713c93faa;hb=47d883de2efbc2e8b5f6f94ae18c15224cbe982b;hp=0bceb370e12f2d6d6489ffd3380f8877dec0b027;hpb=d4defe07d26013a75577b30608841fe3f8334308;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index 0bceb370e..4afdbd430 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts @@ -1,32 +1,44 @@ -import { ActivityUpdate, CacheFileObject, VideoTorrentObject } from '../../../../shared/models/activitypub' +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 { logger } from '../../../helpers/logger' -import { sequelizeTypescript } from '../../../initializers' -import { AccountModel } from '../../../models/account/account' -import { ActorModel } from '../../../models/activitypub/actor' -import { VideoChannelModel } from '../../../models/video/video-channel' -import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor' -import { getOrCreateVideoAndAccountAndChannel, updateVideoFromAP, getOrCreateVideoChannelFromVideoObject } from '../videos' -import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos' +import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object' import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file' -import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' -import { createCacheFile, updateCacheFile } from '../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 { ActorModel } from '../../../models/actor/actor' +import { APProcessorOptions } from '../../../types/activitypub-processor.model' +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) { + const { activity, byActor } = options -async function processUpdateActivity (activity: ActivityUpdate) { - const actor = await getOrCreateActorAndServerAndModel(activity.actor) const objectType = activity.object.type if (objectType === 'Video') { - return retryTransactionWrapper(processUpdateVideo, actor, activity) + return retryTransactionWrapper(processUpdateVideo, activity) } if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') { - return retryTransactionWrapper(processUpdateActor, actor, activity) + // We need more attributes + const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url) + return retryTransactionWrapper(processUpdateActor, byActorFull, activity) } if (objectType === 'CacheFile') { - return retryTransactionWrapper(processUpdateCacheFile, actor, activity) + // We need more attributes + const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url) + return retryTransactionWrapper(processUpdateCacheFile, byActorFull, activity) + } + + if (objectType === 'Playlist') { + return retryTransactionWrapper(processUpdatePlaylist, byActor, activity) } return undefined @@ -40,91 +52,64 @@ export { // --------------------------------------------------------------------------- -async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) { - const videoObject = activity.object as VideoTorrentObject +async function processUpdateVideo (activity: ActivityUpdate) { + const videoObject = activity.object as VideoObject if (sanitizeAndCheckVideoTorrentObject(videoObject) === false) { logger.debug('Video sent by update is not valid.', { videoObject }) return undefined } - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoObject.id }) - const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject) + 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 - const updateOptions = { - video, - videoObject, - account: actor.Account, - channel: channelActor.VideoChannel, - updateViews: true, - overrideTo: activity.to - } - return updateVideoFromAP(updateOptions) + const updater = new APVideoUpdater(videoObject, video) + return updater.update(activity.to) } -async function processUpdateCacheFile (byActor: ActorModel, activity: ActivityUpdate) { +async function processUpdateCacheFile (byActor: MActorSignature, activity: ActivityUpdate) { + if (await isRedundancyAccepted(activity, byActor) !== true) return + const cacheFileObject = activity.object as CacheFileObject - if (!isCacheFileObjectValid(cacheFileObject) === false) { - logger.debug('Cahe file object sent by update is not valid.', { cacheFileObject }) + if (!isCacheFileObjectValid(cacheFileObject)) { + logger.debug('Cache file object sent by update is not valid.', { cacheFileObject }) return undefined } - const redundancyModel = await VideoRedundancyModel.loadByUrl(cacheFileObject.id) - if (!redundancyModel) { - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFileObject.id }) - return createCacheFile(cacheFileObject, video, byActor) - } + const { video } = await getOrCreateAPVideo({ videoObject: cacheFileObject.object }) - return updateCacheFile(cacheFileObject, redundancyModel, byActor) -} + await sequelizeTypescript.transaction(async t => { + await createOrUpdateCacheFile(cacheFileObject, video, byActor, t) + }) -async function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) { - const actorAttributesToUpdate = activity.object as ActivityPubActor + if (video.isOwned()) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] - logger.debug('Updating remote account "%s".', actorAttributesToUpdate.uuid) - let accountOrChannelInstance: AccountModel | VideoChannelModel - let actorFieldsSave: object - let accountOrChannelFieldsSave: object - - // Fetch icon? - const avatarName = await fetchAvatarIfExists(actorAttributesToUpdate) - - 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) + await forwardVideoRelatedActivity(activity, undefined, exceptions, video) + } +} - if (avatarName !== undefined) { - await updateActorAvatarInstance(actor, avatarName, t) - } +async function processUpdateActor (actor: MActorFull, activity: ActivityUpdate) { + const actorObject = activity.object as ActivityPubActor - await actor.save({ transaction: t }) + logger.debug('Updating remote account "%s".', actorObject.url) - accountOrChannelInstance.set('name', actorAttributesToUpdate.name || actorAttributesToUpdate.preferredUsername) - accountOrChannelInstance.set('description', actorAttributesToUpdate.summary) - accountOrChannelInstance.set('support', actorAttributesToUpdate.support) - await accountOrChannelInstance.save({ transaction: t }) - }) + const updater = new APActorUpdater(actorObject, actor) + return updater.update() +} - logger.info('Remote account with uuid %s updated', actorAttributesToUpdate.uuid) - } catch (err) { - if (actor !== undefined && actorFieldsSave !== undefined) { - resetSequelizeInstance(actor, actorFieldsSave) - } +async function processUpdatePlaylist (byActor: MActorSignature, activity: ActivityUpdate) { + const playlistObject = activity.object as PlaylistObject + const byAccount = byActor.Account - if (accountOrChannelInstance !== undefined && accountOrChannelFieldsSave !== undefined) { - resetSequelizeInstance(accountOrChannelInstance, accountOrChannelFieldsSave) - } + if (!byAccount) throw new Error('Cannot update video playlist with the non account actor ' + byActor.url) - // This is just a debug because we will retry the insert - logger.debug('Cannot update the remote account.', { err }) - throw err - } + await createOrUpdateVideoPlaylist(playlistObject, activity.to) }