OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/2.1.0' into develop

pull/2507/head
Chocobozzz 2020-02-17 15:44:53 +01:00
parent 2ad9dcda24 2db48acc46
commit 134cf2bce9
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/lib/activitypub/process/process-follow.ts
View File

@ -59,7 +59,9 @@ async function processFollow (byActor: MActorSignature, targetActorURL: string)
transaction: t
})
if (actorFollow.state !== 'accepted' && isFollowingInstance && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) {
// Set the follow as accepted if the remote actor follows a channel or account
// Or if the instance automatically accepts followers
if (actorFollow.state !== 'accepted' && (isFollowingInstance === false || CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false)) {
actorFollow.state = 'accepted'
await actorFollow.save({ transaction: t })
}