aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/activitypub/process/process-follow.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-04-08 14:04:57 +0200
committerChocobozzz <me@florianbigard.com>2019-04-08 14:06:23 +0200
commit5b9c965d5aa747f29b081289f930ee215fdc23c8 (patch)
tree1c726117525230d74235e7fa986eb72e7376fb6c /server/lib/activitypub/process/process-follow.ts
parent594d0c6a7c64b045c11508bb4e4b19b75b3fc557 (diff)
downloadPeerTube-5b9c965d5aa747f29b081289f930ee215fdc23c8.tar.gz
PeerTube-5b9c965d5aa747f29b081289f930ee215fdc23c8.tar.zst
PeerTube-5b9c965d5aa747f29b081289f930ee215fdc23c8.zip
Add ability to forbid followers
Diffstat (limited to 'server/lib/activitypub/process/process-follow.ts')
-rw-r--r--server/lib/activitypub/process/process-follow.ts10
1 files changed, 8 insertions, 2 deletions
diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts
index 0cd537187..cecf09b47 100644
--- a/server/lib/activitypub/process/process-follow.ts
+++ b/server/lib/activitypub/process/process-follow.ts
@@ -1,12 +1,13 @@
1import { ActivityFollow } from '../../../../shared/models/activitypub' 1import { ActivityFollow } from '../../../../shared/models/activitypub'
2import { retryTransactionWrapper } from '../../../helpers/database-utils' 2import { retryTransactionWrapper } from '../../../helpers/database-utils'
3import { logger } from '../../../helpers/logger' 3import { logger } from '../../../helpers/logger'
4import { sequelizeTypescript } from '../../../initializers' 4import { sequelizeTypescript, CONFIG } from '../../../initializers'
5import { ActorModel } from '../../../models/activitypub/actor' 5import { ActorModel } from '../../../models/activitypub/actor'
6import { ActorFollowModel } from '../../../models/activitypub/actor-follow' 6import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
7import { sendAccept } from '../send' 7import { sendAccept, sendReject } from '../send'
8import { Notifier } from '../../notifier' 8import { Notifier } from '../../notifier'
9import { getAPId } from '../../../helpers/activitypub' 9import { getAPId } from '../../../helpers/activitypub'
10import { getServerActor } from '../../../helpers/utils'
10 11
11async function processFollowActivity (activity: ActivityFollow, byActor: ActorModel) { 12async function processFollowActivity (activity: ActivityFollow, byActor: ActorModel) {
12 const activityObject = getAPId(activity.object) 13 const activityObject = getAPId(activity.object)
@@ -29,6 +30,11 @@ async function processFollow (actor: ActorModel, targetActorURL: string) {
29 if (!targetActor) throw new Error('Unknown actor') 30 if (!targetActor) throw new Error('Unknown actor')
30 if (targetActor.isOwned() === false) throw new Error('This is not a local actor.') 31 if (targetActor.isOwned() === false) throw new Error('This is not a local actor.')
31 32
33 const serverActor = await getServerActor()
34 if (targetActor.id === serverActor.id && CONFIG.FOLLOWERS.INSTANCE.ENABLED === false) {
35 return sendReject(actor, targetActor)
36 }
37
32 const [ actorFollow, created ] = await ActorFollowModel.findOrCreate({ 38 const [ actorFollow, created ] = await ActorFollowModel.findOrCreate({
33 where: { 39 where: {
34 actorId: actor.id, 40 actorId: actor.id,