Process video torrents in order

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

diff --git a/server/controllers/api/videos/watching.ts b/server/controllers/api/videos/watching.ts
index e8876b47a09565153533f5c4c9ebcaadde3216c3..3fd22caac5b34a5b7dd32fcf233e1ae90238d3fd 100644 (file)
--- a/server/controllers/api/videos/watching.ts
+++ b/server/controllers/api/videos/watching.ts
@@ -1,12 +1,18 @@
-import * as express from 'express'
-import { UserWatchingVideo } from '../../../../shared'
-import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoWatchingValidator } from '../../../middlewares'
-import { UserVideoHistoryModel } from '../../../models/account/user-video-history'
-import { UserModel } from '../../../models/account/user'
+import express from 'express'
+import { HttpStatusCode, UserWatchingVideo } from '@shared/models'
+import {
+  asyncMiddleware,
+  asyncRetryTransactionMiddleware,
+  authenticate,
+  openapiOperationDoc,
+  videoWatchingValidator
+} from '../../../middlewares'
+import { UserVideoHistoryModel } from '../../../models/user/user-video-history'
 
 const watchingRouter = express.Router()
 
 watchingRouter.put('/:videoId/watching',
+  openapiOperationDoc({ operationId: 'setProgress' }),
   authenticate,
   asyncMiddleware(videoWatchingValidator),
   asyncRetryTransactionMiddleware(userWatchVideo)
@@ -21,10 +27,10 @@ export {
 // ---------------------------------------------------------------------------
 
 async function userWatchVideo (req: express.Request, res: express.Response) {
-  const user = res.locals.oauth.token.User as UserModel
+  const user = res.locals.oauth.token.User
 
   const body: UserWatchingVideo = req.body
-  const { id: videoId } = res.locals.video as { id: number }
+  const { id: videoId } = res.locals.videoId
 
   await UserVideoHistoryModel.upsert({
     videoId,
@@ -32,5 +38,7 @@ async function userWatchVideo (req: express.Request, res: express.Response) {
     currentTime: body.currentTime
   })
 
-  return res.type('json').status(204).end()
+  return res.type('json')
+            .status(HttpStatusCode.NO_CONTENT_204)
+            .end()
 }