import { sequelizeTypescript } from '../../../initializers'
import { AccountModel } from '../../../models/account/account'
import { ActorModel } from '../../../models/activitypub/actor'
-import { AvatarModel } from '../../../models/avatar/avatar'
import { TagModel } from '../../../models/video/tag'
-import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
import { VideoFileModel } from '../../../models/video/video-file'
-import { fetchActorTotalItems, fetchAvatarIfExists, getOrCreateActorAndServerAndModel } from '../actor'
-import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc'
+import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor'
+import {
+ generateThumbnailFromUrl,
+ getOrCreateAccountAndVideoAndChannel,
+ getOrCreateVideoChannel,
+ videoActivityObjectToDBAttributes,
+ videoFileActivityUrlToDBAttributes
+} from '../videos'
async function processUpdateActivity (activity: ActivityUpdate) {
const actor = await getOrCreateActorAndServerAndModel(activity.actor)
+ const objectType = activity.object.type
- if (activity.object.type === 'Video') {
+ if (objectType === 'Video') {
return processUpdateVideo(actor, activity)
- } else if (activity.object.type === 'Person') {
- return processUpdateAccount(actor, activity)
+ } else if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') {
+ return processUpdateActor(actor, activity)
}
return
async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
const videoAttributesToUpdate = activity.object as VideoTorrentObject
+ const res = await getOrCreateAccountAndVideoAndChannel(videoAttributesToUpdate.id)
+
+ // Fetch video channel outside the transaction
+ const newVideoChannelActor = await getOrCreateVideoChannel(videoAttributesToUpdate)
+ const newVideoChannel = newVideoChannelActor.VideoChannel
+
logger.debug('Updating remote video "%s".', videoAttributesToUpdate.uuid)
- let videoInstance: VideoModel
+ let videoInstance = res.video
let videoFieldsSave: any
try {
transaction: t
}
- const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(videoAttributesToUpdate.id, t)
- if (!videoInstance) throw new Error('Video ' + videoAttributesToUpdate.id + ' not found.')
-
videoFieldsSave = videoInstance.toJSON()
+ // Check actor has the right to update the video
const videoChannel = videoInstance.VideoChannel
if (videoChannel.Account.Actor.id !== actor.id) {
throw new Error('Account ' + actor.url + ' does not own video channel ' + videoChannel.Actor.url)
}
- const videoData = await videoActivityObjectToDBAttributes(videoChannel, videoAttributesToUpdate, activity.to, activity.cc)
+ const videoData = await videoActivityObjectToDBAttributes(newVideoChannel, videoAttributesToUpdate, activity.to)
videoInstance.set('name', videoData.name)
+ videoInstance.set('uuid', videoData.uuid)
+ videoInstance.set('url', videoData.url)
videoInstance.set('category', videoData.category)
videoInstance.set('licence', videoData.licence)
videoInstance.set('language', videoData.language)
+ videoInstance.set('description', videoData.description)
+ videoInstance.set('support', videoData.support)
videoInstance.set('nsfw', videoData.nsfw)
videoInstance.set('commentsEnabled', videoData.commentsEnabled)
- videoInstance.set('privacy', videoData.privacy)
- 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('privacy', videoData.privacy)
+ videoInstance.set('channelId', videoData.channelId)
await videoInstance.save(sequelizeOptions)
+ // Don't block on request
+ generateThumbnailFromUrl(videoInstance, videoAttributesToUpdate.icon)
+ .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoAttributesToUpdate.id, { err }))
+
// Remove old video files
const videoFileDestroyTasks: Bluebird<void>[] = []
for (const videoFile of videoInstance.VideoFiles) {
await Promise.all(videoFileDestroyTasks)
const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoAttributesToUpdate)
- const tasks: Bluebird<any>[] = videoFileAttributes.map(f => VideoFileModel.create(f))
+ const tasks = videoFileAttributes.map(f => VideoFileModel.create(f))
await Promise.all(tasks)
const tags = videoAttributesToUpdate.tag.map(t => t.name)
}
// 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 video.', { err })
throw err
}
}
-function processUpdateAccount (actor: ActorModel, activity: ActivityUpdate) {
+function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) {
const options = {
arguments: [ actor, activity ],
- errorMessage: 'Cannot update the remote account with many retries'
+ errorMessage: 'Cannot update the remote actor with many retries'
}
- return retryTransactionWrapper(updateRemoteAccount, options)
+ return retryTransactionWrapper(updateRemoteActor, options)
}
-async function updateRemoteAccount (actor: ActorModel, activity: ActivityUpdate) {
- const accountAttributesToUpdate = activity.object as ActivityPubActor
+async function updateRemoteActor (actor: ActorModel, activity: ActivityUpdate) {
+ const actorAttributesToUpdate = activity.object as ActivityPubActor
- logger.debug('Updating remote account "%s".', accountAttributesToUpdate.uuid)
- let actorInstance: ActorModel
- let accountInstance: AccountModel
+ logger.debug('Updating remote account "%s".', actorAttributesToUpdate.uuid)
+ let accountOrChannelInstance: AccountModel | VideoChannelModel
let actorFieldsSave: object
- let accountFieldsSave: object
+ let accountOrChannelFieldsSave: object
// Fetch icon?
- const avatarName = await fetchAvatarIfExists(accountAttributesToUpdate)
+ const avatarName = await fetchAvatarIfExists(actorAttributesToUpdate)
try {
await sequelizeTypescript.transaction(async t => {
- actorInstance = await ActorModel.loadByUrl(accountAttributesToUpdate.id, t)
- if (!actorInstance) throw new Error('Actor ' + accountAttributesToUpdate.id + ' not found.')
-
- actorFieldsSave = actorInstance.toJSON()
- accountInstance = actorInstance.Account
- accountFieldsSave = actorInstance.Account.toJSON()
-
- const followersCount = await fetchActorTotalItems(accountAttributesToUpdate.followers)
- const followingCount = await fetchActorTotalItems(accountAttributesToUpdate.following)
-
- actorInstance.set('type', accountAttributesToUpdate.type)
- actorInstance.set('uuid', accountAttributesToUpdate.uuid)
- actorInstance.set('preferredUsername', accountAttributesToUpdate.preferredUsername)
- actorInstance.set('url', accountAttributesToUpdate.id)
- actorInstance.set('publicKey', accountAttributesToUpdate.publicKey.publicKeyPem)
- actorInstance.set('followersCount', followersCount)
- actorInstance.set('followingCount', followingCount)
- actorInstance.set('inboxUrl', accountAttributesToUpdate.inbox)
- actorInstance.set('outboxUrl', accountAttributesToUpdate.outbox)
- actorInstance.set('sharedInboxUrl', accountAttributesToUpdate.endpoints.sharedInbox)
- actorInstance.set('followersUrl', accountAttributesToUpdate.followers)
- actorInstance.set('followingUrl', accountAttributesToUpdate.following)
+ actorFieldsSave = actor.toJSON()
- if (avatarName !== undefined) {
- if (actorInstance.avatarId) {
- await actorInstance.Avatar.destroy({ transaction: t })
- }
+ if (actorAttributesToUpdate.type === 'Group') accountOrChannelInstance = actor.VideoChannel
+ else accountOrChannelInstance = actor.Account
- const avatar = await AvatarModel.create({
- filename: avatarName
- }, { transaction: t })
+ accountOrChannelFieldsSave = accountOrChannelInstance.toJSON()
- actor.set('avatarId', avatar.id)
+ await updateActorInstance(actor, actorAttributesToUpdate)
+
+ if (avatarName !== undefined) {
+ await updateActorAvatarInstance(actor, avatarName, t)
}
await actor.save({ transaction: t })
- actor.Account.set('name', accountAttributesToUpdate.name || accountAttributesToUpdate.preferredUsername)
- await actor.Account.save({ transaction: t })
+ 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 account with uuid %s updated', accountAttributesToUpdate.uuid)
+ logger.info('Remote account with uuid %s updated', actorAttributesToUpdate.uuid)
} catch (err) {
- if (actorInstance !== undefined && actorFieldsSave !== undefined) {
- resetSequelizeInstance(actorInstance, actorFieldsSave)
+ if (actor !== undefined && actorFieldsSave !== undefined) {
+ resetSequelizeInstance(actor, actorFieldsSave)
}
- if (accountInstance !== undefined && accountFieldsSave !== undefined) {
- resetSequelizeInstance(accountInstance, accountFieldsSave)
+ 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)
+ logger.debug('Cannot update the remote account.', { err })
throw err
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff