X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fshare.ts;h=53ecd3dab7a857b40c95dd28c5b663b00fd1ac84;hb=e3a682a877a10833cb54ac3595e55110bda95647;hp=5bec61c051952520413a23be8d95b3e409aea7ab;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts
index 5bec61c05..53ecd3dab 100644
--- a/server/lib/activitypub/share.ts
+++ b/server/lib/activitypub/share.ts
@@ -1,34 +1,41 @@
 import { Transaction } from 'sequelize'
-import { getServerAccount } from '../../helpers'
+import { VideoPrivacy } from '../../../shared/models/videos'
+import { getServerActor } from '../../helpers/utils'
 import { VideoModel } from '../../models/video/video'
-import { VideoChannelModel } from '../../models/video/video-channel'
-import { VideoChannelShareModel } from '../../models/video/video-channel-share'
 import { VideoShareModel } from '../../models/video/video-share'
-import { sendVideoAnnounceToFollowers, sendVideoChannelAnnounceToFollowers } from './send'
+import { sendVideoAnnounceToFollowers } from './send'
+import { getAnnounceActivityPubUrl } from './url'
 
-async function shareVideoChannelByServer (videoChannel: VideoChannelModel, t: Transaction) {
-  const serverAccount = await getServerAccount()
+async function shareVideoByServerAndChannel (video: VideoModel, t: Transaction) {
+  if (video.privacy === VideoPrivacy.PRIVATE) return undefined
 
-  await VideoChannelShareModel.create({
-    accountId: serverAccount.id,
-    videoChannelId: videoChannel.id
-  }, { transaction: t })
-
-  return sendVideoChannelAnnounceToFollowers(serverAccount, videoChannel, t)
-}
+  const serverActor = await getServerActor()
 
-async function shareVideoByServer (video: VideoModel, t: Transaction) {
-  const serverAccount = await getServerAccount()
+  const serverShareUrl = getAnnounceActivityPubUrl(video.url, serverActor)
+  const serverSharePromise = VideoShareModel.create({
+    actorId: serverActor.id,
+    videoId: video.id,
+    url: serverShareUrl
+  }, { transaction: t })
 
-  await VideoShareModel.create({
-    accountId: serverAccount.id,
-    videoId: video.id
+  const videoChannelShareUrl = getAnnounceActivityPubUrl(video.url, video.VideoChannel.Actor)
+  const videoChannelSharePromise = VideoShareModel.create({
+    actorId: video.VideoChannel.actorId,
+    videoId: video.id,
+    url: videoChannelShareUrl
   }, { transaction: t })
 
-  return sendVideoAnnounceToFollowers(serverAccount, video, t)
+  const [ serverShare, videoChannelShare ] = await Promise.all([
+    serverSharePromise,
+    videoChannelSharePromise
+  ])
+
+  return Promise.all([
+    sendVideoAnnounceToFollowers(serverActor, videoChannelShare, video, t),
+    sendVideoAnnounceToFollowers(serverActor, serverShare, video, t)
+  ])
 }
 
 export {
-  shareVideoChannelByServer,
-  shareVideoByServer
+  shareVideoByServerAndChannel
 }