import { Transaction } from 'sequelize'
-import { Activity } from '../../../../shared/models/activitypub'
-import { logger } from '../../../helpers'
+import { Activity, ActivityAudience } from '../../../../shared/models/activitypub'
+import { logger } from '../../../helpers/logger'
import { ACTIVITY_PUB } from '../../../initializers'
-import { AccountModel } from '../../../models/account/account'
-import { AccountFollowModel } from '../../../models/account/account-follow'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
import { VideoModel } from '../../../models/video/video'
-import { VideoChannelModel } from '../../../models/video/video-channel'
-import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
+import { VideoCommentModel } from '../../../models/video/video-comment'
import { VideoShareModel } from '../../../models/video/video-share'
-import { activitypubHttpJobScheduler, ActivityPubHttpPayload } from '../../jobs/activitypub-http-job-scheduler'
+import { JobQueue } from '../../job-queue'
async function forwardActivity (
activity: Activity,
t: Transaction,
- followersException: AccountModel[] = []
+ followersException: ActorModel[] = [],
+ additionalFollowerUrls: string[] = []
) {
const to = activity.to || []
const cc = activity.cc || []
- const followersUrls: string[] = []
+ const followersUrls = additionalFollowerUrls
for (const dest of to.concat(cc)) {
if (dest.endsWith('/followers')) {
followersUrls.push(dest)
}
}
- const toAccountFollowers = await AccountModel.listByFollowersUrls(followersUrls, t)
- const uris = await computeFollowerUris(toAccountFollowers, followersException, t)
+ const toActorFollowers = await ActorModel.listByFollowersUrls(followersUrls, t)
+ const uris = await computeFollowerUris(toActorFollowers, followersException, t)
if (uris.length === 0) {
- logger.info('0 followers for %s, no forwarding.', toAccountFollowers.map(a => a.id).join(', '))
+ logger.info('0 followers for %s, no forwarding.', toActorFollowers.map(a => a.id).join(', '))
return undefined
}
logger.debug('Creating forwarding job.', { uris })
- const jobPayload: ActivityPubHttpPayload = {
+ const payload = {
uris,
body: activity
}
-
- return activitypubHttpJobScheduler.createJob(t, 'activitypubHttpBroadcastHandler', jobPayload)
+ return JobQueue.Instance.createJob({ type: 'activitypub-http-broadcast', payload })
}
async function broadcastToFollowers (
data: any,
- byAccount: AccountModel,
- toAccountFollowers: AccountModel[],
+ byActor: ActorModel,
+ toActorFollowers: ActorModel[],
t: Transaction,
- followersException: AccountModel[] = []
+ actorsException: ActorModel[] = []
) {
- const uris = await computeFollowerUris(toAccountFollowers, followersException, t)
- if (uris.length === 0) {
- logger.info('0 followers for %s, no broadcasting.', toAccountFollowers.map(a => a.id).join(', '))
- return undefined
- }
+ const uris = await computeFollowerUris(toActorFollowers, actorsException, t)
+ return broadcastTo(uris, data, byActor)
+}
+
+async function broadcastToActors (
+ data: any,
+ byActor: ActorModel,
+ toActors: ActorModel[],
+ actorsException: ActorModel[] = []
+) {
+ const uris = await computeUris(toActors, actorsException)
+ return broadcastTo(uris, data, byActor)
+}
+
+async function broadcastTo (uris: string[], data: any, byActor: ActorModel) {
+ if (uris.length === 0) return undefined
logger.debug('Creating broadcast job.', { uris })
- const jobPayload: ActivityPubHttpPayload = {
+ const payload = {
uris,
- signatureAccountId: byAccount.id,
+ signatureActorId: byActor.id,
body: data
}
- return activitypubHttpJobScheduler.createJob(t, 'activitypubHttpBroadcastHandler', jobPayload)
+ return JobQueue.Instance.createJob({ type: 'activitypub-http-broadcast', payload })
}
-async function unicastTo (data: any, byAccount: AccountModel, toAccountUrl: string, t: Transaction) {
- logger.debug('Creating unicast job.', { uri: toAccountUrl })
+async function unicastTo (data: any, byActor: ActorModel, toActorUrl: string) {
+ logger.debug('Creating unicast job.', { uri: toActorUrl })
- const jobPayload: ActivityPubHttpPayload = {
- uris: [ toAccountUrl ],
- signatureAccountId: byAccount.id,
+ const payload = {
+ uri: toActorUrl,
+ signatureActorId: byActor.id,
body: data
}
- return activitypubHttpJobScheduler.createJob(t, 'activitypubHttpUnicastHandler', jobPayload)
+ return JobQueue.Instance.createJob({ type: 'activitypub-http-unicast', payload })
}
-function getOriginVideoAudience (video: VideoModel, accountsInvolvedInVideo: AccountModel[]) {
+function getOriginVideoAudience (video: VideoModel, actorsInvolvedInVideo: ActorModel[]) {
return {
- to: [ video.VideoChannel.Account.url ],
- cc: accountsInvolvedInVideo.map(a => a.followersUrl)
+ to: [ video.VideoChannel.Account.Actor.url ],
+ cc: actorsInvolvedInVideo.map(a => a.followersUrl)
}
}
-function getOriginVideoChannelAudience (videoChannel: VideoChannelModel, accountsInvolved: AccountModel[]) {
+function getVideoCommentAudience (
+ videoComment: VideoCommentModel,
+ threadParentComments: VideoCommentModel[],
+ actorsInvolvedInVideo: ActorModel[],
+ isOrigin = false
+) {
+ const to = [ ACTIVITY_PUB.PUBLIC ]
+ const cc = [ ]
+
+ // Owner of the video we comment
+ if (isOrigin === false) {
+ cc.push(videoComment.Video.VideoChannel.Account.Actor.url)
+ }
+
+ // Followers of the poster
+ cc.push(videoComment.Account.Actor.followersUrl)
+
+ // Send to actors we reply to
+ for (const parentComment of threadParentComments) {
+ cc.push(parentComment.Account.Actor.url)
+ }
+
return {
- to: [ videoChannel.Account.url ],
- cc: accountsInvolved.map(a => a.followersUrl)
+ to,
+ cc: cc.concat(actorsInvolvedInVideo.map(a => a.followersUrl))
}
}
-function getObjectFollowersAudience (accountsInvolvedInObject: AccountModel[]) {
+function getObjectFollowersAudience (actorsInvolvedInObject: ActorModel[]) {
return {
- to: accountsInvolvedInObject.map(a => a.followersUrl),
+ to: [ ACTIVITY_PUB.PUBLIC ].concat(actorsInvolvedInObject.map(a => a.followersUrl)),
cc: []
}
}
-async function getAccountsInvolvedInVideo (video: VideoModel, t: Transaction) {
- const accountsToForwardView = await VideoShareModel.loadAccountsByShare(video.id, t)
- accountsToForwardView.push(video.VideoChannel.Account)
+async function getActorsInvolvedInVideo (video: VideoModel, t: Transaction) {
+ const actors = await VideoShareModel.loadActorsByShare(video.id, t)
+ actors.push(video.VideoChannel.Account.Actor)
- return accountsToForwardView
+ return actors
}
-async function getAccountsInvolvedInVideoChannel (videoChannel: VideoChannelModel, t: Transaction) {
- const accountsToForwardView = await VideoChannelShareModel.loadAccountsByShare(videoChannel.id, t)
- accountsToForwardView.push(videoChannel.Account)
+async function getAudience (actorSender: ActorModel, t: Transaction, isPublic = true) {
+ const followerInboxUrls = await actorSender.getFollowerSharedInboxUrls(t)
- return accountsToForwardView
+ return buildAudience(followerInboxUrls, isPublic)
}
-async function getAudience (accountSender: AccountModel, t: Transaction, isPublic = true) {
- const followerInboxUrls = await accountSender.getFollowerSharedInboxUrls(t)
-
+function buildAudience (followerInboxUrls: string[], isPublic = true) {
// Thanks Mastodon: https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/tag_manager.rb#L47
let to = []
let cc = []
to = [ ACTIVITY_PUB.PUBLIC ]
cc = followerInboxUrls
} else { // Unlisted
- to = followerInboxUrls
- cc = [ ACTIVITY_PUB.PUBLIC ]
+ to = [ ]
+ cc = [ ]
}
return { to, cc }
}
-async function computeFollowerUris (toAccountFollower: AccountModel[], followersException: AccountModel[], t: Transaction) {
- const toAccountFollowerIds = toAccountFollower.map(a => a.id)
+function audiencify <T> (object: T, audience: ActivityAudience) {
+ return Object.assign(object, audience)
+}
+
+async function computeFollowerUris (toActorFollower: ActorModel[], actorsException: ActorModel[], t: Transaction) {
+ const toActorFollowerIds = toActorFollower.map(a => a.id)
+
+ const result = await ActorFollowModel.listAcceptedFollowerSharedInboxUrls(toActorFollowerIds, t)
+ const sharedInboxesException = actorsException.map(f => f.sharedInboxUrl || f.inboxUrl)
+ return result.data.filter(sharedInbox => sharedInboxesException.indexOf(sharedInbox) === -1)
+}
+
+async function computeUris (toActors: ActorModel[], actorsException: ActorModel[] = []) {
+ const toActorSharedInboxesSet = new Set(toActors.map(a => a.sharedInboxUrl || a.inboxUrl))
- const result = await AccountFollowModel.listAcceptedFollowerSharedInboxUrls(toAccountFollowerIds, t)
- const followersSharedInboxException = followersException.map(f => f.sharedInboxUrl)
- return result.data.filter(sharedInbox => followersSharedInboxException.indexOf(sharedInbox) === -1)
+ const sharedInboxesException = actorsException.map(f => f.sharedInboxUrl || f.inboxUrl)
+ return Array.from(toActorSharedInboxesSet)
+ .filter(sharedInbox => sharedInboxesException.indexOf(sharedInbox) === -1)
}
// ---------------------------------------------------------------------------
export {
broadcastToFollowers,
- getOriginVideoChannelAudience,
unicastTo,
+ buildAudience,
getAudience,
getOriginVideoAudience,
- getAccountsInvolvedInVideo,
- getAccountsInvolvedInVideoChannel,
+ getActorsInvolvedInVideo,
getObjectFollowersAudience,
- forwardActivity
+ forwardActivity,
+ audiencify,
+ getVideoCommentAudience,
+ computeUris,
+ broadcastToActors
}
projects / github / Chocobozzz / PeerTube.git / blobdiff