Remove unused actor uuid field

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / process / process-announce.ts

diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index 656db08a92185d5750488c709aa4d72ccbf0e2d7..23310b41e8de4b4923d1a0d0b282ad4b86e1541b 100644 (file)
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -1,46 +1,56 @@
-import { ActivityAnnounce } from '../../../../shared/models/activitypub/activity'
-import { getOrCreateAccount } from '../../../helpers/activitypub'
-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'
-
-async function processAnnounceActivity (activity: ActivityAnnounce) {
-  const announcedActivity = activity.object
-  const accountAnnouncer = await getOrCreateAccount(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
-    })
+import { ActivityAnnounce } from '../../../../shared/models/activitypub'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { sequelizeTypescript } from '../../../initializers'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { VideoShareModel } from '../../../models/video/video-share'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateVideoAndAccountAndChannel } from '../videos'
+import { VideoPrivacy } from '../../../../shared/models/videos'
+import { Notifier } from '../../notifier'
+
+async function processAnnounceActivity (activity: ActivityAnnounce, actorAnnouncer: ActorModel) {
+  return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity)
+}
 
-    return undefined
-  } else if (announcedActivity.type === 'Add' && announcedActivity.object.type === 'Video') {
+// ---------------------------------------------------------------------------
+
+export {
+  processAnnounceActivity
+}
+
+// ---------------------------------------------------------------------------
+
+async function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
+  const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
+
+  const { video, created: videoCreated } = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
+
+  await sequelizeTypescript.transaction(async t => {
     // Add share entry
-    const video: VideoInstance = await processAddActivity(announcedActivity)
-    await db.VideoShare.create({
-      accountId: accountAnnouncer.id,
-      videoId: video.id
+
+    const share = {
+      actorId: actorAnnouncer.id,
+      videoId: video.id,
+      url: activity.id
+    }
+
+    const [ , created ] = await VideoShareModel.findOrCreate({
+      where: {
+        url: activity.id
+      },
+      defaults: share,
+      transaction: t
     })
 
-    return undefined
-  }
+    if (video.isOwned() && created === true) {
+      // Don't resend the activity to the sender
+      const exceptions = [ actorAnnouncer ]
 
-  logger.warn(
-    'Unknown activity object type %s -> %s when announcing activity.', announcedActivity.type, announcedActivity.object.type,
-    { activity: activity.id }
-  )
+      await forwardVideoRelatedActivity(activity, t, exceptions, video)
+    }
 
-  return undefined
-}
-
-// ---------------------------------------------------------------------------
+    return undefined
+  })
 
-export {
-  processAnnounceActivity
+  if (videoCreated) Notifier.Instance.notifyOnNewVideo(video)
 }