-import { VideoChannelObject, VideoTorrentObject } from '../../../../shared'
-import { ActivityUpdate } from '../../../../shared/models/activitypub/activity'
+import * as Bluebird from 'bluebird'
+import { ActivityUpdate } from '../../../../shared/models/activitypub'
+import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
+import { VideoTorrentObject } from '../../../../shared/models/activitypub/objects'
import { 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 { TagModel } from '../../../models/video/tag'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { VideoFileModel } from '../../../models/video/video-file'
+import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor'
+import {
+ generateThumbnailFromUrl,
+ getOrCreateAccountAndVideoAndChannel, getOrCreateVideoChannel,
+ videoActivityObjectToDBAttributes,
+ videoFileActivityUrlToDBAttributes
+} from '../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 processUpdateVideo(actor, activity)
+ } else if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') {
+ return processUpdateActor(actor, activity)
}
- return undefined
+ return
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function processUpdateVideo (account: AccountInstance, video: VideoTorrentObject) {
+function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) {
const options = {
- arguments: [ account, video ],
+ arguments: [ actor, activity ],
errorMessage: 'Cannot update the remote video with many retries'
}
return retryTransactionWrapper(updateRemoteVideo, options)
}
-async function updateRemoteVideo (account: AccountInstance, videoAttributesToUpdate: VideoTorrentObject) {
+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: VideoInstance
- let videoFieldsSave: object
+ let videoInstance = res.video
+ let videoFieldsSave: any
try {
- await db.sequelize.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = {
transaction: t
}
- const videoInstance = await db.Video.loadByUrlAndPopulateAccount(videoAttributesToUpdate.id, t)
- if (!videoInstance) throw new Error('Video ' + videoAttributesToUpdate.id + ' not found.')
+ videoFieldsSave = videoInstance.toJSON()
- if (videoInstance.VideoChannel.Account.id !== account.id) {
- throw new Error('Account ' + account.url + ' does not own video channel ' + videoInstance.VideoChannel.url)
+ // 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(videoInstance.VideoChannel, videoAttributesToUpdate)
+ 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('nsfw', videoData.nsfw)
videoInstance.set('description', videoData.description)
+ videoInstance.set('support', videoData.support)
+ videoInstance.set('nsfw', videoData.nsfw)
+ videoInstance.set('commentsEnabled', videoData.commentsEnabled)
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)
+ 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 => db.VideoFile.create(f))
+ const tasks = videoFileAttributes.map(f => VideoFileModel.create(f))
await Promise.all(tasks)
const tags = videoAttributesToUpdate.tag.map(t => t.name)
- const tagInstances = await db.Tag.findOrCreateTags(tags, t)
- await videoInstance.setTags(tagInstances, sequelizeOptions)
+ const tagInstances = await TagModel.findOrCreateTags(tags, t)
+ await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
})
logger.info('Remote video with uuid %s updated', videoAttributesToUpdate.uuid)
}
// 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
}
}
-async function processUpdateVideoChannel (account: AccountInstance, videoChannel: VideoChannelObject) {
+function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) {
const options = {
- arguments: [ account, videoChannel ],
- errorMessage: 'Cannot update the remote video channel with many retries.'
+ arguments: [ actor, activity ],
+ errorMessage: 'Cannot update the remote actor with many retries'
}
- await retryTransactionWrapper(updateRemoteVideoChannel, options)
+ return retryTransactionWrapper(updateRemoteActor, options)
}
-async function updateRemoteVideoChannel (account: AccountInstance, videoChannel: VideoChannelObject) {
- logger.debug('Updating remote video channel "%s".', videoChannel.uuid)
+async function updateRemoteActor (actor: ActorModel, activity: ActivityUpdate) {
+ const actorAttributesToUpdate = activity.object as ActivityPubActor
- await db.sequelize.transaction(async t => {
- const sequelizeOptions = { transaction: t }
+ logger.debug('Updating remote account "%s".', actorAttributesToUpdate.uuid)
+ let accountOrChannelInstance: AccountModel | VideoChannelModel
+ let actorFieldsSave: object
+ let accountOrChannelFieldsSave: object
- const videoChannelInstance = await db.VideoChannel.loadByUrl(videoChannel.id)
- if (!videoChannelInstance) throw new Error('Video ' + videoChannel.id + ' not found.')
+ // Fetch icon?
+ const avatarName = await fetchAvatarIfExists(actorAttributesToUpdate)
- if (videoChannelInstance.Account.id !== account.id) {
- throw new Error('Account ' + account.id + ' does not own video channel ' + videoChannelInstance.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)
- videoChannelInstance.set('name', videoChannel.name)
- videoChannelInstance.set('description', videoChannel.content)
- videoChannelInstance.set('createdAt', videoChannel.published)
- videoChannelInstance.set('updatedAt', videoChannel.updated)
+ if (avatarName !== undefined) {
+ await updateActorAvatarInstance(actor, avatarName, t)
+ }
+
+ await actor.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 })
+ })
- await videoChannelInstance.save(sequelizeOptions)
- })
+ logger.info('Remote account with uuid %s updated', actorAttributesToUpdate.uuid)
+ } catch (err) {
+ if (actor !== undefined && actorFieldsSave !== undefined) {
+ resetSequelizeInstance(actor, actorFieldsSave)
+ }
- logger.info('Remote video channel with uuid %s updated', videoChannel.uuid)
+ 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
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff