|
@@ -40,105 +40,92 @@ async function sendVideoAbuse (byActor: ActorModel, videoAbuse: VideoAbuseModel,
|
|
|
return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
}
|
|
|
|
|
|
-async function sendCreateVideoCommentToOrigin (comment: VideoCommentModel, t: Transaction) {
|
|
|
+async function sendCreateVideoComment (comment: VideoCommentModel, t: Transaction) {
|
|
|
+ const isOrigin = comment.Video.isOwned()
|
|
|
+
|
|
|
const byActor = comment.Account.Actor
|
|
|
const threadParentComments = await VideoCommentModel.listThreadParentComments(comment, t)
|
|
|
const commentObject = comment.toActivityPubObject(threadParentComments)
|
|
|
|
|
|
const actorsInvolvedInComment = await getActorsInvolvedInVideo(comment.Video, t)
|
|
|
actorsInvolvedInComment.push(byActor)
|
|
|
- const audience = getVideoCommentAudience(comment, threadParentComments, actorsInvolvedInComment)
|
|
|
-
|
|
|
- const data = await createActivityData(comment.url, byActor, commentObject, t, audience)
|
|
|
-
|
|
|
- // This was a reply, send it to the parent actors
|
|
|
- const actorsException = [ byActor ]
|
|
|
- await broadcastToActors(data, byActor, threadParentComments.map(c => c.Account.Actor), actorsException)
|
|
|
-
|
|
|
- // Broadcast to our followers
|
|
|
- await broadcastToFollowers(data, byActor, [ byActor ], t)
|
|
|
|
|
|
- // Send to origin
|
|
|
- return unicastTo(data, byActor, comment.Video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
-}
|
|
|
+ const parentsCommentActors = threadParentComments.map(c => c.Account.Actor)
|
|
|
|
|
|
-async function sendCreateVideoCommentToVideoFollowers (comment: VideoCommentModel, t: Transaction) {
|
|
|
- const byActor = comment.Account.Actor
|
|
|
- const threadParentComments = await VideoCommentModel.listThreadParentComments(comment, t)
|
|
|
- const commentObject = comment.toActivityPubObject(threadParentComments)
|
|
|
-
|
|
|
- const actorsInvolvedInComment = await getActorsInvolvedInVideo(comment.Video, t)
|
|
|
- actorsInvolvedInComment.push(byActor)
|
|
|
+ let audience: ActivityAudience
|
|
|
+ if (isOrigin) {
|
|
|
+ audience = getVideoCommentAudience(comment, threadParentComments, actorsInvolvedInComment, isOrigin)
|
|
|
+ } else {
|
|
|
+ audience = getObjectFollowersAudience(actorsInvolvedInComment.concat(parentsCommentActors))
|
|
|
+ }
|
|
|
|
|
|
- const audience = getVideoCommentAudience(comment, threadParentComments, actorsInvolvedInComment, true)
|
|
|
const data = await createActivityData(comment.url, byActor, commentObject, t, audience)
|
|
|
|
|
|
// This was a reply, send it to the parent actors
|
|
|
const actorsException = [ byActor ]
|
|
|
- await broadcastToActors(data, byActor, threadParentComments.map(c => c.Account.Actor), actorsException)
|
|
|
+ await broadcastToActors(data, byActor, parentsCommentActors, actorsException)
|
|
|
|
|
|
// Broadcast to our followers
|
|
|
await broadcastToFollowers(data, byActor, [ byActor ], t)
|
|
|
|
|
|
// Send to actors involved in the comment
|
|
|
- return broadcastToFollowers(data, byActor, actorsInvolvedInComment, t, actorsException)
|
|
|
+ if (isOrigin) return broadcastToFollowers(data, byActor, actorsInvolvedInComment, t, actorsException)
|
|
|
+
|
|
|
+ // Send to origin
|
|
|
+ return unicastTo(data, byActor, comment.Video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
}
|
|
|
|
|
|
-async function sendCreateViewToOrigin (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
+async function sendCreateView (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
const url = getVideoViewActivityPubUrl(byActor, video)
|
|
|
const viewActivityData = createViewActivityData(byActor, video)
|
|
|
|
|
|
const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
|
|
|
- const audience = getOriginVideoAudience(video, actorsInvolvedInVideo)
|
|
|
- const data = await createActivityData(url, byActor, viewActivityData, t, audience)
|
|
|
|
|
|
- return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
-}
|
|
|
+ // Send to origin
|
|
|
+ if (video.isOwned() === false) {
|
|
|
+ const audience = getOriginVideoAudience(video, actorsInvolvedInVideo)
|
|
|
+ const data = await createActivityData(url, byActor, viewActivityData, t, audience)
|
|
|
|
|
|
-async function sendCreateViewToVideoFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
- const url = getVideoViewActivityPubUrl(byActor, video)
|
|
|
- const viewActivityData = createViewActivityData(byActor, video)
|
|
|
+ return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
+ }
|
|
|
|
|
|
- const actorsToForwardView = await getActorsInvolvedInVideo(video, t)
|
|
|
- const audience = getObjectFollowersAudience(actorsToForwardView)
|
|
|
+ // Send to followers
|
|
|
+ const audience = getObjectFollowersAudience(actorsInvolvedInVideo)
|
|
|
const data = await createActivityData(url, byActor, viewActivityData, t, audience)
|
|
|
|
|
|
// Use the server actor to send the view
|
|
|
const serverActor = await getServerActor()
|
|
|
const actorsException = [ byActor ]
|
|
|
- return broadcastToFollowers(data, serverActor, actorsToForwardView, t, actorsException)
|
|
|
+ return broadcastToFollowers(data, serverActor, actorsInvolvedInVideo, t, actorsException)
|
|
|
}
|
|
|
|
|
|
-async function sendCreateDislikeToOrigin (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
+async function sendCreateDislike (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
const url = getVideoDislikeActivityPubUrl(byActor, video)
|
|
|
const dislikeActivityData = createDislikeActivityData(byActor, video)
|
|
|
|
|
|
const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
|
|
|
- const audience = getOriginVideoAudience(video, actorsInvolvedInVideo)
|
|
|
- const data = await createActivityData(url, byActor, dislikeActivityData, t, audience)
|
|
|
|
|
|
- return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
-}
|
|
|
+ // Send to origin
|
|
|
+ if (video.isOwned() === false) {
|
|
|
+ const audience = getOriginVideoAudience(video, actorsInvolvedInVideo)
|
|
|
+ const data = await createActivityData(url, byActor, dislikeActivityData, t, audience)
|
|
|
|
|
|
-async function sendCreateDislikeToVideoFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) {
|
|
|
- const url = getVideoDislikeActivityPubUrl(byActor, video)
|
|
|
- const dislikeActivityData = createDislikeActivityData(byActor, video)
|
|
|
+ return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
|
|
|
+ }
|
|
|
|
|
|
- const actorsToForwardView = await getActorsInvolvedInVideo(video, t)
|
|
|
- const audience = getObjectFollowersAudience(actorsToForwardView)
|
|
|
+ // Send to followers
|
|
|
+ const audience = getObjectFollowersAudience(actorsInvolvedInVideo)
|
|
|
const data = await createActivityData(url, byActor, dislikeActivityData, t, audience)
|
|
|
|
|
|
const actorsException = [ byActor ]
|
|
|
- return broadcastToFollowers(data, byActor, actorsToForwardView, t, actorsException)
|
|
|
+ return broadcastToFollowers(data, byActor, actorsInvolvedInVideo, t, actorsException)
|
|
|
}
|
|
|
|
|
|
-async function createActivityData (
|
|
|
- url: string,
|
|
|
- byActor: ActorModel,
|
|
|
- object: any,
|
|
|
- t: Transaction,
|
|
|
- audience?: ActivityAudience
|
|
|
-): Promise<ActivityCreate> {
|
|
|
+async function createActivityData (url: string,
|
|
|
+ byActor: ActorModel,
|
|
|
+ object: any,
|
|
|
+ t: Transaction,
|
|
|
+ audience?: ActivityAudience): Promise<ActivityCreate> {
|
|
|
if (!audience) {
|
|
|
audience = await getAudience(byActor, t)
|
|
|
}
|
|
@@ -173,11 +160,8 @@ export {
|
|
|
sendCreateVideo,
|
|
|
sendVideoAbuse,
|
|
|
createActivityData,
|
|
|
- sendCreateViewToOrigin,
|
|
|
- sendCreateViewToVideoFollowers,
|
|
|
- sendCreateDislikeToOrigin,
|
|
|
- sendCreateDislikeToVideoFollowers,
|
|
|
+ sendCreateView,
|
|
|
+ sendCreateDislike,
|
|
|
createDislikeActivityData,
|
|
|
- sendCreateVideoCommentToOrigin,
|
|
|
- sendCreateVideoCommentToVideoFollowers
|
|
|
+ sendCreateVideoComment
|
|
|
}
|