Send comment to followers and parents

[oweals/peertube.git] / server / lib / activitypub / videos.ts

diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index 14c07fec0e196d72381bda9747021d9c24c982f1..8bc928b935015cded14667fc998d4ef45e4e2e3d 100644 (file)
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -2,32 +2,28 @@ import { join } from 'path'
 import * as request from 'request'
 import { Transaction } from 'sequelize'
 import { ActivityIconObject } from '../../../shared/index'
-import { doRequest, doRequestAndSaveToFile } from '../../helpers'
+import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
 import { CONFIG, REMOTE_SCHEME, STATIC_PATHS } from '../../initializers'
 import { AccountModel } from '../../models/account/account'
 import { VideoModel } from '../../models/video/video'
 import {
-  sendCreateDislikeToOrigin,
-  sendCreateDislikeToVideoFollowers,
-  sendLikeToOrigin,
-  sendLikeToVideoFollowers,
-  sendUndoDislikeToOrigin,
-  sendUndoDislikeToVideoFollowers,
-  sendUndoLikeToOrigin,
-  sendUndoLikeToVideoFollowers
+  sendCreateDislikeToOrigin, sendCreateDislikeToVideoFollowers, sendLikeToOrigin, sendLikeToVideoFollowers, sendUndoDislikeToOrigin,
+  sendUndoDislikeToVideoFollowers, sendUndoLikeToOrigin, sendUndoLikeToVideoFollowers
 } from './send'
 
-function fetchRemoteVideoPreview (video: VideoModel) {
+function fetchRemoteVideoPreview (video: VideoModel, reject: Function) {
   // FIXME: use url
-  const host = video.VideoChannel.Account.Server.host
+  const host = video.VideoChannel.Account.Actor.Server.host
   const path = join(STATIC_PATHS.PREVIEWS, video.getPreviewName())
 
-  return request.get(REMOTE_SCHEME.HTTP + '://' + host + path)
+  return request.get(REMOTE_SCHEME.HTTP + '://' + host + path, err => {
+    if (err) reject(err)
+  })
 }
 
 async function fetchRemoteVideoDescription (video: VideoModel) {
   // FIXME: use url
-  const host = video.VideoChannel.Account.Server.host
+  const host = video.VideoChannel.Account.Actor.Server.host
   const path = video.getDescriptionPath()
   const options = {
     uri: REMOTE_SCHEME.HTTP + '://' + host + path,
@@ -50,43 +46,47 @@ function generateThumbnailFromUrl (video: VideoModel, icon: ActivityIconObject)
 }
 
 async function sendVideoRateChangeToFollowers (
-    account: AccountModel,
+  account: AccountModel,
   video: VideoModel,
   likes: number,
   dislikes: number,
   t: Transaction
 ) {
+  const actor = account.Actor
+
   // Keep the order: first we undo and then we create
 
   // Undo Like
-  if (likes < 0) await sendUndoLikeToVideoFollowers(account, video, t)
+  if (likes < 0) await sendUndoLikeToVideoFollowers(actor, video, t)
   // Undo Dislike
-  if (dislikes < 0) await sendUndoDislikeToVideoFollowers(account, video, t)
+  if (dislikes < 0) await sendUndoDislikeToVideoFollowers(actor, video, t)
 
   // Like
-  if (likes > 0) await sendLikeToVideoFollowers(account, video, t)
+  if (likes > 0) await sendLikeToVideoFollowers(actor, video, t)
   // Dislike
-  if (dislikes > 0) await sendCreateDislikeToVideoFollowers(account, video, t)
+  if (dislikes > 0) await sendCreateDislikeToVideoFollowers(actor, video, t)
 }
 
 async function sendVideoRateChangeToOrigin (
-    account: AccountModel,
+  account: AccountModel,
   video: VideoModel,
   likes: number,
   dislikes: number,
   t: Transaction
 ) {
+  const actor = account.Actor
+
   // Keep the order: first we undo and then we create
 
   // Undo Like
-  if (likes < 0) await sendUndoLikeToOrigin(account, video, t)
+  if (likes < 0) await sendUndoLikeToOrigin(actor, video, t)
   // Undo Dislike
-  if (dislikes < 0) await sendUndoDislikeToOrigin(account, video, t)
+  if (dislikes < 0) await sendUndoDislikeToOrigin(actor, video, t)
 
   // Like
-  if (likes > 0) await sendLikeToOrigin(account, video, t)
+  if (likes > 0) await sendLikeToOrigin(actor, video, t)
   // Dislike
-  if (dislikes > 0) await sendCreateDislikeToOrigin(account, video, t)
+  if (dislikes > 0) await sendCreateDislikeToOrigin(actor, video, t)
 }
 
 export {