From 1297eb5db651a230474670c5da1517862fb9cc3e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 22 Aug 2018 16:15:35 +0200 Subject: Add refresh video on search --- server/lib/activitypub/process/process-announce.ts | 4 +- server/lib/activitypub/process/process-create.ts | 10 +-- server/lib/activitypub/process/process-like.ts | 4 +- server/lib/activitypub/process/process-undo.ts | 6 +- server/lib/activitypub/process/process-update.ts | 99 +--------------------- 5 files changed, 16 insertions(+), 107 deletions(-) (limited to 'server/lib/activitypub/process') diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts index b08156aa1..814556817 100644 --- a/server/lib/activitypub/process/process-announce.ts +++ b/server/lib/activitypub/process/process-announce.ts @@ -6,7 +6,7 @@ import { VideoModel } from '../../../models/video/video' import { VideoShareModel } from '../../../models/video/video-share' import { getOrCreateActorAndServerAndModel } from '../actor' import { forwardVideoRelatedActivity } from '../send/utils' -import { getOrCreateAccountAndVideoAndChannel } from '../videos' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' async function processAnnounceActivity (activity: ActivityAnnounce) { const actorAnnouncer = await getOrCreateActorAndServerAndModel(activity.actor) @@ -25,7 +25,7 @@ export { async function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) { const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id - const { video } = await getOrCreateAccountAndVideoAndChannel(objectUri) + const { video } = await getOrCreateVideoAndAccountAndChannel(objectUri) return sequelizeTypescript.transaction(async t => { // Add share entry diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 9655d015f..e8f5ade06 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -10,7 +10,7 @@ import { VideoAbuseModel } from '../../../models/video/video-abuse' import { VideoCommentModel } from '../../../models/video/video-comment' import { getOrCreateActorAndServerAndModel } from '../actor' import { resolveThread } from '../video-comments' -import { getOrCreateAccountAndVideoAndChannel } from '../videos' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { forwardActivity, forwardVideoRelatedActivity } from '../send/utils' async function processCreateActivity (activity: ActivityCreate) { @@ -45,7 +45,7 @@ export { async function processCreateVideo (activity: ActivityCreate) { const videoToCreateData = activity.object as VideoTorrentObject - const { video } = await getOrCreateAccountAndVideoAndChannel(videoToCreateData) + const { video } = await getOrCreateVideoAndAccountAndChannel(videoToCreateData) return video } @@ -56,7 +56,7 @@ async function processCreateDislike (byActor: ActorModel, activity: ActivityCrea if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) - const { video } = await getOrCreateAccountAndVideoAndChannel(dislike.object) + const { video } = await getOrCreateVideoAndAccountAndChannel(dislike.object) return sequelizeTypescript.transaction(async t => { const rate = { @@ -83,7 +83,7 @@ async function processCreateDislike (byActor: ActorModel, activity: ActivityCrea async function processCreateView (byActor: ActorModel, activity: ActivityCreate) { const view = activity.object as ViewObject - const { video } = await getOrCreateAccountAndVideoAndChannel(view.object) + const { video } = await getOrCreateVideoAndAccountAndChannel(view.object) const actor = await ActorModel.loadByUrl(view.actor) if (!actor) throw new Error('Unknown actor ' + view.actor) @@ -103,7 +103,7 @@ async function processCreateVideoAbuse (actor: ActorModel, videoAbuseToCreateDat const account = actor.Account if (!account) throw new Error('Cannot create dislike with the non account actor ' + actor.url) - const { video } = await getOrCreateAccountAndVideoAndChannel(videoAbuseToCreateData.object) + const { video } = await getOrCreateVideoAndAccountAndChannel(videoAbuseToCreateData.object) return sequelizeTypescript.transaction(async t => { const videoAbuseData = { diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts index d0865b78c..9e1664fd8 100644 --- a/server/lib/activitypub/process/process-like.ts +++ b/server/lib/activitypub/process/process-like.ts @@ -5,7 +5,7 @@ import { AccountVideoRateModel } from '../../../models/account/account-video-rat import { ActorModel } from '../../../models/activitypub/actor' import { getOrCreateActorAndServerAndModel } from '../actor' import { forwardVideoRelatedActivity } from '../send/utils' -import { getOrCreateAccountAndVideoAndChannel } from '../videos' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' async function processLikeActivity (activity: ActivityLike) { const actor = await getOrCreateActorAndServerAndModel(activity.actor) @@ -27,7 +27,7 @@ async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) { const byAccount = byActor.Account if (!byAccount) throw new Error('Cannot create like with the non account actor ' + byActor.url) - const { video } = await getOrCreateAccountAndVideoAndChannel(videoUrl) + const { video } = await getOrCreateVideoAndAccountAndChannel(videoUrl) return sequelizeTypescript.transaction(async t => { const rate = { diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts index b6de107ad..eab9e3d61 100644 --- a/server/lib/activitypub/process/process-undo.ts +++ b/server/lib/activitypub/process/process-undo.ts @@ -9,7 +9,7 @@ import { AccountVideoRateModel } from '../../../models/account/account-video-rat import { ActorModel } from '../../../models/activitypub/actor' import { ActorFollowModel } from '../../../models/activitypub/actor-follow' import { forwardVideoRelatedActivity } from '../send/utils' -import { getOrCreateAccountAndVideoAndChannel } from '../videos' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { VideoShareModel } from '../../../models/video/video-share' async function processUndoActivity (activity: ActivityUndo) { @@ -43,7 +43,7 @@ export { async function processUndoLike (actorUrl: string, activity: ActivityUndo) { const likeActivity = activity.object as ActivityLike - const { video } = await getOrCreateAccountAndVideoAndChannel(likeActivity.object) + const { video } = await getOrCreateVideoAndAccountAndChannel(likeActivity.object) return sequelizeTypescript.transaction(async t => { const byAccount = await AccountModel.loadByUrl(actorUrl, t) @@ -67,7 +67,7 @@ async function processUndoLike (actorUrl: string, activity: ActivityUndo) { async function processUndoDislike (actorUrl: string, activity: ActivityUndo) { const dislike = activity.object.object as DislikeObject - const { video } = await getOrCreateAccountAndVideoAndChannel(dislike.object) + const { video } = await getOrCreateVideoAndAccountAndChannel(dislike.object) return sequelizeTypescript.transaction(async t => { const byAccount = await AccountModel.loadByUrl(actorUrl, t) diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index 11226e275..07a5ff92f 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts @@ -1,4 +1,3 @@ -import * as Bluebird from 'bluebird' import { ActivityUpdate, VideoTorrentObject } from '../../../../shared/models/activitypub' import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor' import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils' @@ -6,19 +5,10 @@ import { logger } from '../../../helpers/logger' 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' +import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannel, updateVideoFromAP } from '../videos' import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos' -import { VideoCaptionModel } from '../../../models/video/video-caption' async function processUpdateActivity (activity: ActivityUpdate) { const actor = await getOrCreateActorAndServerAndModel(activity.actor) @@ -49,91 +39,10 @@ async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) return undefined } - const res = await getOrCreateAccountAndVideoAndChannel(videoObject.id) + const { video } = await getOrCreateVideoAndAccountAndChannel(videoObject.id) + const channelActor = await getOrCreateVideoChannel(videoObject) - // Fetch video channel outside the transaction - const newVideoChannelActor = await getOrCreateVideoChannel(videoObject) - const newVideoChannel = newVideoChannelActor.VideoChannel - - logger.debug('Updating remote video "%s".', videoObject.uuid) - let videoInstance = res.video - let videoFieldsSave: any - - try { - await sequelizeTypescript.transaction(async t => { - const sequelizeOptions = { - transaction: t - } - - 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(newVideoChannel, videoObject, 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('waitTranscoding', videoData.waitTranscoding) - videoInstance.set('state', videoData.state) - 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, videoObject.icon) - .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err })) - - // Remove old video files - const videoFileDestroyTasks: Bluebird[] = [] - for (const videoFile of videoInstance.VideoFiles) { - videoFileDestroyTasks.push(videoFile.destroy(sequelizeOptions)) - } - await Promise.all(videoFileDestroyTasks) - - const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoObject) - const tasks = videoFileAttributes.map(f => VideoFileModel.create(f, sequelizeOptions)) - await Promise.all(tasks) - - // Update Tags - const tags = videoObject.tag.map(tag => tag.name) - const tagInstances = await TagModel.findOrCreateTags(tags, t) - await videoInstance.$set('Tags', tagInstances, sequelizeOptions) - - // Update captions - await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(videoInstance.id, t) - - const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => { - return VideoCaptionModel.insertOrReplaceLanguage(videoInstance.id, c.identifier, t) - }) - await Promise.all(videoCaptionsPromises) - }) - - logger.info('Remote video with uuid %s updated', videoObject.uuid) - } catch (err) { - if (videoInstance !== undefined && videoFieldsSave !== undefined) { - resetSequelizeInstance(videoInstance, videoFieldsSave) - } - - // This is just a debug because we will retry the insert - logger.debug('Cannot update the remote video.', { err }) - throw err - } + return updateVideoFromAP(video, videoObject, actor, channelActor, activity.to) } async function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) { -- cgit v1.2.3