Merge branch 'release/1.4.0' into develop

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

diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index 727984506158d5731893237656b48788405aa7ad..3d2f3d7281bef752ac12b193574be68dcac5fb04 100644 (file)
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -1,32 +1,19 @@
 import * as express from 'express'
-
-import { database as db } from '../../../initializers/database'
-import {
-  logger,
-  retryTransactionWrapper
-} from '../../../helpers'
-import {
-  VIDEO_RATE_TYPES,
-  REQUEST_VIDEO_EVENT_TYPES,
-  REQUEST_VIDEO_QADU_TYPES
-} from '../../../initializers'
-import {
-  addEventsToRemoteVideo,
-  quickAndDirtyUpdatesVideoToFriends
-} from '../../../lib'
-import {
-  authenticate,
-  videoRateValidator,
-  asyncMiddleware
-} from '../../../middlewares'
 import { UserVideoRateUpdate } from '../../../../shared'
+import { logger } from '../../../helpers/logger'
+import { VIDEO_RATE_TYPES } from '../../../initializers/constants'
+import { getRateUrl, sendVideoRateChange } from '../../../lib/activitypub'
+import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoUpdateRateValidator } from '../../../middlewares'
+import { AccountModel } from '../../../models/account/account'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { sequelizeTypescript } from '../../../initializers/database'
 
 const rateVideoRouter = express.Router()
 
 rateVideoRouter.put('/:id/rate',
   authenticate,
-  videoRateValidator,
-  asyncMiddleware(rateVideoRetryWrapper)
+  asyncMiddleware(videoUpdateRateValidator),
+  asyncRetryTransactionMiddleware(rateVideo)
 )
 
 // ---------------------------------------------------------------------------
@@ -37,26 +24,17 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function rateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const options = {
-    arguments: [ req, res ],
-    errorMessage: 'Cannot update the user video rate.'
-  }
-
-  await retryTransactionWrapper(rateVideo, options)
-
-  return res.type('json').status(204).end()
-}
-
 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
+  const videoInstance = res.locals.videoAll
+  const userAccount = res.locals.oauth.token.User.Account
 
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
     const sequelizeOptions = { transaction: t }
-    const previousRate = await db.UserVideoRate.load(userInstance.id, videoInstance.id, t)
+
+    const accountInstance = await AccountModel.load(userAccount.id, t)
+    const previousRate = await AccountVideoRateModel.load(accountInstance.id, videoInstance.id, t)
 
     let likesToIncrement = 0
     let dislikesToIncrement = 0
@@ -67,24 +45,25 @@ async function rateVideo (req: express.Request, res: express.Response) {
     // 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 (previousRate.type === 'like') likesToIncrement--
+      else if (previousRate.type === 'dislike') dislikesToIncrement--
 
       if (rateType === 'none') { // Destroy previous rate
-        await previousRate.destroy()
+        await previousRate.destroy(sequelizeOptions)
       } else { // Update previous rate
         previousRate.type = rateType
-
-        await previousRate.save()
+        previousRate.url = getRateUrl(rateType, userAccount.Actor, videoInstance)
+        await previousRate.save(sequelizeOptions)
       }
     } else if (rateType !== 'none') { // There was not a previous rate, insert a new one if there is a rate
       const query = {
-        userId: userInstance.id,
+        accountId: accountInstance.id,
         videoId: videoInstance.id,
-        type: rateType
+        type: rateType,
+        url: getRateUrl(rateType, userAccount.Actor, videoInstance)
       }
 
-      await db.UserVideoRate.create(query, sequelizeOptions)
+      await AccountVideoRateModel.create(query, sequelizeOptions)
     }
 
     const incrementQuery = {
@@ -92,52 +71,12 @@ async function rateVideo (req: express.Request, res: express.Response) {
       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) {
+    await sendVideoRateChange(accountInstance, videoInstance, likesToIncrement, dislikesToIncrement, t)
 
-      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('Account video rate for video %s of account %s updated.', videoInstance.name, accountInstance.name)
   })
 
-  logger.info('User video rate for video %s of user %s updated.', videoInstance.name, userInstance.username)
+  return res.type('json').status(204).end()
 }