aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-04-08 14:04:57 +0200
committerChocobozzz <me@florianbigard.com>2019-04-08 14:06:23 +0200
commit5b9c965d5aa747f29b081289f930ee215fdc23c8 (patch)
tree1c726117525230d74235e7fa986eb72e7376fb6c /server/controllers
parent594d0c6a7c64b045c11508bb4e4b19b75b3fc557 (diff)
downloadPeerTube-5b9c965d5aa747f29b081289f930ee215fdc23c8.tar.gz
PeerTube-5b9c965d5aa747f29b081289f930ee215fdc23c8.tar.zst
PeerTube-5b9c965d5aa747f29b081289f930ee215fdc23c8.zip
Add ability to forbid followers
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/config.ts5
-rw-r--r--server/controllers/api/server/follows.ts2
2 files changed, 6 insertions, 1 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index bd0ba4f9d..f9bb0b947 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -279,6 +279,11 @@ function customConfig (): CustomConfig {
279 enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED 279 enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED
280 } 280 }
281 } 281 }
282 },
283 followers: {
284 instance: {
285 enabled: CONFIG.FOLLOWERS.INSTANCE.ENABLED
286 }
282 } 287 }
283 } 288 }
284} 289}
diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index c00069f93..87cf091cb 100644
--- a/server/controllers/api/server/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -139,7 +139,7 @@ async function removeFollowing (req: express.Request, res: express.Response) {
139async function removeFollower (req: express.Request, res: express.Response) { 139async function removeFollower (req: express.Request, res: express.Response) {
140 const follow = res.locals.follow 140 const follow = res.locals.follow
141 141
142 await sendReject(follow) 142 await sendReject(follow.ActorFollower, follow.ActorFollowing)
143 143
144 await follow.destroy() 144 await follow.destroy()
145 145