MVideoRedundancyFileVideo,
MVideoRedundancyStreamingPlaylistVideo
} from '../../../typings/models'
+import { ContextType } from '@server/helpers/activitypub'
async function sendCreateVideo (video: MVideoAP, t: Transaction) {
- if (video.privacy === VideoPrivacy.PRIVATE) return undefined
+ if (!video.hasPrivacyForFederation()) return undefined
logger.info('Creating job to send video creation of %s.', video.url)
byActor,
video,
url: fileRedundancy.url,
- object: fileRedundancy.toActivityPubObject()
+ object: fileRedundancy.toActivityPubObject(),
+ contextType: 'CacheFile'
})
}
// Add the actor that commented too
actorsInvolvedInComment.push(byActor)
- const parentsCommentActors = threadParentComments.map(c => c.Account.Actor)
+ const parentsCommentActors = threadParentComments.filter(c => !c.isDeleted())
+ .map(c => c.Account.Actor)
let audience: ActivityAudience
if (isOrigin) {
if (isOrigin) return broadcastToFollowers(createActivity, byActor, actorsInvolvedInComment, t, actorsException)
// Send to origin
- t.afterCommit(() => unicastTo(createActivity, byActor, comment.Video.VideoChannel.Account.Actor.sharedInboxUrl))
+ t.afterCommit(() => unicastTo(createActivity, byActor, comment.Video.VideoChannel.Account.Actor.getSharedInbox()))
}
function buildCreateActivity (url: string, byActor: MActorLight, object: any, audience?: ActivityAudience): ActivityCreate {
// ---------------------------------------------------------------------------
async function sendVideoRelatedCreateActivity (options: {
- byActor: MActorLight,
- video: MVideoAccountLight,
- url: string,
- object: any,
+ byActor: MActorLight
+ video: MVideoAccountLight
+ url: string
+ object: any
transaction?: Transaction
+ contextType?: ContextType
}) {
const activityBuilder = (audience: ActivityAudience) => {
return buildCreateActivity(options.url, options.byActor, options.object, audience)