Bumped to version v1.0.0-beta.13

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / send / send-create.ts

diff --git a/server/lib/activitypub/send/send-create.ts b/server/lib/activitypub/send/send-create.ts
index 3ef4fcd3b1a02801793731ec9fa1f7c18fc78dbe..fc76cdd8abdb058feee52ded0841ea04deb81034 100644 (file)
--- a/server/lib/activitypub/send/send-create.ts
+++ b/server/lib/activitypub/send/send-create.ts
@@ -16,29 +16,38 @@ import {
   getVideoAudience,
   getVideoCommentAudience
 } from '../audience'
+import { logger } from '../../../helpers/logger'
 
 async function sendCreateVideo (video: VideoModel, t: Transaction) {
   if (video.privacy === VideoPrivacy.PRIVATE) return undefined
 
+  logger.info('Creating job to send video creation of %s.', video.url)
+
   const byActor = video.VideoChannel.Account.Actor
   const videoObject = video.toActivityPubObject()
 
-  const audience = await getAudience(byActor, t, video.privacy === VideoPrivacy.PUBLIC)
-  const data = await createActivityData(video.url, byActor, videoObject, t, audience)
+  const audience = getAudience(byActor, video.privacy === VideoPrivacy.PUBLIC)
+  const data = createActivityData(video.url, byActor, videoObject, audience)
 
   return broadcastToFollowers(data, byActor, [ byActor ], t)
 }
 
 async function sendVideoAbuse (byActor: ActorModel, videoAbuse: VideoAbuseModel, video: VideoModel, t: Transaction) {
+  if (!video.VideoChannel.Account.Actor.serverId) return // Local
+
   const url = getVideoAbuseActivityPubUrl(videoAbuse)
 
+  logger.info('Creating job to send video abuse %s.', url)
+
   const audience = { to: [ video.VideoChannel.Account.Actor.url ], cc: [] }
-  const data = await createActivityData(url, byActor, videoAbuse.toActivityPubObject(), t, audience)
+  const data = createActivityData(url, byActor, videoAbuse.toActivityPubObject(), audience)
 
   return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
 }
 
 async function sendCreateVideoComment (comment: VideoCommentModel, t: Transaction) {
+  logger.info('Creating job to send comment %s.', comment.url)
+
   const isOrigin = comment.Video.isOwned()
 
   const byActor = comment.Account.Actor
@@ -57,7 +66,7 @@ async function sendCreateVideoComment (comment: VideoCommentModel, t: Transactio
     audience = getObjectFollowersAudience(actorsInvolvedInComment.concat(parentsCommentActors))
   }
 
-  const data = await createActivityData(comment.url, byActor, commentObject, t, audience)
+  const data = createActivityData(comment.url, byActor, commentObject, audience)
 
   // This was a reply, send it to the parent actors
   const actorsException = [ byActor ]
@@ -74,6 +83,8 @@ async function sendCreateVideoComment (comment: VideoCommentModel, t: Transactio
 }
 
 async function sendCreateView (byActor: ActorModel, video: VideoModel, t: Transaction) {
+  logger.info('Creating job to send view of %s.', video.url)
+
   const url = getVideoViewActivityPubUrl(byActor, video)
   const viewActivityData = createViewActivityData(byActor, video)
 
@@ -82,14 +93,14 @@ async function sendCreateView (byActor: ActorModel, video: VideoModel, t: Transa
   // Send to origin
   if (video.isOwned() === false) {
     const audience = getVideoAudience(video, actorsInvolvedInVideo)
-    const data = await createActivityData(url, byActor, viewActivityData, t, audience)
+    const data = createActivityData(url, byActor, viewActivityData, audience)
 
     return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
   }
 
   // Send to followers
   const audience = getObjectFollowersAudience(actorsInvolvedInVideo)
-  const data = await createActivityData(url, byActor, viewActivityData, t, audience)
+  const data = createActivityData(url, byActor, viewActivityData, audience)
 
   // Use the server actor to send the view
   const serverActor = await getServerActor()
@@ -98,6 +109,8 @@ async function sendCreateView (byActor: ActorModel, video: VideoModel, t: Transa
 }
 
 async function sendCreateDislike (byActor: ActorModel, video: VideoModel, t: Transaction) {
+  logger.info('Creating job to dislike %s.', video.url)
+
   const url = getVideoDislikeActivityPubUrl(byActor, video)
   const dislikeActivityData = createDislikeActivityData(byActor, video)
 
@@ -106,34 +119,31 @@ async function sendCreateDislike (byActor: ActorModel, video: VideoModel, t: Tra
   // Send to origin
   if (video.isOwned() === false) {
     const audience = getVideoAudience(video, actorsInvolvedInVideo)
-    const data = await createActivityData(url, byActor, dislikeActivityData, t, audience)
+    const data = createActivityData(url, byActor, dislikeActivityData, audience)
 
     return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl)
   }
 
   // Send to followers
   const audience = getObjectFollowersAudience(actorsInvolvedInVideo)
-  const data = await createActivityData(url, byActor, dislikeActivityData, t, audience)
+  const data = createActivityData(url, byActor, dislikeActivityData, audience)
 
   const actorsException = [ byActor ]
   return broadcastToFollowers(data, byActor, actorsInvolvedInVideo, t, actorsException)
 }
 
-async function createActivityData (url: string,
-                                   byActor: ActorModel,
-                                   object: any,
-                                   t: Transaction,
-                                   audience?: ActivityAudience): Promise<ActivityCreate> {
-  if (!audience) {
-    audience = await getAudience(byActor, t)
-  }
-
-  return audiencify({
-    type: 'Create' as 'Create',
-    id: url + '/activity',
-    actor: byActor.url,
-    object: audiencify(object, audience)
-  }, audience)
+function createActivityData (url: string, byActor: ActorModel, object: any, audience?: ActivityAudience): ActivityCreate {
+  if (!audience) audience = getAudience(byActor)
+
+  return audiencify(
+    {
+      type: 'Create' as 'Create',
+      id: url + '/activity',
+      actor: byActor.url,
+      object: audiencify(object, audience)
+    },
+    audience
+  )
 }
 
 function createDislikeActivityData (byActor: ActorModel, video: VideoModel) {