From 2c0ccd4b3f5ec5633879e6b42cd5175e4de207cc Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 16 Apr 2020 16:36:43 +0200 Subject: Do not support subscriptions to accounts --- server/lib/job-queue/handlers/activitypub-follow.ts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'server/lib/job-queue') diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts index 4a7cda0a2..94eeed4c0 100644 --- a/server/lib/job-queue/handlers/activitypub-follow.ts +++ b/server/lib/job-queue/handlers/activitypub-follow.ts @@ -17,6 +17,7 @@ export type ActivitypubFollowPayload = { name: string host: string isAutoFollow?: boolean + assertIsChannel?: boolean } async function processActivityPubFollow (job: Bull.Job) { @@ -34,6 +35,11 @@ async function processActivityPubFollow (job: Bull.Job) { targetActor = await getOrCreateActorAndServerAndModel(actorUrl, 'all') } + if (payload.assertIsChannel && !targetActor.VideoChannel) { + logger.warn('Do not follow %s@%s because it is not a channel.', name, host) + return + } + const fromActor = await ActorModel.load(payload.followerActorId) return retryTransactionWrapper(follow, fromActor, targetActor, payload.isAutoFollow) -- cgit v1.2.3