X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-reject.ts;h=83d8dfba72366e78888216535a0aec006b2c32de;hb=bae616273d455d225d131eb17c56db6c20a0b6b3;hp=643c468a9d169a3be6d261f74cb0969f7baaa125;hpb=a30a136c9896c656cab98d2c92cde32c534dc098;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/send/send-reject.ts b/server/lib/activitypub/send/send-reject.ts index 643c468a9..83d8dfba7 100644 --- a/server/lib/activitypub/send/send-reject.ts +++ b/server/lib/activitypub/send/send-reject.ts @@ -1,11 +1,11 @@ -import { ActivityFollow, ActivityReject } from '../../../../shared/models/activitypub' -import { getActorFollowActivityPubUrl, getActorFollowRejectActivityPubUrl } from '../url' -import { unicastTo } from './utils' -import { buildFollowActivity } from './send-follow' +import { ActivityFollow, ActivityReject } from '@shared/models' import { logger } from '../../../helpers/logger' -import { MActor } from '../../../typings/models' +import { MActor } from '../../../types/models' +import { getLocalActorFollowRejectActivityPubUrl } from '../url' +import { buildFollowActivity } from './send-follow' +import { unicastTo } from './shared/send-utils' -function sendReject (follower: MActor, following: MActor) { +function sendReject (followUrl: string, follower: MActor, following: MActor) { if (!follower.serverId) { // This should never happen logger.warn('Do not sending reject to local follower.') return @@ -13,13 +13,12 @@ function sendReject (follower: MActor, following: MActor) { logger.info('Creating job to reject follower %s.', follower.url) - const followUrl = getActorFollowActivityPubUrl(follower, following) const followData = buildFollowActivity(followUrl, follower, following) - const url = getActorFollowRejectActivityPubUrl(follower, following) + const url = getLocalActorFollowRejectActivityPubUrl(follower, following) const data = buildRejectActivity(url, following, followData) - return unicastTo(data, following, follower.inboxUrl) + return unicastTo({ data, byActor: following, toActorUrl: follower.inboxUrl, contextType: 'Reject' }) } // ---------------------------------------------------------------------------