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

diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index 7dfee2f60..bf7d7879d 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -1,18 +1,22 @@
 import { ActivityAnnounce } from '../../../../shared/models/activitypub'
-import { logger, retryTransactionWrapper } from '../../../helpers'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger } from '../../../helpers/logger'
 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'
 
 async function processAnnounceActivity (activity: ActivityAnnounce) {
   const announcedActivity = activity.object
   const actorAnnouncer = await getOrCreateActorAndServerAndModel(activity.actor)
 
-  if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'Video') {
+  if (typeof announcedActivity === 'string') {
+    return processVideoShare(actorAnnouncer, activity)
+  } else if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'Video') {
     return processVideoShare(actorAnnouncer, activity)
   }
 
@@ -35,18 +39,25 @@ export {
 function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
   const options = {
     arguments: [ actorAnnouncer, activity ],
-    errorMessage: 'Cannot share the video with many retries.'
+    errorMessage: 'Cannot share the video activity with many retries.'
   }
 
   return retryTransactionWrapper(shareVideo, options)
 }
 
-function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
-  const announcedActivity = activity.object
+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 video: VideoModel = await processCreateActivity(announcedActivity)
 
     const share = {
       actorId: actorAnnouncer.id,