X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideo-rates.ts;h=2e7920f4e2d0d8dc83ea1fdb3800a45c22d0cf17;hb=0c9a83546687d2ae80b3f5299a8ee59d741f894f;hp=e246b1313c85b039fb330719bf26cb62170f3fd7;hpb=b49f22d8f9a52ab75fd38db2d377249eb58fa678;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/video-rates.ts b/server/lib/activitypub/video-rates.ts
index e246b1313..2e7920f4e 100644
--- a/server/lib/activitypub/video-rates.ts
+++ b/server/lib/activitypub/video-rates.ts
@@ -1,61 +1,48 @@
 import { Transaction } from 'sequelize'
-import { sendLike, sendUndoDislike, sendUndoLike } from './send'
 import { VideoRateType } from '../../../shared/models/videos'
-import * as Bluebird from 'bluebird'
-import { getOrCreateActorAndServerAndModel } from './actor'
-import { AccountVideoRateModel } from '../../models/account/account-video-rate'
-import { logger } from '../../helpers/logger'
-import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants'
-import { doRequest } from '../../helpers/requests'
-import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
-import { getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from './url'
+import { MAccountActor, MActorUrl, MVideoAccountLight, MVideoFullLight, MVideoId } from '../../types/models'
+import { sendLike, sendUndoDislike, sendUndoLike } from './send'
 import { sendDislike } from './send/send-dislike'
-import { MAccountActor, MActorUrl, MVideo, MVideoAccountLight, MVideoId } from '../../types/models'
-
-async function createRates (ratesUrl: string[], video: MVideo, rate: VideoRateType) {
-  await Bluebird.map(ratesUrl, async rateUrl => {
-    try {
-      // Fetch url
-      const { body } = await doRequest<any>({
-        uri: rateUrl,
-        json: true,
-        activityPub: true
-      })
-      if (!body || !body.actor) throw new Error('Body or body actor is invalid')
+import { getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from './url'
+import { federateVideoIfNeeded } from './videos'
 
-      const actorUrl = getAPId(body.actor)
-      if (checkUrlsSameHost(actorUrl, rateUrl) !== true) {
-        throw new Error(`Rate url ${rateUrl} has not the same host than actor url ${actorUrl}`)
-      }
+async function sendVideoRateChange (
+  account: MAccountActor,
+  video: MVideoFullLight,
+  likes: number,
+  dislikes: number,
+  t: Transaction
+) {
+  if (video.isOwned()) return federateVideoIfNeeded(video, false, t)
 
-      if (checkUrlsSameHost(body.id, rateUrl) !== true) {
-        throw new Error(`Rate url ${rateUrl} host is different from the AP object id ${body.id}`)
-      }
+  return sendVideoRateChangeToOrigin(account, video, likes, dislikes, t)
+}
 
-      const actor = await getOrCreateActorAndServerAndModel(actorUrl)
+function getLocalRateUrl (rateType: VideoRateType, actor: MActorUrl, video: MVideoId) {
+  return rateType === 'like'
+    ? getVideoLikeActivityPubUrlByLocalActor(actor, video)
+    : getVideoDislikeActivityPubUrlByLocalActor(actor, video)
+}
 
-      const entry = {
-        videoId: video.id,
-        accountId: actor.Account.id,
-        type: rate,
-        url: body.id
-      }
+// ---------------------------------------------------------------------------
 
-      // Video "likes"/"dislikes" will be updated by the caller
-      await AccountVideoRateModel.upsert(entry)
-    } catch (err) {
-      logger.warn('Cannot add rate %s.', rateUrl, { err })
-    }
-  }, { concurrency: CRAWL_REQUEST_CONCURRENCY })
+export {
+  getLocalRateUrl,
+  sendVideoRateChange
 }
 
-async function sendVideoRateChange (
+// ---------------------------------------------------------------------------
+
+async function sendVideoRateChangeToOrigin (
   account: MAccountActor,
   video: MVideoAccountLight,
   likes: number,
   dislikes: number,
   t: Transaction
 ) {
+  // Local video, we don't need to send like
+  if (video.isOwned()) return
+
   const actor = account.Actor
 
   // Keep the order: first we undo and then we create
@@ -70,15 +57,3 @@ async function sendVideoRateChange (
   // Dislike
   if (dislikes > 0) await sendDislike(actor, video, t)
 }
-
-function getLocalRateUrl (rateType: VideoRateType, actor: MActorUrl, video: MVideoId) {
-  return rateType === 'like'
-    ? getVideoLikeActivityPubUrlByLocalActor(actor, video)
-    : getVideoDislikeActivityPubUrlByLocalActor(actor, video)
-}
-
-export {
-  getLocalRateUrl,
-  createRates,
-  sendVideoRateChange
-}