X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-announce.ts;h=63082466e6e923a7eb779263b2852a2bc3ccde6d;hb=543442a3be9d7740749eb3918dc59f502ff042f9;hp=656db08a92185d5750488c709aa4d72ccbf0e2d7;hpb=54141398354e6e7b94aa3065a705a1251390111c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index 656db08a9..63082466e 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -1,46 +1,71 @@
-import { ActivityAnnounce } from '../../../../shared/models/activitypub/activity'
-import { getOrCreateAccount } from '../../../helpers/activitypub'
+import { ActivityAnnounce } from '../../../../shared/models/activitypub'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { sequelizeTypescript } from '../../../initializers/database'
+import { VideoShareModel } from '../../../models/video/video-share'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateVideoAndAccountAndChannel } from '../videos'
+import { Notifier } from '../../notifier'
 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 { processCreateActivity } from './process-create'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorSignature, MVideoAccountLightBlacklistAllFiles } from '../../../types/models'
 
-async function processAnnounceActivity (activity: ActivityAnnounce) {
-  const announcedActivity = activity.object
-  const accountAnnouncer = await getOrCreateAccount(activity.actor)
+async function processAnnounceActivity (options: APProcessorOptions<ActivityAnnounce>) {
+  const { activity, byActor: actorAnnouncer } = options
+  // Only notify if it is not from a fetcher job
+  const notify = options.fromFetch !== true
 
-  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 retryTransactionWrapper(processVideoShare, actorAnnouncer, activity, notify)
+}
 
-    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
+export {
+  processAnnounceActivity
+}
+
+// ---------------------------------------------------------------------------
+
+async function processVideoShare (actorAnnouncer: MActorSignature, activity: ActivityAnnounce, notify: boolean) {
+  const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
+
+  let video: MVideoAccountLightBlacklistAllFiles
+  let videoCreated: boolean
+
+  try {
+    const result = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
+    video = result.video
+    videoCreated = result.created
+  } catch (err) {
+    logger.debug('Cannot process share of %s. Maybe this is not a video object, so just skipping.', objectUri, { err })
+    return
   }
 
-  logger.warn(
-    'Unknown activity object type %s -> %s when announcing activity.', announcedActivity.type, announcedActivity.object.type,
-    { activity: activity.id }
-  )
+  await sequelizeTypescript.transaction(async t => {
+    // Add share entry
 
-  return undefined
-}
+    const share = {
+      actorId: actorAnnouncer.id,
+      videoId: video.id,
+      url: activity.id
+    }
 
-// ---------------------------------------------------------------------------
+    const [ , created ] = await VideoShareModel.findOrCreate({
+      where: {
+        url: activity.id
+      },
+      defaults: share,
+      transaction: t
+    })
 
-export {
-  processAnnounceActivity
+    if (video.isOwned() && created === true) {
+      // Don't resend the activity to the sender
+      const exceptions = [ actorAnnouncer ]
+
+      await forwardVideoRelatedActivity(activity, t, exceptions, video)
+    }
+
+    return undefined
+  })
+
+  if (videoCreated && notify) Notifier.Instance.notifyOnNewVideoIfNeeded(video)
 }