aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-02-17 15:44:53 +0100
committerChocobozzz <me@florianbigard.com>2020-02-17 15:44:53 +0100
commit134cf2bce96a8c5aefd55154e884964975d8cf23 (patch)
tree5c345f3e5f9acfbd7499ec7f33a2bd99672f8aa1
parent2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89 (diff)
parent2db48acc46307f8f61a39ba073c3ef1ee31f2940 (diff)
downloadPeerTube-134cf2bce96a8c5aefd55154e884964975d8cf23.tar.gz
PeerTube-134cf2bce96a8c5aefd55154e884964975d8cf23.tar.zst
PeerTube-134cf2bce96a8c5aefd55154e884964975d8cf23.zip
Merge branch 'release/2.1.0' into develop
-rw-r--r--server/lib/activitypub/process/process-follow.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts
index 0b98d4af2..db7fb8568 100644
--- a/server/lib/activitypub/process/process-follow.ts
+++ b/server/lib/activitypub/process/process-follow.ts
@@ -59,7 +59,9 @@ async function processFollow (byActor: MActorSignature, targetActorURL: string)
59 transaction: t 59 transaction: t
60 }) 60 })
61 61
62 if (actorFollow.state !== 'accepted' && isFollowingInstance && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) { 62 // Set the follow as accepted if the remote actor follows a channel or account
63 // Or if the instance automatically accepts followers
64 if (actorFollow.state !== 'accepted' && (isFollowingInstance === false || CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false)) {
63 actorFollow.state = 'accepted' 65 actorFollow.state = 'accepted'
64 await actorFollow.save({ transaction: t }) 66 await actorFollow.save({ transaction: t })
65 } 67 }