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

diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts
index e14b0f50c..f256f8d21 100644
--- a/server/lib/activitypub/share.ts
+++ b/server/lib/activitypub/share.ts
@@ -1,33 +1,56 @@
 import { Transaction } from 'sequelize'
-import { getServerAccount } from '../../helpers/utils'
-import { database as db } from '../../initializers'
-import { VideoChannelInstance } from '../../models/index'
-import { VideoInstance } from '../../models/video/video-interface'
-import { sendVideoAnnounceToFollowers, sendVideoChannelAnnounceToFollowers } from './send/send-announce'
+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 { sendVideoAnnounce } from './send'
+import { getAnnounceActivityPubUrl } from './url'
 
-async function shareVideoChannelByServer (videoChannel: VideoChannelInstance, t: Transaction) {
-  const serverAccount = await getServerAccount()
+async function shareVideoByServerAndChannel (video: VideoModel, t: Transaction) {
+  if (video.privacy === VideoPrivacy.PRIVATE) return undefined
 
-  await db.VideoChannelShare.create({
-    accountId: serverAccount.id,
-    videoChannelId: videoChannel.id
-  }, { transaction: t })
+  const serverActor = await getServerActor()
 
-  return sendVideoChannelAnnounceToFollowers(serverAccount, videoChannel, 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)
+
+    return undefined
+  })
 
-async function shareVideoByServer (video: VideoInstance, t: Transaction) {
-  const serverAccount = await getServerAccount()
+  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)
 
-  await db.VideoShare.create({
-    accountId: serverAccount.id,
-    videoId: video.id
-  }, { transaction: t })
+    return undefined
+  })
 
-  return sendVideoAnnounceToFollowers(serverAccount, video, t)
+  return Promise.all([
+    serverSharePromise,
+    videoChannelSharePromise
+  ])
 }
 
 export {
-  shareVideoChannelByServer,
-  shareVideoByServer
+  shareVideoByServerAndChannel
 }