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 acee4fe16e38fd1c0f236154b5529a47f42ca948..8bc928b935015cded14667fc998d4ef45e4e2e3d 100644 (file)
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -3,30 +3,27 @@ import * as request from 'request'
 import { Transaction } from 'sequelize'
 import { ActivityIconObject } from '../../../shared/index'
 import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
-import { CONFIG, REMOTE_SCHEME, STATIC_PATHS } from '../../initializers/constants'
-import { AccountInstance } from '../../models/account/account-interface'
-import { VideoInstance } from '../../models/video/video-interface'
-import { sendLikeToOrigin } from './index'
-import { sendCreateDislikeToOrigin, sendCreateDislikeToVideoFollowers } from './send/send-create'
-import { sendLikeToVideoFollowers } from './send/send-like'
+import { CONFIG, REMOTE_SCHEME, STATIC_PATHS } from '../../initializers'
+import { AccountModel } from '../../models/account/account'
+import { VideoModel } from '../../models/video/video'
 import {
-  sendUndoDislikeToOrigin,
-  sendUndoDislikeToVideoFollowers,
-  sendUndoLikeToOrigin,
-  sendUndoLikeToVideoFollowers
-} from './send/send-undo'
+  sendCreateDislikeToOrigin, sendCreateDislikeToVideoFollowers, sendLikeToOrigin, sendLikeToVideoFollowers, sendUndoDislikeToOrigin,
+  sendUndoDislikeToVideoFollowers, sendUndoLikeToOrigin, sendUndoLikeToVideoFollowers
+} from './send'
 
-function fetchRemoteVideoPreview (video: VideoInstance) {
+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: VideoInstance) {
+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,
@@ -37,7 +34,7 @@ async function fetchRemoteVideoDescription (video: VideoInstance) {
   return body.description ? body.description : ''
 }
 
-function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObject) {
+function generateThumbnailFromUrl (video: VideoModel, icon: ActivityIconObject) {
   const thumbnailName = video.getThumbnailName()
   const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
 
@@ -48,36 +45,48 @@ function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObjec
   return doRequestAndSaveToFile(options, thumbnailPath)
 }
 
-function sendVideoRateChangeToFollowers (account: AccountInstance, video: VideoInstance, likes: number, dislikes: number, t: Transaction) {
-  const tasks: Promise<any>[] = []
+async function sendVideoRateChangeToFollowers (
+  account: AccountModel,
+  video: VideoModel,
+  likes: number,
+  dislikes: number,
+  t: Transaction
+) {
+  const actor = account.Actor
 
-  // Undo Like
-  if (likes < 0) tasks.push(sendUndoLikeToVideoFollowers(account, video, t))
-  // Like
-  if (likes > 0) tasks.push(sendLikeToVideoFollowers(account, video, t))
+  // Keep the order: first we undo and then we create
 
+  // Undo Like
+  if (likes < 0) await sendUndoLikeToVideoFollowers(actor, video, t)
   // Undo Dislike
-  if (dislikes < 0) tasks.push(sendUndoDislikeToVideoFollowers(account, video, t))
-  // Dislike
-  if (dislikes > 0) tasks.push(sendCreateDislikeToVideoFollowers(account, video, t))
+  if (dislikes < 0) await sendUndoDislikeToVideoFollowers(actor, video, t)
 
-  return Promise.all(tasks)
+  // Like
+  if (likes > 0) await sendLikeToVideoFollowers(actor, video, t)
+  // Dislike
+  if (dislikes > 0) await sendCreateDislikeToVideoFollowers(actor, video, t)
 }
 
-function sendVideoRateChangeToOrigin (account: AccountInstance, video: VideoInstance, likes: number, dislikes: number, t: Transaction) {
-  const tasks: Promise<any>[] = []
+async function sendVideoRateChangeToOrigin (
+  account: AccountModel,
+  video: VideoModel,
+  likes: number,
+  dislikes: number,
+  t: Transaction
+) {
+  const actor = account.Actor
 
-  // Undo Like
-  if (likes < 0) tasks.push(sendUndoLikeToOrigin(account, video, t))
-  // Like
-  if (likes > 0) tasks.push(sendLikeToOrigin(account, video, t))
+  // Keep the order: first we undo and then we create
 
+  // Undo Like
+  if (likes < 0) await sendUndoLikeToOrigin(actor, video, t)
   // Undo Dislike
-  if (dislikes < 0) tasks.push(sendUndoDislikeToOrigin(account, video, t))
-  // Dislike
-  if (dislikes > 0) tasks.push(sendCreateDislikeToOrigin(account, video, t))
+  if (dislikes < 0) await sendUndoDislikeToOrigin(actor, video, t)
 
-  return Promise.all(tasks)
+  // Like
+  if (likes > 0) await sendLikeToOrigin(actor, video, t)
+  // Dislike
+  if (dislikes > 0) await sendCreateDislikeToOrigin(actor, video, t)
 }
 
 export {