X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-undo.ts;h=442178c420461922206317c5ceee7e9b521a3aaa;hb=bae616273d455d225d131eb17c56db6c20a0b6b3;hp=30d0fd98be63b1d2fc57787ddd7c14b759ddf518;hpb=06a05d5f4784a7cbb27aa1188385b5679845dad8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts index 30d0fd98b..442178c42 100644 --- a/server/lib/activitypub/send/send-undo.ts +++ b/server/lib/activitypub/send/send-undo.ts @@ -3,24 +3,34 @@ import { ActivityAnnounce, ActivityAudience, ActivityCreate, + ActivityDislike, ActivityFollow, ActivityLike, - ActivityUndo -} from '../../../../shared/models/activitypub' -import { ActorModel } from '../../../models/activitypub/actor' -import { ActorFollowModel } from '../../../models/activitypub/actor-follow' -import { VideoModel } from '../../../models/video/video' -import { getActorFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url' -import { broadcastToFollowers, unicastTo } from './utils' -import { audiencify, getActorsInvolvedInVideo, getAudience, getObjectFollowersAudience, getVideoAudience } from '../audience' -import { createActivityData, createDislikeActivityData } from './send-create' -import { followActivityData } from './send-follow' -import { likeActivityData } from './send-like' -import { VideoShareModel } from '../../../models/video/video-share' -import { buildVideoAnnounce } from './send-announce' + ActivityUndo, + ContextType +} from '@shared/models' import { logger } from '../../../helpers/logger' - -async function sendUndoFollow (actorFollow: ActorFollowModel, t: Transaction) { +import { VideoModel } from '../../../models/video/video' +import { + MActor, + MActorAudience, + MActorFollowActors, + MActorLight, + MVideo, + MVideoAccountLight, + MVideoRedundancyVideo, + MVideoShare +} from '../../../types/models' +import { audiencify, getAudience } from '../audience' +import { getUndoActivityPubUrl, getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from '../url' +import { buildAnnounceWithVideoAudience } from './send-announce' +import { buildCreateActivity } from './send-create' +import { buildDislikeActivity } from './send-dislike' +import { buildFollowActivity } from './send-follow' +import { buildLikeActivity } from './send-like' +import { broadcastToFollowers, sendVideoActivityToOrigin, sendVideoRelatedActivity, unicastTo } from './shared/send-utils' + +function sendUndoFollow (actorFollow: MActorFollowActors, t: Transaction) { const me = actorFollow.ActorFollower const following = actorFollow.ActorFollowing @@ -29,73 +39,81 @@ async function sendUndoFollow (actorFollow: ActorFollowModel, t: Transaction) { logger.info('Creating job to send an unfollow request to %s.', following.url) - const followUrl = getActorFollowActivityPubUrl(actorFollow) - const undoUrl = getUndoActivityPubUrl(followUrl) + const undoUrl = getUndoActivityPubUrl(actorFollow.url) - const object = followActivityData(followUrl, me, following) - const data = undoActivityData(undoUrl, me, object) + const followActivity = buildFollowActivity(actorFollow.url, me, following) + const undoActivity = undoActivityData(undoUrl, me, followActivity) - return unicastTo(data, me, following.inboxUrl) + t.afterCommit(() => { + return unicastTo({ + data: undoActivity, + byActor: me, + toActorUrl: following.inboxUrl, + contextType: 'Follow' + }) + }) } -async function sendUndoLike (byActor: ActorModel, video: VideoModel, t: Transaction) { - logger.info('Creating job to undo a like of video %s.', video.url) - - const likeUrl = getVideoLikeActivityPubUrl(byActor, video) - const undoUrl = getUndoActivityPubUrl(likeUrl) - - const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t) - const object = likeActivityData(likeUrl, byActor, video) - - // Send to origin - if (video.isOwned() === false) { - const audience = getVideoAudience(video, actorsInvolvedInVideo) - const data = undoActivityData(undoUrl, byActor, object, audience) +// --------------------------------------------------------------------------- - return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) - } +async function sendUndoAnnounce (byActor: MActorLight, videoShare: MVideoShare, video: MVideo, transaction: Transaction) { + logger.info('Creating job to undo announce %s.', videoShare.url) - const audience = getObjectFollowersAudience(actorsInvolvedInVideo) - const data = undoActivityData(undoUrl, byActor, object, audience) + const undoUrl = getUndoActivityPubUrl(videoShare.url) - const followersException = [ byActor ] - return broadcastToFollowers(data, byActor, actorsInvolvedInVideo, t, followersException) + const { activity: announce, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, transaction) + const undoActivity = undoActivityData(undoUrl, byActor, announce) + + return broadcastToFollowers({ + data: undoActivity, + byActor, + toFollowersOf: actorsInvolvedInVideo, + transaction, + actorsException: [ byActor ], + contextType: 'Announce' + }) } -async function sendUndoDislike (byActor: ActorModel, video: VideoModel, t: Transaction) { - logger.info('Creating job to undo a dislike of video %s.', video.url) +async function sendUndoCacheFile (byActor: MActor, redundancyModel: MVideoRedundancyVideo, transaction: Transaction) { + logger.info('Creating job to undo cache file %s.', redundancyModel.url) - const dislikeUrl = getVideoDislikeActivityPubUrl(byActor, video) - const undoUrl = getUndoActivityPubUrl(dislikeUrl) + const associatedVideo = redundancyModel.getVideo() + if (!associatedVideo) { + logger.warn('Cannot send undo activity for redundancy %s: no video files associated.', redundancyModel.url) + return + } - const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t) - const dislikeActivity = createDislikeActivityData(byActor, video) - const object = createActivityData(dislikeUrl, byActor, dislikeActivity) + const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(associatedVideo.id) + const createActivity = buildCreateActivity(redundancyModel.url, byActor, redundancyModel.toActivityPubObject()) + + return sendUndoVideoRelatedActivity({ + byActor, + video, + url: redundancyModel.url, + activity: createActivity, + contextType: 'CacheFile', + transaction + }) +} - if (video.isOwned() === false) { - const audience = getVideoAudience(video, actorsInvolvedInVideo) - const data = undoActivityData(undoUrl, byActor, object, audience) +// --------------------------------------------------------------------------- - return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) - } +async function sendUndoLike (byActor: MActor, video: MVideoAccountLight, t: Transaction) { + logger.info('Creating job to undo a like of video %s.', video.url) - const data = undoActivityData(undoUrl, byActor, object) + const likeUrl = getVideoLikeActivityPubUrlByLocalActor(byActor, video) + const likeActivity = buildLikeActivity(likeUrl, byActor, video) - const followersException = [ byActor ] - return broadcastToFollowers(data, byActor, actorsInvolvedInVideo, t, followersException) + return sendUndoVideoRateToOriginActivity({ byActor, video, url: likeUrl, activity: likeActivity, transaction: t }) } -async function sendUndoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) { - logger.info('Creating job to undo announce %s.', videoShare.url) - - const undoUrl = getUndoActivityPubUrl(videoShare.url) +async function sendUndoDislike (byActor: MActor, video: MVideoAccountLight, t: Transaction) { + logger.info('Creating job to undo a dislike of video %s.', video.url) - const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t) - const object = await buildVideoAnnounce(byActor, videoShare, video, t) - const data = undoActivityData(undoUrl, byActor, object) + const dislikeUrl = getVideoDislikeActivityPubUrlByLocalActor(byActor, video) + const dislikeActivity = buildDislikeActivity(dislikeUrl, byActor, video) - const followersException = [ byActor ] - return broadcastToFollowers(data, byActor, actorsInvolvedInVideo, t, followersException) + return sendUndoVideoRateToOriginActivity({ byActor, video, url: dislikeUrl, activity: dislikeActivity, transaction: t }) } // --------------------------------------------------------------------------- @@ -104,15 +122,16 @@ export { sendUndoFollow, sendUndoLike, sendUndoDislike, - sendUndoAnnounce + sendUndoAnnounce, + sendUndoCacheFile } // --------------------------------------------------------------------------- function undoActivityData ( url: string, - byActor: ActorModel, - object: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce, + byActor: MActorAudience, + object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce, audience?: ActivityAudience ): ActivityUndo { if (!audience) audience = getAudience(byActor) @@ -127,3 +146,36 @@ function undoActivityData ( audience ) } + +async function sendUndoVideoRelatedActivity (options: { + byActor: MActor + video: MVideoAccountLight + url: string + activity: ActivityFollow | ActivityCreate | ActivityAnnounce + contextType: ContextType + transaction: Transaction +}) { + const activityBuilder = (audience: ActivityAudience) => { + const undoUrl = getUndoActivityPubUrl(options.url) + + return undoActivityData(undoUrl, options.byActor, options.activity, audience) + } + + return sendVideoRelatedActivity(activityBuilder, options) +} + +async function sendUndoVideoRateToOriginActivity (options: { + byActor: MActor + video: MVideoAccountLight + url: string + activity: ActivityLike | ActivityDislike + transaction: Transaction +}) { + const activityBuilder = (audience: ActivityAudience) => { + const undoUrl = getUndoActivityPubUrl(options.url) + + return undoActivityData(undoUrl, options.byActor, options.activity, audience) + } + + return sendVideoActivityToOrigin(activityBuilder, { ...options, contextType: 'Rate' }) +}