diff options
Diffstat (limited to 'server/lib/activitypub/send/send-create.ts')
-rw-r--r-- | server/lib/activitypub/send/send-create.ts | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/server/lib/activitypub/send/send-create.ts b/server/lib/activitypub/send/send-create.ts index bf66606c1..a34d3776c 100644 --- a/server/lib/activitypub/send/send-create.ts +++ b/server/lib/activitypub/send/send-create.ts | |||
@@ -8,8 +8,8 @@ import { | |||
8 | broadcastToFollowers, | 8 | broadcastToFollowers, |
9 | getAccountsInvolvedInVideo, | 9 | getAccountsInvolvedInVideo, |
10 | getAudience, | 10 | getAudience, |
11 | getOriginVideoAudience, | ||
12 | getObjectFollowersAudience, | 11 | getObjectFollowersAudience, |
12 | getOriginVideoAudience, | ||
13 | unicastTo | 13 | unicastTo |
14 | } from './misc' | 14 | } from './misc' |
15 | 15 | ||
@@ -17,7 +17,7 @@ async function sendCreateVideoChannel (videoChannel: VideoChannelInstance, t: Tr | |||
17 | const byAccount = videoChannel.Account | 17 | const byAccount = videoChannel.Account |
18 | 18 | ||
19 | const videoChannelObject = videoChannel.toActivityPubObject() | 19 | const videoChannelObject = videoChannel.toActivityPubObject() |
20 | const data = await createActivityData(videoChannel.url, byAccount, videoChannelObject) | 20 | const data = await createActivityData(videoChannel.url, byAccount, videoChannelObject, t) |
21 | 21 | ||
22 | return broadcastToFollowers(data, byAccount, [ byAccount ], t) | 22 | return broadcastToFollowers(data, byAccount, [ byAccount ], t) |
23 | } | 23 | } |
@@ -26,7 +26,7 @@ async function sendVideoAbuse (byAccount: AccountInstance, videoAbuse: VideoAbus | |||
26 | const url = getVideoAbuseActivityPubUrl(videoAbuse) | 26 | const url = getVideoAbuseActivityPubUrl(videoAbuse) |
27 | 27 | ||
28 | const audience = { to: [ video.VideoChannel.Account.url ], cc: [] } | 28 | const audience = { to: [ video.VideoChannel.Account.url ], cc: [] } |
29 | const data = await createActivityData(url, byAccount, videoAbuse.toActivityPubObject(), audience) | 29 | const data = await createActivityData(url, byAccount, videoAbuse.toActivityPubObject(), t, audience) |
30 | 30 | ||
31 | return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) | 31 | return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) |
32 | } | 32 | } |
@@ -35,9 +35,9 @@ async function sendCreateViewToOrigin (byAccount: AccountInstance, video: VideoI | |||
35 | const url = getVideoViewActivityPubUrl(byAccount, video) | 35 | const url = getVideoViewActivityPubUrl(byAccount, video) |
36 | const viewActivity = createViewActivityData(byAccount, video) | 36 | const viewActivity = createViewActivityData(byAccount, video) |
37 | 37 | ||
38 | const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video) | 38 | const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video, t) |
39 | const audience = getOriginVideoAudience(video, accountsInvolvedInVideo) | 39 | const audience = getOriginVideoAudience(video, accountsInvolvedInVideo) |
40 | const data = await createActivityData(url, byAccount, viewActivity, audience) | 40 | const data = await createActivityData(url, byAccount, viewActivity, t, audience) |
41 | 41 | ||
42 | return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) | 42 | return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) |
43 | } | 43 | } |
@@ -46,9 +46,9 @@ async function sendCreateViewToVideoFollowers (byAccount: AccountInstance, video | |||
46 | const url = getVideoViewActivityPubUrl(byAccount, video) | 46 | const url = getVideoViewActivityPubUrl(byAccount, video) |
47 | const viewActivity = createViewActivityData(byAccount, video) | 47 | const viewActivity = createViewActivityData(byAccount, video) |
48 | 48 | ||
49 | const accountsToForwardView = await getAccountsInvolvedInVideo(video) | 49 | const accountsToForwardView = await getAccountsInvolvedInVideo(video, t) |
50 | const audience = getObjectFollowersAudience(accountsToForwardView) | 50 | const audience = getObjectFollowersAudience(accountsToForwardView) |
51 | const data = await createActivityData(url, byAccount, viewActivity, audience) | 51 | const data = await createActivityData(url, byAccount, viewActivity, t, audience) |
52 | 52 | ||
53 | // Use the server account to send the view, because it could be an unregistered account | 53 | // Use the server account to send the view, because it could be an unregistered account |
54 | const serverAccount = await getServerAccount() | 54 | const serverAccount = await getServerAccount() |
@@ -60,9 +60,9 @@ async function sendCreateDislikeToOrigin (byAccount: AccountInstance, video: Vid | |||
60 | const url = getVideoDislikeActivityPubUrl(byAccount, video) | 60 | const url = getVideoDislikeActivityPubUrl(byAccount, video) |
61 | const dislikeActivity = createDislikeActivityData(byAccount, video) | 61 | const dislikeActivity = createDislikeActivityData(byAccount, video) |
62 | 62 | ||
63 | const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video) | 63 | const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video, t) |
64 | const audience = getOriginVideoAudience(video, accountsInvolvedInVideo) | 64 | const audience = getOriginVideoAudience(video, accountsInvolvedInVideo) |
65 | const data = await createActivityData(url, byAccount, dislikeActivity, audience) | 65 | const data = await createActivityData(url, byAccount, dislikeActivity, t, audience) |
66 | 66 | ||
67 | return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) | 67 | return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t) |
68 | } | 68 | } |
@@ -71,17 +71,17 @@ async function sendCreateDislikeToVideoFollowers (byAccount: AccountInstance, vi | |||
71 | const url = getVideoDislikeActivityPubUrl(byAccount, video) | 71 | const url = getVideoDislikeActivityPubUrl(byAccount, video) |
72 | const dislikeActivity = createDislikeActivityData(byAccount, video) | 72 | const dislikeActivity = createDislikeActivityData(byAccount, video) |
73 | 73 | ||
74 | const accountsToForwardView = await getAccountsInvolvedInVideo(video) | 74 | const accountsToForwardView = await getAccountsInvolvedInVideo(video, t) |
75 | const audience = getObjectFollowersAudience(accountsToForwardView) | 75 | const audience = getObjectFollowersAudience(accountsToForwardView) |
76 | const data = await createActivityData(url, byAccount, dislikeActivity, audience) | 76 | const data = await createActivityData(url, byAccount, dislikeActivity, t, audience) |
77 | 77 | ||
78 | const followersException = [ byAccount ] | 78 | const followersException = [ byAccount ] |
79 | return broadcastToFollowers(data, byAccount, accountsToForwardView, t, followersException) | 79 | return broadcastToFollowers(data, byAccount, accountsToForwardView, t, followersException) |
80 | } | 80 | } |
81 | 81 | ||
82 | async function createActivityData (url: string, byAccount: AccountInstance, object: any, audience?: ActivityAudience) { | 82 | async function createActivityData (url: string, byAccount: AccountInstance, object: any, t: Transaction, audience?: ActivityAudience) { |
83 | if (!audience) { | 83 | if (!audience) { |
84 | audience = await getAudience(byAccount) | 84 | audience = await getAudience(byAccount, t) |
85 | } | 85 | } |
86 | 86 | ||
87 | const activity: ActivityCreate = { | 87 | const activity: ActivityCreate = { |