X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-update.ts;h=d2ad738a26f0414544d61e0b1d7c7396a6c4bce7;hb=f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9;hp=7caf2ca7858f376576b68facbe2bbfb3846505a4;hpb=0f91ae62df8a37194fea84ce1efa9e733d9c1fd8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index 7caf2ca78..d2ad738a2 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts @@ -1,22 +1,23 @@ -import { VideoChannelObject, VideoTorrentObject } from '../../../../shared' -import { ActivityUpdate } from '../../../../shared/models/activitypub/activity' -import { retryTransactionWrapper } from '../../../helpers/database-utils' +import { ActivityUpdate, VideoTorrentObject } 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 { resetSequelizeInstance } from '../../../helpers/utils' -import { database as db } from '../../../initializers' -import { AccountInstance } from '../../../models/account/account-interface' -import { VideoInstance } from '../../../models/video/video-interface' -import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc' -import Bluebird = require('bluebird') -import { getOrCreateAccountAndServer } from '../account' +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, getOrCreateVideoChannelFromVideoObject, updateVideoFromAP } from '../videos' +import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos' async function processUpdateActivity (activity: ActivityUpdate) { - const account = await getOrCreateAccountAndServer(activity.actor) + const actor = await getOrCreateActorAndServerAndModel(activity.actor) + const objectType = activity.object.type - if (activity.object.type === 'Video') { - return processUpdateVideo(account, activity.object) - } else if (activity.object.type === 'VideoChannel') { - return processUpdateVideoChannel(account, activity.object) + if (objectType === 'Video') { + return retryTransactionWrapper(processUpdateVideo, actor, activity) + } else if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') { + return retryTransactionWrapper(processUpdateActor, actor, activity) } return undefined @@ -30,106 +31,66 @@ export { // --------------------------------------------------------------------------- -function processUpdateVideo (account: AccountInstance, video: VideoTorrentObject) { - const options = { - arguments: [ account, video ], - errorMessage: 'Cannot update the remote video with many retries' +async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) { + const videoObject = activity.object as VideoTorrentObject + + if (sanitizeAndCheckVideoTorrentObject(videoObject) === false) { + logger.debug('Video sent by update is not valid.', { videoObject }) + return undefined } - return retryTransactionWrapper(updateRemoteVideo, options) + const { video } = await getOrCreateVideoAndAccountAndChannel(videoObject.id) + const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject) + + return updateVideoFromAP(video, videoObject, actor, channelActor, activity.to) } -async function updateRemoteVideo (account: AccountInstance, videoAttributesToUpdate: VideoTorrentObject) { - logger.debug('Updating remote video "%s".', videoAttributesToUpdate.uuid) - let videoInstance: VideoInstance - let videoFieldsSave: object +async function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) { + const actorAttributesToUpdate = activity.object as ActivityPubActor + + 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 db.sequelize.transaction(async t => { - const sequelizeOptions = { - transaction: t - } + await sequelizeTypescript.transaction(async t => { + actorFieldsSave = actor.toJSON() - const videoInstance = await db.Video.loadByUrlAndPopulateAccount(videoAttributesToUpdate.id, t) - if (!videoInstance) throw new Error('Video ' + videoAttributesToUpdate.id + ' not found.') + if (actorAttributesToUpdate.type === 'Group') accountOrChannelInstance = actor.VideoChannel + else accountOrChannelInstance = actor.Account - if (videoInstance.VideoChannel.Account.id !== account.id) { - throw new Error('Account ' + account.url + ' does not own video channel ' + videoInstance.VideoChannel.url) - } + accountOrChannelFieldsSave = accountOrChannelInstance.toJSON() - const videoData = await videoActivityObjectToDBAttributes(videoInstance.VideoChannel, videoAttributesToUpdate) - videoInstance.set('name', videoData.name) - videoInstance.set('category', videoData.category) - videoInstance.set('licence', videoData.licence) - videoInstance.set('language', videoData.language) - videoInstance.set('nsfw', videoData.nsfw) - videoInstance.set('description', videoData.description) - videoInstance.set('duration', videoData.duration) - videoInstance.set('createdAt', videoData.createdAt) - videoInstance.set('updatedAt', videoData.updatedAt) - videoInstance.set('views', videoData.views) - // videoInstance.set('likes', videoData.likes) - // videoInstance.set('dislikes', videoData.dislikes) - - await videoInstance.save(sequelizeOptions) - - // Remove old video files - const videoFileDestroyTasks: Bluebird[] = [] - for (const videoFile of videoInstance.VideoFiles) { - videoFileDestroyTasks.push(videoFile.destroy(sequelizeOptions)) + await updateActorInstance(actor, actorAttributesToUpdate) + + if (avatarName !== undefined) { + await updateActorAvatarInstance(actor, avatarName, t) } - await Promise.all(videoFileDestroyTasks) - const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoAttributesToUpdate) - const tasks: Bluebird[] = videoFileAttributes.map(f => db.VideoFile.create(f)) - await Promise.all(tasks) + await actor.save({ transaction: t }) - const tags = videoAttributesToUpdate.tag.map(t => t.name) - const tagInstances = await db.Tag.findOrCreateTags(tags, t) - await videoInstance.setTags(tagInstances, sequelizeOptions) + accountOrChannelInstance.set('name', actorAttributesToUpdate.name || actorAttributesToUpdate.preferredUsername) + accountOrChannelInstance.set('description', actorAttributesToUpdate.summary) + accountOrChannelInstance.set('support', actorAttributesToUpdate.support) + await accountOrChannelInstance.save({ transaction: t }) }) - logger.info('Remote video with uuid %s updated', videoAttributesToUpdate.uuid) + logger.info('Remote account with uuid %s updated', actorAttributesToUpdate.uuid) } catch (err) { - if (videoInstance !== undefined && videoFieldsSave !== undefined) { - resetSequelizeInstance(videoInstance, videoFieldsSave) + 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 video.', err) + logger.debug('Cannot update the remote account.', { err }) throw err } } - -async function processUpdateVideoChannel (account: AccountInstance, videoChannel: VideoChannelObject) { - const options = { - arguments: [ account, videoChannel ], - errorMessage: 'Cannot update the remote video channel with many retries.' - } - - await retryTransactionWrapper(updateRemoteVideoChannel, options) -} - -async function updateRemoteVideoChannel (account: AccountInstance, videoChannel: VideoChannelObject) { - logger.debug('Updating remote video channel "%s".', videoChannel.uuid) - - await db.sequelize.transaction(async t => { - const sequelizeOptions = { transaction: t } - - const videoChannelInstance = await db.VideoChannel.loadByUrl(videoChannel.id) - if (!videoChannelInstance) throw new Error('Video ' + videoChannel.id + ' not found.') - - if (videoChannelInstance.Account.id !== account.id) { - throw new Error('Account ' + account.id + ' does not own video channel ' + videoChannelInstance.url) - } - - videoChannelInstance.set('name', videoChannel.name) - videoChannelInstance.set('description', videoChannel.content) - videoChannelInstance.set('createdAt', videoChannel.published) - videoChannelInstance.set('updatedAt', videoChannel.updated) - - await videoChannelInstance.save(sequelizeOptions) - }) - - logger.info('Remote video channel with uuid %s updated', videoChannel.uuid) -}