X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fshare.ts;h=f256f8d21fca772d4c04bfab439e07bfaacde459;hb=c73e83da283c6d4eb094e384d59c4f8eb221507d;hp=fb01368ec8c2351c1aced31632d08b556ff58b3a;hpb=a7d647c4403f8774106f485e8d9323158454e111;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts
index fb01368ec..f256f8d21 100644
--- a/server/lib/activitypub/share.ts
+++ b/server/lib/activitypub/share.ts
@@ -1,28 +1,54 @@
 import { Transaction } from 'sequelize'
-import { getServerActor } from '../../helpers'
+import { VideoPrivacy } from '../../../shared/models/videos'
+import { getServerActor } from '../../helpers/utils'
 import { VideoModel } from '../../models/video/video'
 import { VideoShareModel } from '../../models/video/video-share'
-import { sendVideoAnnounceToFollowers } from './send'
+import { sendVideoAnnounce } from './send'
+import { getAnnounceActivityPubUrl } from './url'
 
 async function shareVideoByServerAndChannel (video: VideoModel, t: Transaction) {
+  if (video.privacy === VideoPrivacy.PRIVATE) return undefined
+
   const serverActor = await getServerActor()
 
-  const serverShare = VideoShareModel.create({
-    actorId: serverActor.id,
-    videoId: video.id
-  }, { transaction: t })
+  const serverShareUrl = getAnnounceActivityPubUrl(video.url, serverActor)
+  const serverSharePromise = VideoShareModel.findOrCreate({
+    defaults: {
+      actorId: serverActor.id,
+      videoId: video.id,
+      url: serverShareUrl
+    },
+    where: {
+      url: serverShareUrl
+    },
+    transaction: t
+  }).then(([ serverShare, created ]) => {
+    if (created) return sendVideoAnnounce(serverActor, serverShare, video, t)
 
-  const videoChannelShare = VideoShareModel.create({
-    actorId: video.VideoChannel.actorId,
-    videoId: video.id
-  }, { transaction: t })
+    return undefined
+  })
 
-  await Promise.all([
-    serverShare,
-    videoChannelShare
-  ])
+  const videoChannelShareUrl = getAnnounceActivityPubUrl(video.url, video.VideoChannel.Actor)
+  const videoChannelSharePromise = VideoShareModel.findOrCreate({
+    defaults: {
+      actorId: video.VideoChannel.actorId,
+      videoId: video.id,
+      url: videoChannelShareUrl
+    },
+    where: {
+      url: videoChannelShareUrl
+    },
+    transaction: t
+  }).then(([ videoChannelShare, created ]) => {
+    if (created) return sendVideoAnnounce(serverActor, videoChannelShare, video, t)
 
-  return sendVideoAnnounceToFollowers(serverActor, video, t)
+    return undefined
+  })
+
+  return Promise.all([
+    serverSharePromise,
+    videoChannelSharePromise
+  ])
 }
 
 export {