diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-02-17 15:34:42 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-02-17 15:34:42 +0100 |
| commit | 2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89 (patch) | |
| tree | a814ca1ab71078abe008dae7afc646fb388ca1d8 /server/lib/activitypub/process | |
| parent | 8d3fe90c3f3bfd43366ea41a2519431b9001e744 (diff) | |
| parent | 1c5fbed2093c0462e40a092d49d761a043c50e98 (diff) | |
| download | PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.gz PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.zst PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.zip | |
Merge branch 'release/2.1.0' into develop
Diffstat (limited to 'server/lib/activitypub/process')
| -rw-r--r-- | server/lib/activitypub/process/process-follow.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts index 85f22d654..0b98d4af2 100644 --- a/server/lib/activitypub/process/process-follow.ts +++ b/server/lib/activitypub/process/process-follow.ts | |||
| @@ -59,7 +59,7 @@ async function processFollow (byActor: MActorSignature, targetActorURL: string) | |||
| 59 | transaction: t | 59 | transaction: t |
| 60 | }) | 60 | }) |
| 61 | 61 | ||
| 62 | if (actorFollow.state !== 'accepted' && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) { | 62 | if (actorFollow.state !== 'accepted' && isFollowingInstance && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) { |
| 63 | actorFollow.state = 'accepted' | 63 | actorFollow.state = 'accepted' |
| 64 | await actorFollow.save({ transaction: t }) | 64 | await actorFollow.save({ transaction: t }) |
| 65 | } | 65 | } |