Finalise the join in a network and add the ability to quit it

[github/Chocobozzz/PeerTube.git] / routes / api / v1 / remoteVideos.js

diff --git a/routes/api/v1/remoteVideos.js b/routes/api/v1/remoteVideos.js
index 23bdcbe243ba914dd954c6dfdfbeb2b10fd396e8..6ba6ce17b8a6593713f5a36de0dc9e56d8853683 100644 (file)
--- a/routes/api/v1/remoteVideos.js
+++ b/routes/api/v1/remoteVideos.js
@@ -3,28 +3,31 @@
 
   var express = require('express')
   var router = express.Router()
+  var pluck = require('lodash-node/compat/collection/pluck')
+
   var middleware = require('../../../middlewares')
-  var requestValidator = require('../../../middlewares/reqValidators').remote
+  var miscMiddleware = middleware.misc
+  var reqValidator = middleware.reqValidators.remote
   var videos = require('../../../src/videos')
 
   function addRemoteVideos (req, res, next) {
-    videos.addRemote(req.body.data, function (err, video) {
+    videos.addRemotes(req.body.data, function (err, videos) {
       if (err) return next(err)
 
-      res.json(video)
+      res.json(videos)
     })
   }
 
   function removeRemoteVideo (req, res, next) {
-    videos.removeRemote(req.body.signature.url, req.body.data.magnetUri, function (err) {
+    videos.removeRemotes(req.body.signature.url, pluck(req.body.data, 'magnetUri'), function (err) {
       if (err) return next(err)
 
-      res.status(204)
+      res.sendStatus(204)
     })
   }
 
-  router.post('/add', requestValidator.secureRequest, middleware.decryptBody, requestValidator.remoteVideosAdd, middleware.cache(false), addRemoteVideos)
-  router.post('/remove', requestValidator.secureRequest, middleware.decryptBody, requestValidator.remoteVideosRemove, middleware.cache(false), removeRemoteVideo)
+  router.post('/add', reqValidator.secureRequest, miscMiddleware.decryptBody, reqValidator.remoteVideosAdd, miscMiddleware.cache(false), addRemoteVideos)
+  router.post('/remove', reqValidator.secureRequest, miscMiddleware.decryptBody, reqValidator.remoteVideosRemove, miscMiddleware.cache(false), removeRemoteVideo)
 
   module.exports = router
 })()