X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-create.ts;h=9cded4dec00a28a7571ee3e1ce019d0b53a68a8a;hb=403c69c5a34e6db621f30c7b2bfb2b80dc8e74c1;hp=ceb5413ca6d153b889305502e949ac74adfdeecb;hpb=e5565833f62b97f62ea75eba5b479963ae78b873;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index ceb5413ca..9cded4dec 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -1,34 +1,42 @@ -import { ActivityCreate, CacheFileObject, VideoAbuseState, VideoTorrentObject } from '../../../../shared' -import { DislikeObject, VideoAbuseObject, ViewObject } from '../../../../shared/models/activitypub/objects' +import { isRedundancyAccepted } from '@server/lib/redundancy' +import { ActivityCreate, CacheFileObject, VideoObject } from '../../../../shared' +import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object' 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 { addVideoComment, resolveThread } from '../video-comments' +import { sequelizeTypescript } from '../../../initializers/database' +import { APProcessorOptions } from '../../../types/activitypub-processor.model' +import { MActorSignature, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../../types/models' +import { Notifier } from '../../notifier' +import { createOrUpdateCacheFile } from '../cache-file' +import { createOrUpdateVideoPlaylist } from '../playlist' +import { forwardVideoRelatedActivity } from '../send/utils' +import { resolveThread } from '../video-comments' import { getOrCreateVideoAndAccountAndChannel } from '../videos' -import { forwardActivity, forwardVideoRelatedActivity } from '../send/utils' -import { Redis } from '../../redis' -import { createCacheFile } from '../cache-file' +import { isBlockedByServerOrAccount } from '@server/lib/blocklist' -async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) { +async function processCreateActivity (options: APProcessorOptions) { + const { activity, byActor } = options + + // Only notify if it is not from a fetcher job + const notify = options.fromFetch !== true const activityObject = activity.object const activityType = activityObject.type - if (activityType === 'View') { - return processCreateView(byActor, activity) - } else if (activityType === 'Dislike') { - return retryTransactionWrapper(processCreateDislike, byActor, activity) - } else if (activityType === 'Video') { - return processCreateVideo(activity) - } else if (activityType === 'Flag') { - return retryTransactionWrapper(processCreateVideoAbuse, byActor, activityObject as VideoAbuseObject) - } else if (activityType === 'Note') { - return retryTransactionWrapper(processCreateVideoComment, byActor, activity) - } else if (activityType === 'CacheFile') { - return retryTransactionWrapper(processCacheFile, byActor, activity) + if (activityType === 'Video') { + return processCreateVideo(activity, notify) + } + + if (activityType === 'Note') { + return retryTransactionWrapper(processCreateVideoComment, activity, byActor, notify) + } + + 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 }) @@ -43,69 +51,26 @@ export { // --------------------------------------------------------------------------- -async function processCreateVideo (activity: ActivityCreate) { - const videoToCreateData = activity.object as VideoTorrentObject - - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoToCreateData }) - - return video -} - -async function processCreateDislike (byActor: ActorModel, activity: ActivityCreate) { - const dislike = activity.object as DislikeObject - const byAccount = byActor.Account +async function processCreateVideo (activity: ActivityCreate, notify: boolean) { + const videoToCreateData = activity.object as VideoObject - if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) + const syncParam = { likes: false, dislikes: false, shares: false, comments: false, thumbnail: true, refreshVideo: false } + const { video, created } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoToCreateData, syncParam }) - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislike.object }) + if (created && notify) Notifier.Instance.notifyOnNewVideoIfNeeded(video) - 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 - - const options = { - videoObject: view.object, - fetchType: 'only-video' as 'only-video' - } - const { video } = await getOrCreateVideoAndAccountAndChannel(options) - - await Redis.Instance.addVideoView(video.id) - - if (video.isOwned()) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - await forwardVideoRelatedActivity(activity, undefined, exceptions, video) - } -} +async function processCreateCacheFile (activity: ActivityCreate, byActor: MActorSignature) { + if (await isRedundancyAccepted(activity, byActor) !== true) return -async function processCacheFile (byActor: ActorModel, activity: ActivityCreate) { const cacheFile = activity.object as CacheFileObject const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFile.object }) await sequelizeTypescript.transaction(async t => { - return createCacheFile(cacheFile, video, byActor, t) + return createOrUpdateCacheFile(cacheFile, video, byActor, t) }) if (video.isOwned()) { @@ -115,42 +80,53 @@ async function processCacheFile (byActor: ActorModel, activity: ActivityCreate) } } -async function processCreateVideoAbuse (byActor: ActorModel, videoAbuseToCreateData: VideoAbuseObject) { - logger.debug('Reporting remote abuse for video %s.', videoAbuseToCreateData.object) +async function processCreateVideoComment (activity: ActivityCreate, byActor: MActorSignature, notify: boolean) { + const commentObject = activity.object as VideoCommentObject + const byAccount = byActor.Account - const account = byActor.Account - if (!account) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) + if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url) - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoAbuseToCreateData.object }) + let video: MVideoAccountLightBlacklistAllFiles + let created: boolean + let comment: MCommentOwnerVideo + try { + const resolveThreadResult = await resolveThread({ url: commentObject.id, isVideo: false }) + + video = resolveThreadResult.video + created = resolveThreadResult.commentCreated + comment = resolveThreadResult.comment + } 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 + } - return sequelizeTypescript.transaction(async t => { - const videoAbuseData = { - reporterAccountId: account.id, - reason: videoAbuseToCreateData.content, - videoId: video.id, - state: VideoAbuseState.PENDING + // Try to not forward unwanted commments on our videos + if (video.isOwned()) { + if (await isBlockedByServerOrAccount(comment.Account, video.VideoChannel.Account)) { + logger.info('Skip comment forward from blocked account or server %s.', comment.Account.Actor.url) + return } - await VideoAbuseModel.create(videoAbuseData, { transaction: t }) + if (created === true) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] - logger.info('Remote abuse for video uuid %s created', videoAbuseToCreateData.object) - }) + await forwardVideoRelatedActivity(activity, undefined, exceptions, video) + } + } + + if (created && notify) Notifier.Instance.notifyOnNewComment(comment) } -async function processCreateVideoComment (byActor: ActorModel, activity: ActivityCreate) { - const commentObject = activity.object as VideoCommentObject +async function processCreatePlaylist (activity: ActivityCreate, byActor: MActorSignature) { + 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) - - const { video } = await resolveThread(commentObject.inReplyTo) + if (!byAccount) throw new Error('Cannot create video playlist with the non account actor ' + byActor.url) - const { created } = await addVideoComment(video, commentObject.id) - - if (video.isOwned() && created === true) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - - await forwardVideoRelatedActivity(activity, undefined, exceptions, video) - } + await createOrUpdateVideoPlaylist(playlistObject, byAccount, activity.to) }