1 files changed, 37 insertions, 19 deletions

diff --git a/controllers/api/v1/pods.js b/controllers/api/v1/pods.js
index b073e85af..82d8d7f08 100644
--- a/controllers/api/v1/pods.js
+++ b/controllers/api/v1/pods.js
@@ -2,18 +2,23 @@
   'use strict'
 
   var express = require('express')
+  var fs = require('fs')
 
+  var logger = require('../../../helpers/logger')
+  var friends = require('../../../lib/friends')
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
-  var pods = require('../../../models/pods')
+  var Pods = require('../../../models/pods')
   var reqValidator = middleware.reqValidators.pods
   var secureRequest = middleware.reqValidators.remote.secureRequest
+  var utils = require('../../../helpers/utils')
+  var Videos = require('../../../models/videos')
 
   var router = express.Router()
 
   router.get('/', miscMiddleware.cache(false), listPods)
   router.post('/', reqValidator.podsAdd, miscMiddleware.cache(false), addPods)
-  router.get('/makefriends', miscMiddleware.cache(false), makeFriends)
+  router.get('/makefriends', reqValidator.makeFriends, miscMiddleware.cache(false), makeFriends)
   router.get('/quitfriends', miscMiddleware.cache(false), quitFriends)
   // Post because this is a secured request
   router.post('/remove', secureRequest, miscMiddleware.decryptBody, removePods)
@@ -25,15 +30,32 @@
   // ---------------------------------------------------------------------------
 
   function addPods (req, res, next) {
-    pods.add(req.body.data, function (err, json) {
+    var informations = req.body.data
+    Pods.add(informations, function (err) {
       if (err) return next(err)
 
-      res.json(json)
+      Videos.addRemotes(informations.videos)
+
+      fs.readFile(utils.getCertDir() + 'peertube.pub', 'utf8', function (err, cert) {
+        if (err) {
+          logger.error('Cannot read cert file.', { error: err })
+          return next(err)
+        }
+
+        Videos.listOwned(function (err, videos_list) {
+          if (err) {
+            logger.error('Cannot get the list of owned videos.', { error: err })
+            return next(err)
+          }
+
+          res.json({ cert: cert, videos: videos_list })
+        })
+      })
     })
   }
 
   function listPods (req, res, next) {
-    pods.list(function (err, pods_list) {
+    Pods.list(function (err, pods_list) {
       if (err) return next(err)
 
       res.json(pods_list)
@@ -41,32 +63,28 @@
   }
 
   function makeFriends (req, res, next) {
-    pods.hasFriends(function (err, has_friends) {
+    friends.makeFriends(function (err) {
       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)
-        })
-      }
+      res.sendStatus(204)
     })
   }
 
   function removePods (req, res, next) {
-    pods.remove(req.body.signature.url, function (err) {
+    var url = req.body.signature.url
+    Pods.remove(url, function (err) {
       if (err) return next(err)
 
-      res.sendStatus(204)
+      Videos.removeAllRemotesOf(url, function (err) {
+        if (err) logger.error('Cannot remove all remote videos of %s.', url)
+        logger.info('%s pod removed.', url)
+        res.sendStatus(204)
+      })
     })
   }
 
   function quitFriends (req, res, next) {
-    pods.quitFriends(function (err) {
+    friends.quitFriends(function (err) {
       if (err) return next(err)
 
       res.sendStatus(204)