|
@@ -11,8 +11,8 @@ 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 { broadcastToFollowers, sendVideoRelatedActivity, unicastTo } from './utils'
|
|
|
+import { audiencify, getAudience } from '../audience'
|
|
|
import { buildCreateActivity, buildDislikeActivity } from './send-create'
|
|
|
import { buildFollowActivity } from './send-follow'
|
|
|
import { buildLikeActivity } from './send-like'
|
|
@@ -39,79 +39,44 @@ async function sendUndoFollow (actorFollow: ActorFollowModel, t: Transaction) {
|
|
|
return unicastTo(undoActivity, me, following.inboxUrl)
|
|
|
}
|
|
|
|
|
|
-async function sendUndoLike (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
- logger.info('Creating job to undo a like of video %s.', video.url)
|
|
|
+async function sendUndoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
|
|
|
+ logger.info('Creating job to undo announce %s.', videoShare.url)
|
|
|
|
|
|
- const likeUrl = getVideoLikeActivityPubUrl(byActor, video)
|
|
|
- const undoUrl = getUndoActivityPubUrl(likeUrl)
|
|
|
+ const undoUrl = getUndoActivityPubUrl(videoShare.url)
|
|
|
|
|
|
- const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
|
|
|
- const likeActivity = buildLikeActivity(likeUrl, byActor, video)
|
|
|
+ const { activity: announceActivity, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, t)
|
|
|
+ const undoActivity = undoActivityData(undoUrl, byActor, announceActivity)
|
|
|
|
|
|
- // Send to origin
|
|
|
- if (video.isOwned() === false) {
|
|
|
- const audience = getVideoAudience(video, actorsInvolvedInVideo)
|
|
|
- const undoActivity = undoActivityData(undoUrl, byActor, likeActivity, audience)
|
|
|
+ const followersException = [ byActor ]
|
|
|
+ return broadcastToFollowers(undoActivity, byActor, actorsInvolvedInVideo, t, followersException)
|
|
|
+}
|
|
|
|
|
|
- return unicastTo(undoActivity, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
- }
|
|
|
+async function sendUndoLike (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
+ logger.info('Creating job to undo a like of video %s.', video.url)
|
|
|
|
|
|
- const audience = getObjectFollowersAudience(actorsInvolvedInVideo)
|
|
|
- const undoActivity = undoActivityData(undoUrl, byActor, likeActivity, audience)
|
|
|
+ const likeUrl = getVideoLikeActivityPubUrl(byActor, video)
|
|
|
+ const likeActivity = buildLikeActivity(likeUrl, byActor, video)
|
|
|
|
|
|
- const followersException = [ byActor ]
|
|
|
- return broadcastToFollowers(undoActivity, byActor, actorsInvolvedInVideo, t, followersException)
|
|
|
+ return sendUndoVideoRelatedActivity({ byActor, video, url: likeUrl, activity: likeActivity, transaction: t })
|
|
|
}
|
|
|
|
|
|
async function sendUndoDislike (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
logger.info('Creating job to undo a dislike of video %s.', video.url)
|
|
|
|
|
|
const dislikeUrl = getVideoDislikeActivityPubUrl(byActor, video)
|
|
|
- const undoUrl = getUndoActivityPubUrl(dislikeUrl)
|
|
|
-
|
|
|
- const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
|
|
|
const dislikeActivity = buildDislikeActivity(byActor, video)
|
|
|
const createDislikeActivity = buildCreateActivity(dislikeUrl, byActor, dislikeActivity)
|
|
|
|
|
|
- if (video.isOwned() === false) {
|
|
|
- const audience = getVideoAudience(video, actorsInvolvedInVideo)
|
|
|
- const undoActivity = undoActivityData(undoUrl, byActor, createDislikeActivity, audience)
|
|
|
-
|
|
|
- return unicastTo(undoActivity, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
- }
|
|
|
-
|
|
|
- const undoActivity = undoActivityData(undoUrl, byActor, createDislikeActivity)
|
|
|
-
|
|
|
- const followersException = [ byActor ]
|
|
|
- return broadcastToFollowers(undoActivity, byActor, actorsInvolvedInVideo, t, followersException)
|
|
|
-}
|
|
|
-
|
|
|
-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)
|
|
|
-
|
|
|
- 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)
|
|
|
+ return sendUndoVideoRelatedActivity({ byActor, video, url: dislikeUrl, activity: createDislikeActivity, transaction: t })
|
|
|
}
|
|
|
|
|
|
async function sendUndoCacheFile (byActor: ActorModel, redundancyModel: VideoRedundancyModel, t: Transaction) {
|
|
|
logger.info('Creating job to undo cache file %s.', redundancyModel.url)
|
|
|
|
|
|
- const undoUrl = getUndoActivityPubUrl(redundancyModel.url)
|
|
|
-
|
|
|
const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(redundancyModel.VideoFile.Video.id)
|
|
|
- const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
|
|
|
-
|
|
|
- const audience = getVideoAudience(video, actorsInvolvedInVideo)
|
|
|
const createActivity = buildCreateActivity(redundancyModel.url, byActor, redundancyModel.toActivityPubObject())
|
|
|
|
|
|
- const undoActivity = undoActivityData(undoUrl, byActor, createActivity, audience)
|
|
|
-
|
|
|
- return unicastTo(undoActivity, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
+ return sendUndoVideoRelatedActivity({ byActor, video, url: redundancyModel.url, activity: createActivity, transaction: t })
|
|
|
}
|
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
@@ -144,3 +109,19 @@ function undoActivityData (
|
|
|
audience
|
|
|
)
|
|
|
}
|
|
|
+
|
|
|
+async function sendUndoVideoRelatedActivity (options: {
|
|
|
+ byActor: ActorModel,
|
|
|
+ video: VideoModel,
|
|
|
+ url: string,
|
|
|
+ activity: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce,
|
|
|
+ transaction: Transaction
|
|
|
+}) {
|
|
|
+ const activityBuilder = (audience: ActivityAudience) => {
|
|
|
+ const undoUrl = getUndoActivityPubUrl(options.url)
|
|
|
+
|
|
|
+ return undoActivityData(undoUrl, options.byActor, options.activity, audience)
|
|
|
+ }
|
|
|
+
|
|
|
+ return sendVideoRelatedActivity(activityBuilder, options)
|
|
|
+}
|