X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-announce.ts;h=bf7d7879db440b91556b01a164e495785dd32b9e;hb=d6e99e5322209a692cc3d870ddb5dcedbda69f2a;hp=40712ef031c35a7ed5f5a9e928e0b4fc029dd639;hpb=892211e8493b1f992fce7616cb1e48b7ff87a1dc;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index 40712ef03..bf7d7879d 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -1,34 +1,23 @@
-import { ActivityAnnounce } from '../../../../shared/models/activitypub/activity'
+import { ActivityAnnounce } from '../../../../shared/models/activitypub'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { logger } from '../../../helpers/logger'
-import { database as db } from '../../../initializers/index'
-import { VideoInstance } from '../../../models/index'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
-import { processAddActivity } from './process-add'
+import { sequelizeTypescript } from '../../../initializers'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { VideoModel } from '../../../models/video/video'
+import { VideoShareModel } from '../../../models/video/video-share'
+import { getOrCreateActorAndServerAndModel } from '../actor'
+import { forwardActivity } from '../send/misc'
+import { getOrCreateAccountAndVideoAndChannel } from '../videos'
 import { processCreateActivity } from './process-create'
-import { getOrCreateAccount } from '../account'
 
 async function processAnnounceActivity (activity: ActivityAnnounce) {
   const announcedActivity = activity.object
-  const accountAnnouncer = await getOrCreateAccount(activity.actor)
+  const actorAnnouncer = await getOrCreateActorAndServerAndModel(activity.actor)
 
-  if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'VideoChannel') {
-    // Add share entry
-    const videoChannel: VideoChannelInstance = await processCreateActivity(announcedActivity)
-    await db.VideoChannelShare.create({
-      accountId: accountAnnouncer.id,
-      videoChannelId: videoChannel.id
-    })
-
-    return undefined
-  } else if (announcedActivity.type === 'Add' && announcedActivity.object.type === 'Video') {
-    // Add share entry
-    const video: VideoInstance = await processAddActivity(announcedActivity)
-    await db.VideoShare.create({
-      accountId: accountAnnouncer.id,
-      videoId: video.id
-    })
-
-    return undefined
+  if (typeof announcedActivity === 'string') {
+    return processVideoShare(actorAnnouncer, activity)
+  } else if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'Video') {
+    return processVideoShare(actorAnnouncer, activity)
   }
 
   logger.warn(
@@ -44,3 +33,49 @@ async function processAnnounceActivity (activity: ActivityAnnounce) {
 export {
   processAnnounceActivity
 }
+
+// ---------------------------------------------------------------------------
+
+function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
+  const options = {
+    arguments: [ actorAnnouncer, activity ],
+    errorMessage: 'Cannot share the video activity with many retries.'
+  }
+
+  return retryTransactionWrapper(shareVideo, options)
+}
+
+async function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
+  const announced = activity.object
+  let video: VideoModel
+
+  if (typeof announced === 'string') {
+    const res = await getOrCreateAccountAndVideoAndChannel(announced)
+    video = res.video
+  } else {
+    video = await processCreateActivity(announced)
+  }
+
+  return sequelizeTypescript.transaction(async t => {
+    // Add share entry
+
+    const share = {
+      actorId: actorAnnouncer.id,
+      videoId: video.id
+    }
+
+    const [ , created ] = await VideoShareModel.findOrCreate({
+      where: share,
+      defaults: share,
+      transaction: t
+    })
+
+    if (video.isOwned() && created === true) {
+      // Don't resend the activity to the sender
+      const exceptions = [ actorAnnouncer ]
+      await forwardActivity(activity, t, exceptions)
+    }
+
+    return undefined
+  })
+}