diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-10-11 13:30:51 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-10-11 13:30:51 +0200 |
| commit | cea2fd90ddb3bf57c2fed77128938d12d4c2be6b (patch) | |
| tree | 667da2c84456849cd4dacf990bc4b02ed14d5861 /server/lib/activitypub | |
| parent | 9d4c60dccc8e7e777ad139a82e9f61feda9d21fc (diff) | |
| parent | a6b26afc561703cc343f8962906734324b8c2d0c (diff) | |
| download | PeerTube-cea2fd90ddb3bf57c2fed77128938d12d4c2be6b.tar.gz PeerTube-cea2fd90ddb3bf57c2fed77128938d12d4c2be6b.tar.zst PeerTube-cea2fd90ddb3bf57c2fed77128938d12d4c2be6b.zip | |
Merge branch 'release/4.3.0' into develop
Diffstat (limited to 'server/lib/activitypub')
| -rw-r--r-- | server/lib/activitypub/process/process-follow.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts index da660bda3..7def753d5 100644 --- a/server/lib/activitypub/process/process-follow.ts +++ b/server/lib/activitypub/process/process-follow.ts | |||
| @@ -47,7 +47,7 @@ async function processFollow (byActor: MActorSignature, activityId: string, targ | |||
| 47 | byActor, | 47 | byActor, |
| 48 | targetActor, | 48 | targetActor, |
| 49 | activityId, | 49 | activityId, |
| 50 | state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL | 50 | state: await isFollowingInstance(targetActor) && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL |
| 51 | ? 'pending' | 51 | ? 'pending' |
| 52 | : 'accepted', | 52 | : 'accepted', |
| 53 | transaction: t | 53 | transaction: t |
| @@ -134,7 +134,7 @@ async function acceptIfNeeded (actorFollow: MActorFollow, targetActor: MActorFul | |||
| 134 | // Or if the instance automatically accepts followers | 134 | // Or if the instance automatically accepts followers |
| 135 | if (actorFollow.state === 'accepted') return | 135 | if (actorFollow.state === 'accepted') return |
| 136 | if (!await isFollowingInstance(targetActor)) return | 136 | if (!await isFollowingInstance(targetActor)) return |
| 137 | if (CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === true) return | 137 | if (CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === true && await isFollowingInstance(targetActor)) return |
| 138 | 138 | ||
| 139 | actorFollow.state = 'accepted' | 139 | actorFollow.state = 'accepted' |
| 140 | 140 | ||