import { Transaction } from 'sequelize'
-import { ActivityAdd } from '../../../../shared/index'
-import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub/activity'
-import { AccountInstance, VideoInstance } from '../../../models'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub'
+import { VideoPrivacy } from '../../../../shared/models/videos'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { VideoModel } from '../../../models/video/video'
import { getAnnounceActivityPubUrl } from '../url'
import {
broadcastToFollowers,
- getAccountsInvolvedInVideo,
- getAccountsInvolvedInVideoChannel,
+ getActorsInvolvedInVideo,
getAudience,
getObjectFollowersAudience,
getOriginVideoAudience,
- getOriginVideoChannelAudience,
unicastTo
} from './misc'
-import { addActivityData } from './send-add'
import { createActivityData } from './send-create'
-async function buildVideoAnnounceToFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
- const url = getAnnounceActivityPubUrl(video.url, byAccount)
+async function buildVideoAnnounceToFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) {
+ const url = getAnnounceActivityPubUrl(video.url, byActor)
+ const videoObject = video.toActivityPubObject()
- const videoChannel = video.VideoChannel
- const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject(), t)
+ const announcedAudience = await getAudience(byActor, t, video.privacy === VideoPrivacy.PUBLIC)
+ const announcedActivity = await createActivityData(url, video.VideoChannel.Account.Actor, videoObject, t, announcedAudience)
- const accountsToForwardView = await getAccountsInvolvedInVideo(video, t)
+ const accountsToForwardView = await getActorsInvolvedInVideo(video, t)
const audience = getObjectFollowersAudience(accountsToForwardView)
- const data = await announceActivityData(url, byAccount, announcedActivity, t, audience)
-
- return data
-}
-
-async function sendVideoAnnounceToFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
- const data = await buildVideoAnnounceToFollowers(byAccount, video, t)
-
- return broadcastToFollowers(data, byAccount, [ byAccount ], t)
-}
-
-async function sendVideoAnnounceToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
- const url = getAnnounceActivityPubUrl(video.url, byAccount)
-
- const videoChannel = video.VideoChannel
- const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject(), t)
-
- const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video, t)
- const audience = getOriginVideoAudience(video, accountsInvolvedInVideo)
- const data = await createActivityData(url, byAccount, announcedActivity, t, audience)
-
- return unicastTo(data, byAccount, videoChannel.Account.sharedInboxUrl, t)
+ return announceActivityData(url, byActor, announcedActivity, t, audience)
}
-async function buildVideoChannelAnnounceToFollowers (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
- const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
- const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), t)
-
- const accountsToForwardView = await getAccountsInvolvedInVideoChannel(videoChannel, t)
- const audience = getObjectFollowersAudience(accountsToForwardView)
- const data = await announceActivityData(url, byAccount, announcedActivity, t, audience)
+async function sendVideoAnnounceToFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) {
+ const data = await buildVideoAnnounceToFollowers(byActor, video, t)
- return data
+ return broadcastToFollowers(data, byActor, [ byActor ], t)
}
-async function sendVideoChannelAnnounceToFollowers (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
- const data = await buildVideoChannelAnnounceToFollowers(byAccount, videoChannel, t)
+async function sendVideoAnnounceToOrigin (byActor: ActorModel, video: VideoModel, t: Transaction) {
+ const url = getAnnounceActivityPubUrl(video.url, byActor)
- return broadcastToFollowers(data, byAccount, [ byAccount ], t)
-}
-
-async function sendVideoChannelAnnounceToOrigin (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
- const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
- const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), t)
+ const videoObject = video.toActivityPubObject()
+ const announcedActivity = await createActivityData(url, video.VideoChannel.Account.Actor, videoObject, t)
- const accountsInvolvedInVideo = await getAccountsInvolvedInVideoChannel(videoChannel, t)
- const audience = getOriginVideoChannelAudience(videoChannel, accountsInvolvedInVideo)
- const data = await createActivityData(url, byAccount, announcedActivity, t, audience)
+ const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
+ const audience = getOriginVideoAudience(video, actorsInvolvedInVideo)
+ const data = await createActivityData(url, byActor, announcedActivity, t, audience)
- return unicastTo(data, byAccount, videoChannel.Account.sharedInboxUrl, t)
+ return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl, t)
}
async function announceActivityData (
url: string,
- byAccount: AccountInstance,
- object: ActivityCreate | ActivityAdd,
+ byActor: ActorModel,
+ object: ActivityCreate,
t: Transaction,
audience?: ActivityAudience
-) {
+): Promise<ActivityAnnounce> {
if (!audience) {
- audience = await getAudience(byAccount, t)
+ audience = await getAudience(byActor, t)
}
- const activity: ActivityAnnounce = {
+ return {
type: 'Announce',
to: audience.to,
cc: audience.cc,
id: url,
- actor: byAccount.url,
+ actor: byActor.url,
object
}
-
- return activity
}
// ---------------------------------------------------------------------------
export {
sendVideoAnnounceToFollowers,
- sendVideoChannelAnnounceToFollowers,
sendVideoAnnounceToOrigin,
- sendVideoChannelAnnounceToOrigin,
announceActivityData,
- buildVideoAnnounceToFollowers,
- buildVideoChannelAnnounceToFollowers
+ buildVideoAnnounceToFollowers
}