X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-create.ts;h=b9f584aa572572f36b81606aa21789ef5cc7f705;hb=6691c52280363fc42f7865230ebb3741f02fff23;hp=791148919f2958c2e1a6e9528543cbb478d2962d;hpb=268eebed921ac13a9ce0f4717f4923aa24190657;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 791148919..b9f584aa5 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -1,33 +1,36 @@ -import { ActivityCreate, VideoAbuseState, VideoTorrentObject } from '../../../../shared' -import { DislikeObject, VideoAbuseObject, ViewObject } from '../../../../shared/models/activitypub/objects' +import { ActivityCreate, CacheFileObject, VideoTorrentObject } from '../../../../shared' import { VideoCommentObject } from '../../../../shared/models/activitypub/objects/video-comment-object' import { retryTransactionWrapper } from '../../../helpers/database-utils' import { logger } from '../../../helpers/logger' import { sequelizeTypescript } from '../../../initializers' -import { AccountVideoRateModel } from '../../../models/account/account-video-rate' import { ActorModel } from '../../../models/activitypub/actor' -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 { forwardActivity, forwardVideoRelatedActivity } from '../send/utils' - -async function processCreateActivity (activity: ActivityCreate) { +import { addVideoComment, resolveThread } from '../video-comments' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { forwardVideoRelatedActivity } from '../send/utils' +import { createOrUpdateCacheFile } from '../cache-file' +import { Notifier } from '../../notifier' +import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object' +import { createOrUpdateVideoPlaylist } from '../playlist' +import { VideoModel } from '../../../models/video/video' + +async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) { const activityObject = activity.object const activityType = activityObject.type - const actor = await getOrCreateActorAndServerAndModel(activity.actor) - - if (activityType === 'View') { - return processCreateView(actor, activity) - } else if (activityType === 'Dislike') { - return retryTransactionWrapper(processCreateDislike, actor, activity) - } else if (activityType === 'Video') { - return processCreateVideo(actor, activity) - } else if (activityType === 'Flag') { - return retryTransactionWrapper(processCreateVideoAbuse, actor, activityObject as VideoAbuseObject) - } else if (activityType === 'Note') { - return retryTransactionWrapper(processCreateVideoComment, actor, activity) + + if (activityType === 'Video') { + return processCreateVideo(activity) + } + + if (activityType === 'Note') { + return retryTransactionWrapper(processCreateVideoComment, activity, byActor) + } + + if (activityType === 'CacheFile') { + return retryTransactionWrapper(processCreateCacheFile, activity, byActor) + } + + if (activityType === 'Playlist') { + return retryTransactionWrapper(processCreatePlaylist, activity, byActor) } logger.warn('Unknown activity object type %s when creating activity.', activityType, { activity: activity.id }) @@ -42,129 +45,68 @@ export { // --------------------------------------------------------------------------- -async function processCreateVideo ( - actor: ActorModel, - activity: ActivityCreate -) { +async function processCreateVideo (activity: ActivityCreate) { const videoToCreateData = activity.object as VideoTorrentObject - const { video } = await getOrCreateAccountAndVideoAndChannel(videoToCreateData, actor) + const { video, created, autoBlacklisted } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoToCreateData }) - return video -} - -async function processCreateDislike (byActor: ActorModel, activity: ActivityCreate) { - const dislike = activity.object as DislikeObject - const byAccount = byActor.Account + if (created && !autoBlacklisted) Notifier.Instance.notifyOnNewVideo(video) - if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) - - const { video } = await getOrCreateAccountAndVideoAndChannel(dislike.object) - - return sequelizeTypescript.transaction(async t => { - const rate = { - type: 'dislike' as 'dislike', - videoId: video.id, - accountId: byAccount.id - } - const [ , created ] = await AccountVideoRateModel.findOrCreate({ - where: rate, - defaults: rate, - transaction: t - }) - if (created === true) await video.increment('dislikes', { transaction: t }) - - if (video.isOwned() && created === true) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - - await forwardVideoRelatedActivity(activity, t, exceptions, video) - } - }) + return video } -async function processCreateView (byActor: ActorModel, activity: ActivityCreate) { - const view = activity.object as ViewObject +async function processCreateCacheFile (activity: ActivityCreate, byActor: ActorModel) { + const cacheFile = activity.object as CacheFileObject - const { video } = await getOrCreateAccountAndVideoAndChannel(view.object) + const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFile.object }) - const actor = await ActorModel.loadByUrl(view.actor) - if (!actor) throw new Error('Unknown actor ' + view.actor) - - await video.increment('views') + await sequelizeTypescript.transaction(async t => { + return createOrUpdateCacheFile(cacheFile, video, byActor, t) + }) if (video.isOwned()) { // Don't resend the activity to the sender const exceptions = [ byActor ] - await forwardActivity(activity, undefined, exceptions) + await forwardVideoRelatedActivity(activity, undefined, exceptions, video) } } -async function processCreateVideoAbuse (actor: ActorModel, videoAbuseToCreateData: VideoAbuseObject) { - logger.debug('Reporting remote abuse for video %s.', videoAbuseToCreateData.object) +async function processCreateVideoComment (activity: ActivityCreate, byActor: ActorModel) { + const commentObject = activity.object as VideoCommentObject + const byAccount = byActor.Account + + if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url) - const account = actor.Account - if (!account) throw new Error('Cannot create dislike with the non account actor ' + actor.url) + let video: VideoModel + try { + const resolveThreadResult = await resolveThread(commentObject.inReplyTo) + video = resolveThreadResult.video + } catch (err) { + logger.debug( + 'Cannot process video comment because we could not resolve thread %s. Maybe it was not a video thread, so skip it.', + commentObject.inReplyTo, + { err } + ) + return + } - const { video } = await getOrCreateAccountAndVideoAndChannel(videoAbuseToCreateData.object) + const { comment, created } = await addVideoComment(video, commentObject.id) - return sequelizeTypescript.transaction(async t => { - const videoAbuseData = { - reporterAccountId: account.id, - reason: videoAbuseToCreateData.content, - videoId: video.id, - state: VideoAbuseState.PENDING - } + if (video.isOwned() && created === true) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] - await VideoAbuseModel.create(videoAbuseData) + await forwardVideoRelatedActivity(activity, undefined, exceptions, video) + } - logger.info('Remote abuse for video uuid %s created', videoAbuseToCreateData.object) - }) + if (created === true) Notifier.Instance.notifyOnNewComment(comment) } -async function processCreateVideoComment (byActor: ActorModel, activity: ActivityCreate) { - const comment = activity.object as VideoCommentObject +async function processCreatePlaylist (activity: ActivityCreate, byActor: ActorModel) { + const playlistObject = activity.object as PlaylistObject const byAccount = byActor.Account - if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url) + if (!byAccount) throw new Error('Cannot create video playlist with the non account actor ' + byActor.url) - const { video, parents } = await resolveThread(comment.inReplyTo) - - return sequelizeTypescript.transaction(async t => { - let originCommentId = null - let inReplyToCommentId = null - - if (parents.length !== 0) { - const parent = parents[0] - - originCommentId = parent.getThreadId() - inReplyToCommentId = parent.id - } - - // This is a new thread - const objectToCreate = { - url: comment.id, - text: comment.content, - originCommentId, - inReplyToCommentId, - videoId: video.id, - accountId: byAccount.id - } - - const options = { - where: { - url: objectToCreate.url - }, - defaults: objectToCreate, - transaction: t - } - const [ ,created ] = await VideoCommentModel.findOrCreate(options) - - if (video.isOwned() && created === true) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - - await forwardVideoRelatedActivity(activity, t, exceptions, video) - } - }) + await createOrUpdateVideoPlaylist(playlistObject, byAccount, activity.to) }