1 files changed, 24 insertions, 55 deletions

diff --git a/server/lib/activitypub/video-rates.ts b/server/lib/activitypub/video-rates.ts
index 04aa5eae9..2e7920f4e 100644
--- a/server/lib/activitypub/video-rates.ts
+++ b/server/lib/activitypub/video-rates.ts
@@ -1,49 +1,21 @@
-import { map } from 'bluebird'
 import { Transaction } from 'sequelize'
-import { doJSONRequest } from '@server/helpers/requests'
 import { VideoRateType } from '../../../shared/models/videos'
-import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
-import { logger, loggerTagsFactory } from '../../helpers/logger'
-import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants'
-import { AccountVideoRateModel } from '../../models/account/account-video-rate'
-import { MAccountActor, MActorUrl, MVideo, MVideoAccountLight, MVideoId } from '../../types/models'
-import { getOrCreateAPActor } from './actors'
+import { MAccountActor, MActorUrl, MVideoAccountLight, MVideoFullLight, MVideoId } from '../../types/models'
 import { sendLike, sendUndoDislike, sendUndoLike } from './send'
 import { sendDislike } from './send/send-dislike'
 import { getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from './url'
-
-const lTags = loggerTagsFactory('ap', 'video-rate', 'create')
-
-async function createRates (ratesUrl: string[], video: MVideo, rate: VideoRateType) {
-  await map(ratesUrl, async rateUrl => {
-    try {
-      await createRate(rateUrl, video, rate)
-    } catch (err) {
-      logger.info('Cannot add rate %s.', rateUrl, { err, ...lTags(rateUrl, video.uuid, video.url) })
-    }
-  }, { concurrency: CRAWL_REQUEST_CONCURRENCY })
-}
+import { federateVideoIfNeeded } from './videos'
 
 async function sendVideoRateChange (
   account: MAccountActor,
-  video: MVideoAccountLight,
+  video: MVideoFullLight,
   likes: number,
   dislikes: number,
   t: Transaction
 ) {
-  const actor = account.Actor
+  if (video.isOwned()) return federateVideoIfNeeded(video, false, t)
 
-  // Keep the order: first we undo and then we create
-
-  // Undo Like
-  if (likes < 0) await sendUndoLike(actor, video, t)
-  // Undo Dislike
-  if (dislikes < 0) await sendUndoDislike(actor, video, t)
-
-  // Like
-  if (likes > 0) await sendLike(actor, video, t)
-  // Dislike
-  if (dislikes > 0) await sendDislike(actor, video, t)
+  return sendVideoRateChangeToOrigin(account, video, likes, dislikes, t)
 }
 
 function getLocalRateUrl (rateType: VideoRateType, actor: MActorUrl, video: MVideoId) {
@@ -56,35 +28,32 @@ function getLocalRateUrl (rateType: VideoRateType, actor: MActorUrl, video: MVid
 
 export {
   getLocalRateUrl,
-  createRates,
   sendVideoRateChange
 }
 
 // ---------------------------------------------------------------------------
 
-async function createRate (rateUrl: string, video: MVideo, rate: VideoRateType) {
-  // Fetch url
-  const { body } = await doJSONRequest<any>(rateUrl, { activityPub: true })
-  if (!body || !body.actor) throw new Error('Body or body actor is invalid')
-
-  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 sendVideoRateChangeToOrigin (
+  account: MAccountActor,
+  video: MVideoAccountLight,
+  likes: number,
+  dislikes: number,
+  t: Transaction
+) {
+  // Local video, we don't need to send like
+  if (video.isOwned()) return
 
-  if (checkUrlsSameHost(body.id, rateUrl) !== true) {
-    throw new Error(`Rate url ${rateUrl} host is different from the AP object id ${body.id}`)
-  }
+  const actor = account.Actor
 
-  const actor = await getOrCreateAPActor(actorUrl)
+  // Keep the order: first we undo and then we create
 
-  const entry = {
-    videoId: video.id,
-    accountId: actor.Account.id,
-    type: rate,
-    url: body.id
-  }
+  // Undo Like
+  if (likes < 0) await sendUndoLike(actor, video, t)
+  // Undo Dislike
+  if (dislikes < 0) await sendUndoDislike(actor, video, t)
 
-  // Video "likes"/"dislikes" will be updated by the caller
-  await AccountVideoRateModel.upsert(entry)
+  // Like
+  if (likes > 0) await sendLike(actor, video, t)
+  // Dislike
+  if (dislikes > 0) await sendDislike(actor, video, t)
 }