import { Transaction } from 'sequelize'
-import { ActivityAnnounce, ActivityAudience } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { VideoModel } from '../../../models/video/video'
-import { VideoShareModel } from '../../../models/video/video-share'
-import { broadcastToFollowers } from './utils'
-import { audiencify, getActorsInvolvedInVideo, getAudience, getObjectFollowersAudience } from '../audience'
+import { ActivityAnnounce, ActivityAudience } from '@shared/models'
import { logger } from '../../../helpers/logger'
-
-async function buildAnnounceWithVideoAudience (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
+import { MActorLight, MVideo } from '../../../types/models'
+import { MVideoShare } from '../../../types/models/video'
+import { audiencify, getAudience } from '../audience'
+import { getActorsInvolvedInVideo, getAudienceFromFollowersOf } from './shared'
+import { broadcastToFollowers } from './shared/send-utils'
+
+async function buildAnnounceWithVideoAudience (
+ byActor: MActorLight,
+ videoShare: MVideoShare,
+ video: MVideo,
+ t: Transaction
+) {
const announcedObject = video.url
const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
- const audience = getObjectFollowersAudience(actorsInvolvedInVideo)
+ const audience = getAudienceFromFollowersOf(actorsInvolvedInVideo)
const activity = buildAnnounceActivity(videoShare.url, byActor, announcedObject, audience)
return { activity, actorsInvolvedInVideo }
}
-async function sendVideoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
- const { activity, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, t)
+async function sendVideoAnnounce (byActor: MActorLight, videoShare: MVideoShare, video: MVideo, transaction: Transaction) {
+ const { activity, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, transaction)
logger.info('Creating job to send announce %s.', videoShare.url)
- const followersException = [ byActor ]
- return broadcastToFollowers(activity, byActor, actorsInvolvedInVideo, t, followersException)
+ return broadcastToFollowers({
+ data: activity,
+ byActor,
+ toFollowersOf: actorsInvolvedInVideo,
+ transaction,
+ actorsException: [ byActor ],
+ contextType: 'Announce'
+ })
}
-function buildAnnounceActivity (url: string, byActor: ActorModel, object: string, audience?: ActivityAudience): ActivityAnnounce {
+function buildAnnounceActivity (url: string, byActor: MActorLight, object: string, audience?: ActivityAudience): ActivityAnnounce {
if (!audience) audience = getAudience(byActor)
return audiencify({