IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to manually approves instance followers in REST API

Browse Source
This commit is contained in:
Chocobozzz
2019-04-08 15:18:04 +02:00
parent 5b9c965d5a
commit 14893eb71c
16 changed files with 261 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ async function processFollow (actor: ActorModel, targetActorURL: string) {
const serverActor = await getServerActor()
if (targetActor.id === serverActor.id && CONFIG.FOLLOWERS.INSTANCE.ENABLED === false) {
logger.info('Rejecting %s because instance followers are disabled.', targetActor.url)
return sendReject(actor, targetActor)
}
@@ -43,7 +45,7 @@ async function processFollow (actor: ActorModel, targetActorURL: string) {
defaults: {
actorId: actor.id,
targetActorId: targetActor.id,
state: 'accepted'
state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL ? 'pending' : 'accepted'
},
transaction: t
})
@@ -51,7 +53,7 @@ async function processFollow (actor: ActorModel, targetActorURL: string) {
actorFollow.ActorFollower = actor
actorFollow.ActorFollowing = targetActor
if (actorFollow.state !== 'accepted') {
if (actorFollow.state !== 'accepted' && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) {
actorFollow.state = 'accepted'
await actorFollow.save({ transaction: t })
}
@@ -60,7 +62,7 @@ async function processFollow (actor: ActorModel, targetActorURL: string) {
actorFollow.ActorFollowing = targetActor
// Target sends to actor he accepted the follow request
await sendAccept(actorFollow)
if (actorFollow.state === 'accepted') await sendAccept(actorFollow)
return { actorFollow, created }
})