X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-undo.ts;h=8fcbbac5c95a94a0dfa35e96d38f4607a078c9a4;hb=2284f202070aa2e49156cc52b3b1596a7d5aadec;hp=79fc113f05e7e459e1f8b8499107c5b0b8a0a45c;hpb=63c93323ecdeaa4b6183d75dd3f13469e1ef3ebd;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts index 79fc113f0..8fcbbac5c 100644 --- a/server/lib/activitypub/send/send-undo.ts +++ b/server/lib/activitypub/send/send-undo.ts @@ -1,113 +1,128 @@ import { Transaction } from 'sequelize' import { + ActivityAnnounce, ActivityAudience, - ActivityCreate, + ActivityCreate, ActivityDislike, ActivityFollow, ActivityLike, ActivityUndo -} from '../../../../shared/models/activitypub/activity' -import { AccountInstance } from '../../../models' -import { AccountFollowInstance } from '../../../models/account/account-follow-interface' -import { VideoInstance } from '../../../models/video/video-interface' -import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url' -import { broadcastToFollowers, getAccountsInvolvedInVideo, getAudience, getVideoFollowersAudience, unicastTo } from './misc' -import { createActivityData, createDislikeActivityData } from './send-create' -import { followActivityData } from './send-follow' -import { likeActivityData } from './send-like' - -async function sendUndoFollow (accountFollow: AccountFollowInstance, t: Transaction) { - const me = accountFollow.AccountFollower - const following = accountFollow.AccountFollowing - - const followUrl = getAccountFollowActivityPubUrl(accountFollow) +} 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, sendVideoRelatedActivity, unicastTo } from './utils' +import { audiencify, getAudience } from '../audience' +import { buildCreateActivity } from './send-create' +import { buildFollowActivity } from './send-follow' +import { buildLikeActivity } from './send-like' +import { VideoShareModel } from '../../../models/video/video-share' +import { buildAnnounceWithVideoAudience } from './send-announce' +import { logger } from '../../../helpers/logger' +import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' +import { buildDislikeActivity } from './send-dislike' + +async function sendUndoFollow (actorFollow: ActorFollowModel, t: Transaction) { + const me = actorFollow.ActorFollower + const following = actorFollow.ActorFollowing + + // Same server as ours + if (!following.serverId) return + + logger.info('Creating job to send an unfollow request to %s.', following.url) + + const followUrl = getActorFollowActivityPubUrl(me, following) const undoUrl = getUndoActivityPubUrl(followUrl) - const object = await followActivityData(followUrl, me, following) - const data = await undoActivityData(undoUrl, me, object) + const followActivity = buildFollowActivity(followUrl, me, following) + const undoActivity = undoActivityData(undoUrl, me, followActivity) - return unicastTo(data, me, following.inboxUrl, t) + t.afterCommit(() => unicastTo(undoActivity, me, following.inboxUrl)) } -async function sendUndoLikeToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) { - const likeUrl = getVideoLikeActivityPubUrl(byAccount, video) - const undoUrl = getUndoActivityPubUrl(likeUrl) +async function sendUndoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) { + logger.info('Creating job to undo announce %s.', videoShare.url) - const object = await likeActivityData(likeUrl, byAccount, video) - const data = await undoActivityData(undoUrl, byAccount, object) + const undoUrl = getUndoActivityPubUrl(videoShare.url) - return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) + const { activity: announceActivity, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, t) + const undoActivity = undoActivityData(undoUrl, byActor, announceActivity) + + const followersException = [ byActor ] + return broadcastToFollowers(undoActivity, byActor, actorsInvolvedInVideo, t, followersException) } -async function sendUndoLikeToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) { - const likeUrl = getVideoLikeActivityPubUrl(byAccount, video) - const undoUrl = getUndoActivityPubUrl(likeUrl) +async function sendUndoLike (byActor: ActorModel, video: VideoModel, t: Transaction) { + logger.info('Creating job to undo a like of video %s.', video.url) - const toAccountsFollowers = await getAccountsInvolvedInVideo(video) - const audience = getVideoFollowersAudience(toAccountsFollowers) - const object = await likeActivityData(likeUrl, byAccount, video) - const data = await undoActivityData(undoUrl, byAccount, object, audience) + const likeUrl = getVideoLikeActivityPubUrl(byActor, video) + const likeActivity = buildLikeActivity(likeUrl, byActor, video) - const followersException = [ byAccount ] - return broadcastToFollowers(data, byAccount, toAccountsFollowers, t, followersException) + return sendUndoVideoRelatedActivity({ byActor, video, url: likeUrl, activity: likeActivity, transaction: t }) } -async function sendUndoDislikeToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) { - const dislikeUrl = getVideoDislikeActivityPubUrl(byAccount, video) - const undoUrl = getUndoActivityPubUrl(dislikeUrl) - - const dislikeActivity = createDislikeActivityData(byAccount, video) - const object = await createActivityData(undoUrl, byAccount, dislikeActivity) +async function sendUndoDislike (byActor: ActorModel, video: VideoModel, t: Transaction) { + logger.info('Creating job to undo a dislike of video %s.', video.url) - const data = await undoActivityData(undoUrl, byAccount, object) + const dislikeUrl = getVideoDislikeActivityPubUrl(byActor, video) + const dislikeActivity = buildDislikeActivity(dislikeUrl, byActor, video) - return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) + return sendUndoVideoRelatedActivity({ byActor, video, url: dislikeUrl, activity: dislikeActivity, transaction: t }) } -async function sendUndoDislikeToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) { - const dislikeUrl = getVideoDislikeActivityPubUrl(byAccount, video) - const undoUrl = getUndoActivityPubUrl(dislikeUrl) - - const dislikeActivity = createDislikeActivityData(byAccount, video) - const object = await createActivityData(undoUrl, byAccount, dislikeActivity) - - const data = await undoActivityData(undoUrl, byAccount, object) +async function sendUndoCacheFile (byActor: ActorModel, redundancyModel: VideoRedundancyModel, t: Transaction) { + logger.info('Creating job to undo cache file %s.', redundancyModel.url) - const toAccountsFollowers = await getAccountsInvolvedInVideo(video) + const videoId = redundancyModel.getVideo().id + const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId) + const createActivity = buildCreateActivity(redundancyModel.url, byActor, redundancyModel.toActivityPubObject()) - const followersException = [ byAccount ] - return broadcastToFollowers(data, byAccount, toAccountsFollowers, t, followersException) + return sendUndoVideoRelatedActivity({ byActor, video, url: redundancyModel.url, activity: createActivity, transaction: t }) } // --------------------------------------------------------------------------- export { sendUndoFollow, - sendUndoLikeToOrigin, - sendUndoLikeToVideoFollowers, - sendUndoDislikeToOrigin, - sendUndoDislikeToVideoFollowers + sendUndoLike, + sendUndoDislike, + sendUndoAnnounce, + sendUndoCacheFile } // --------------------------------------------------------------------------- -async function undoActivityData ( +function undoActivityData ( url: string, - byAccount: AccountInstance, - object: ActivityFollow | ActivityLike | ActivityCreate, + byActor: ActorModel, + object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce, audience?: ActivityAudience -) { - if (!audience) { - audience = await getAudience(byAccount) - } +): ActivityUndo { + if (!audience) audience = getAudience(byActor) + + return audiencify( + { + type: 'Undo' as 'Undo', + id: url, + actor: byActor.url, + object + }, + audience + ) +} + +async function sendUndoVideoRelatedActivity (options: { + byActor: ActorModel, + video: VideoModel, + url: string, + activity: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce, + transaction: Transaction +}) { + const activityBuilder = (audience: ActivityAudience) => { + const undoUrl = getUndoActivityPubUrl(options.url) - const activity: ActivityUndo = { - type: 'Undo', - id: url, - actor: byAccount.url, - to: audience.to, - cc: audience.cc, - object + return undoActivityData(undoUrl, options.byActor, options.activity, audience) } - return activity + return sendVideoRelatedActivity(activityBuilder, options) }