2 files changed, 31 insertions, 2 deletions

diff --git a/routes/api/v1/pods.js b/routes/api/v1/pods.js
index 2bb8f89ab..2430b0d7e 100644
--- a/routes/api/v1/pods.js
+++ b/routes/api/v1/pods.js
@@ -6,6 +6,7 @@
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.pods
+  var secureRequest = middleware.reqValidators.remote.secureRequest
   var pods = require('../../../src/pods')
 
   function listPods (req, res, next) {
@@ -24,8 +25,33 @@
     })
   }
 
+  function removePods (req, res, next) {
+    pods.remove(req.body.signature.url, function (err) {
+      if (err) return next(err)
+
+      res.sendStatus(204)
+    })
+  }
+
   function makeFriends (req, res, next) {
-    pods.makeFriends(function (err) {
+    pods.hasFriends(function (err, has_friends) {
+      if (err) return next(err)
+
+      if (has_friends === true) {
+        // We need to quit our friends before make new ones
+        res.sendStatus(409)
+      } else {
+        pods.makeFriends(function (err) {
+          if (err) return next(err)
+
+          res.sendStatus(204)
+        })
+      }
+    })
+  }
+
+  function quitFriends (req, res, next) {
+    pods.quitFriends(function (err) {
       if (err) return next(err)
 
       res.sendStatus(204)
@@ -34,7 +60,10 @@
 
   router.get('/', miscMiddleware.cache(false), listPods)
   router.get('/makefriends', miscMiddleware.cache(false), makeFriends)
+  router.get('/quitfriends', miscMiddleware.cache(false), quitFriends)
   router.post('/', reqValidator.podsAdd, miscMiddleware.cache(false), addPods)
+  // Post because this is a secured request
+  router.post('/remove', secureRequest, miscMiddleware.decryptBody, removePods)
 
   module.exports = router
 })()
diff --git a/routes/api/v1/remoteVideos.js b/routes/api/v1/remoteVideos.js
index a104113b2..6ba6ce17b 100644
--- a/routes/api/v1/remoteVideos.js
+++ b/routes/api/v1/remoteVideos.js
@@ -22,7 +22,7 @@
     videos.removeRemotes(req.body.signature.url, pluck(req.body.data, 'magnetUri'), function (err) {
       if (err) return next(err)
 
-      res.status(204)
+      res.sendStatus(204)
     })
   }