Fix concurrency error when deleting a video

[github/Chocobozzz/PeerTube.git] / server / controllers / api / pods.ts

diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts
index 5210f9fe4a2d28388b055fb3d0d48510bdf00b50..e1e8ff6cad51abf5f2f7940ae876ba68b2ae5fd2 100644 (file)
--- a/server/controllers/api/pods.ts
+++ b/server/controllers/api/pods.ts
@@ -5,12 +5,13 @@ import { CONFIG } from '../../initializers'
 import {
   logger,
   getMyPublicCert,
-  getFormatedObjects
+  getFormattedObjects
 } from '../../helpers'
 import {
   sendOwnedVideosToPod,
   makeFriends,
-  quitFriends
+  quitFriends,
+  removeFriend
 } from '../../lib'
 import {
   podsAddValidator,
@@ -18,12 +19,13 @@ import {
   ensureIsAdmin,
   makeFriendsValidator,
   setBodyHostPort,
-  setBodyHostsPort
+  setBodyHostsPort,
+  podRemoveValidator
 } from '../../middlewares'
 import {
   PodInstance
 } from '../../models'
-import { Pod as FormatedPod } from '../../../shared'
+import { Pod as FormattedPod } from '../../../shared'
 
 const podsRouter = express.Router()
 
@@ -33,18 +35,24 @@ podsRouter.post('/',
   podsAddValidator,
   addPods
 )
-podsRouter.post('/makefriends',
+podsRouter.post('/make-friends',
   authenticate,
   ensureIsAdmin,
   makeFriendsValidator,
   setBodyHostsPort,
   makeFriendsController
 )
-podsRouter.get('/quitfriends',
+podsRouter.get('/quit-friends',
   authenticate,
   ensureIsAdmin,
   quitFriendsController
 )
+podsRouter.delete('/:id',
+  authenticate,
+  ensureIsAdmin,
+  podRemoveValidator,
+  removeFriendController
+)
 
 // ---------------------------------------------------------------------------
 
@@ -73,7 +81,7 @@ function addPods (req: express.Request, res: express.Response, next: express.Nex
 
 function listPods (req: express.Request, res: express.Response, next: express.NextFunction) {
   db.Pod.list()
-    .then(podsList => res.json(getFormatedObjects<FormatedPod, PodInstance>(podsList, podsList.length)))
+    .then(podsList => res.json(getFormattedObjects<FormattedPod, PodInstance>(podsList, podsList.length)))
     .catch(err => next(err))
 }
 
@@ -93,3 +101,11 @@ function quitFriendsController (req: express.Request, res: express.Response, nex
     .then(() => res.type('json').status(204).end())
     .catch(err => next(err))
 }
+
+function removeFriendController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const pod = res.locals.pod as PodInstance
+
+  removeFriend(pod)
+    .then(() => (res.type('json').status(204).end()))
+    .catch(err => next(err))
+}