diff options
Diffstat (limited to 'server/lib/activitypub/send/send-create.ts')
-rw-r--r-- | server/lib/activitypub/send/send-create.ts | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/server/lib/activitypub/send/send-create.ts b/server/lib/activitypub/send/send-create.ts index 4ff20b033..3ef4fcd3b 100644 --- a/server/lib/activitypub/send/send-create.ts +++ b/server/lib/activitypub/send/send-create.ts | |||
@@ -7,17 +7,15 @@ import { VideoModel } from '../../../models/video/video' | |||
7 | import { VideoAbuseModel } from '../../../models/video/video-abuse' | 7 | import { VideoAbuseModel } from '../../../models/video/video-abuse' |
8 | import { VideoCommentModel } from '../../../models/video/video-comment' | 8 | import { VideoCommentModel } from '../../../models/video/video-comment' |
9 | import { getVideoAbuseActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoViewActivityPubUrl } from '../url' | 9 | import { getVideoAbuseActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoViewActivityPubUrl } from '../url' |
10 | import { broadcastToActors, broadcastToFollowers, unicastTo } from './utils' | ||
10 | import { | 11 | import { |
11 | audiencify, | 12 | audiencify, |
12 | broadcastToActors, | ||
13 | broadcastToFollowers, | ||
14 | getActorsInvolvedInVideo, | 13 | getActorsInvolvedInVideo, |
15 | getAudience, | 14 | getAudience, |
16 | getObjectFollowersAudience, | 15 | getObjectFollowersAudience, |
17 | getOriginVideoAudience, | 16 | getVideoAudience, |
18 | getVideoCommentAudience, | 17 | getVideoCommentAudience |
19 | unicastTo | 18 | } from '../audience' |
20 | } from './misc' | ||
21 | 19 | ||
22 | async function sendCreateVideo (video: VideoModel, t: Transaction) { | 20 | async function sendCreateVideo (video: VideoModel, t: Transaction) { |
23 | if (video.privacy === VideoPrivacy.PRIVATE) return undefined | 21 | if (video.privacy === VideoPrivacy.PRIVATE) return undefined |
@@ -83,7 +81,7 @@ async function sendCreateView (byActor: ActorModel, video: VideoModel, t: Transa | |||
83 | 81 | ||
84 | // Send to origin | 82 | // Send to origin |
85 | if (video.isOwned() === false) { | 83 | if (video.isOwned() === false) { |
86 | const audience = getOriginVideoAudience(video, actorsInvolvedInVideo) | 84 | const audience = getVideoAudience(video, actorsInvolvedInVideo) |
87 | const data = await createActivityData(url, byActor, viewActivityData, t, audience) | 85 | const data = await createActivityData(url, byActor, viewActivityData, t, audience) |
88 | 86 | ||
89 | return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) | 87 | return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) |
@@ -107,7 +105,7 @@ async function sendCreateDislike (byActor: ActorModel, video: VideoModel, t: Tra | |||
107 | 105 | ||
108 | // Send to origin | 106 | // Send to origin |
109 | if (video.isOwned() === false) { | 107 | if (video.isOwned() === false) { |
110 | const audience = getOriginVideoAudience(video, actorsInvolvedInVideo) | 108 | const audience = getVideoAudience(video, actorsInvolvedInVideo) |
111 | const data = await createActivityData(url, byActor, dislikeActivityData, t, audience) | 109 | const data = await createActivityData(url, byActor, dislikeActivityData, t, audience) |
112 | 110 | ||
113 | return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) | 111 | return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) |