X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fwatching.ts;h=3fd22caac5b34a5b7dd32fcf233e1ae90238d3fd;hb=f012319a644fe8d9d33f2f567fa828442a3b39fd;hp=e8876b47a09565153533f5c4c9ebcaadde3216c3;hpb=54b3316099ed7d2dfcb6d708fdb686f1e125ce61;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/watching.ts b/server/controllers/api/videos/watching.ts index e8876b47a..3fd22caac 100644 --- 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() }