X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Frate.ts;h=354c3d8f93d43c3288e82c6a2457b919fd4f4d6e;hb=e02573ad67626210ed279bad321ee139094921a1;hp=6ddc698173f4e2d2d66cfc99190dad7b31a3a437;hpb=0a6658fdcbd779ada8f3758048c326e997902d5a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts index 6ddc69817..354c3d8f9 100644 --- a/server/controllers/api/videos/rate.ts +++ b/server/controllers/api/videos/rate.ts @@ -1,5 +1,4 @@ import * as express from 'express' -import * as Promise from 'bluebird' import { database as db } from '../../../initializers/database' import { @@ -17,7 +16,8 @@ import { } from '../../../lib' import { authenticate, - videoRateValidator + videoRateValidator, + asyncMiddleware } from '../../../middlewares' import { UserVideoRateUpdate, VideoRateType } from '../../../../shared' @@ -26,7 +26,7 @@ const rateVideoRouter = express.Router() rateVideoRouter.put('/:id/rate', authenticate, videoRateValidator, - rateVideoRetryWrapper + asyncMiddleware(rateVideoRetryWrapper) ) // --------------------------------------------------------------------------- @@ -37,126 +37,107 @@ export { // --------------------------------------------------------------------------- -function rateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { +async function rateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { const options = { arguments: [ req, res ], errorMessage: 'Cannot update the user video rate.' } - retryTransactionWrapper(rateVideo, options) - .then(() => res.type('json').status(204).end()) - .catch(err => next(err)) + await retryTransactionWrapper(rateVideo, options) + + return res.type('json').status(204).end() } -function rateVideo (req: express.Request, res: express.Response) { +async function rateVideo (req: express.Request, res: express.Response) { const body: UserVideoRateUpdate = req.body const rateType = body.rating const videoInstance = res.locals.video const userInstance = res.locals.oauth.token.User - return db.sequelize.transaction(t => { - return db.UserVideoRate.load(userInstance.id, videoInstance.id, t) - .then(previousRate => { - const options = { transaction: t } - - let likesToIncrement = 0 - let dislikesToIncrement = 0 - - if (rateType === VIDEO_RATE_TYPES.LIKE) likesToIncrement++ - else if (rateType === VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement++ - - let promise: Promise - - // There was a previous rate, update it - if (previousRate) { - // We will remove the previous rate, so we will need to update the video count attribute - if (previousRate.type === VIDEO_RATE_TYPES.LIKE) likesToIncrement-- - else if (previousRate.type === VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement-- - - if (rateType === 'none') { // Destroy previous rate - promise = previousRate.destroy() - } else { // Update previous rate - previousRate.type = rateType as VideoRateType - - promise = previousRate.save() - } - } else if (rateType !== 'none') { // There was not a previous rate, insert a new one if there is a rate - const query = { - userId: userInstance.id, - videoId: videoInstance.id, - type: rateType - } - - promise = db.UserVideoRate.create(query, options) - } else { - promise = Promise.resolve() - } - - return promise.then(() => ({ likesToIncrement, dislikesToIncrement })) - }) - .then(({ likesToIncrement, dislikesToIncrement }) => { - const options = { transaction: t } - const incrementQuery = { - likes: likesToIncrement, - dislikes: dislikesToIncrement - } - - // Even if we do not own the video we increment the attributes - // It is usefull for the user to have a feedback - return videoInstance.increment(incrementQuery, options).then(() => ({ likesToIncrement, dislikesToIncrement })) - }) - .then(({ likesToIncrement, dislikesToIncrement }) => { - // No need for an event type, we own the video - if (videoInstance.isOwned()) return { likesToIncrement, dislikesToIncrement } - - const eventsParams = [] - - if (likesToIncrement !== 0) { - eventsParams.push({ - videoId: videoInstance.id, - type: REQUEST_VIDEO_EVENT_TYPES.LIKES, - count: likesToIncrement - }) - } - - if (dislikesToIncrement !== 0) { - eventsParams.push({ - videoId: videoInstance.id, - type: REQUEST_VIDEO_EVENT_TYPES.DISLIKES, - count: dislikesToIncrement - }) - } - - return addEventsToRemoteVideo(eventsParams, t).then(() => ({ likesToIncrement, dislikesToIncrement })) - }) - .then(({ likesToIncrement, dislikesToIncrement }) => { - // We do not own the video, there is no need to send a quick and dirty update to friends - // Our rate was already sent by the addEvent function - if (videoInstance.isOwned() === false) return undefined - - const qadusParams = [] - - if (likesToIncrement !== 0) { - qadusParams.push({ - videoId: videoInstance.id, - type: REQUEST_VIDEO_QADU_TYPES.LIKES - }) - } - - if (dislikesToIncrement !== 0) { - qadusParams.push({ - videoId: videoInstance.id, - type: REQUEST_VIDEO_QADU_TYPES.DISLIKES - }) - } - - return quickAndDirtyUpdatesVideoToFriends(qadusParams, t) - }) - }) - .then(() => logger.info('User video rate for video %s of user %s updated.', videoInstance.name, userInstance.username)) - .catch(err => { - // This is just a debug because we will retry the insert - logger.debug('Cannot add the user video rate.', err) - throw err + await db.sequelize.transaction(async t => { + const sequelizeOptions = { transaction: t } + const previousRate = await db.UserVideoRate.load(userInstance.id, videoInstance.id, t) + + let likesToIncrement = 0 + let dislikesToIncrement = 0 + + if (rateType === VIDEO_RATE_TYPES.LIKE) likesToIncrement++ + else if (rateType === VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement++ + + // There was a previous rate, update it + if (previousRate) { + // We will remove the previous rate, so we will need to update the video count attribute + if (previousRate.type === VIDEO_RATE_TYPES.LIKE) likesToIncrement-- + else if (previousRate.type === VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement-- + + if (rateType === 'none') { // Destroy previous rate + await previousRate.destroy() + } else { // Update previous rate + previousRate.type = rateType as VideoRateType + + await previousRate.save() + } + } else if (rateType !== 'none') { // There was not a previous rate, insert a new one if there is a rate + const query = { + userId: userInstance.id, + videoId: videoInstance.id, + type: rateType + } + + await db.UserVideoRate.create(query, sequelizeOptions) + } + + const incrementQuery = { + likes: likesToIncrement, + dislikes: dislikesToIncrement + } + + // Even if we do not own the video we increment the attributes + // It is useful for the user to have a feedback + await videoInstance.increment(incrementQuery, sequelizeOptions) + + // Send a event to original pod + if (videoInstance.isOwned() === false) { + + const eventsParams = [] + + if (likesToIncrement !== 0) { + eventsParams.push({ + videoId: videoInstance.id, + type: REQUEST_VIDEO_EVENT_TYPES.LIKES, + count: likesToIncrement + }) + } + + if (dislikesToIncrement !== 0) { + eventsParams.push({ + videoId: videoInstance.id, + type: REQUEST_VIDEO_EVENT_TYPES.DISLIKES, + count: dislikesToIncrement + }) + } + + await addEventsToRemoteVideo(eventsParams, t) + } else { // We own the video, we need to send a quick and dirty update to friends to notify the counts changed + const qadusParams = [] + + if (likesToIncrement !== 0) { + qadusParams.push({ + videoId: videoInstance.id, + type: REQUEST_VIDEO_QADU_TYPES.LIKES + }) + } + + if (dislikesToIncrement !== 0) { + qadusParams.push({ + videoId: videoInstance.id, + type: REQUEST_VIDEO_QADU_TYPES.DISLIKES + }) + } + + await quickAndDirtyUpdatesVideoToFriends(qadusParams, t) + } }) + + logger.info('User video rate for video %s of user %s updated.', videoInstance.name, userInstance.username) }