Fix lint

[oweals/peertube.git] / server / lib / activitypub / share.ts

diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts
index 5bec61c051952520413a23be8d95b3e409aea7ab..fd374d03d178a3e1e33c6cc8aaecc6edeac7177f 100644 (file)
--- a/server/lib/activitypub/share.ts
+++ b/server/lib/activitypub/share.ts
@@ -1,34 +1,33 @@
 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'
 
-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 serverShare = VideoShareModel.create({
+    actorId: serverActor.id,
+    videoId: video.id
+  }, { transaction: t })
 
-  await VideoShareModel.create({
-    accountId: serverAccount.id,
+  const videoChannelShare = VideoShareModel.create({
+    actorId: video.VideoChannel.actorId,
     videoId: video.id
   }, { transaction: t })
 
-  return sendVideoAnnounceToFollowers(serverAccount, video, t)
+  await Promise.all([
+    serverShare,
+    videoChannelShare
+  ])
+
+  return sendVideoAnnounceToFollowers(serverActor, video, t)
 }
 
 export {
-  shareVideoChannelByServer,
-  shareVideoByServer
+  shareVideoByServerAndChannel
 }