Merge branch 'release/4.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / share.ts

diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts
index c22fa0893916625ba489d65c3388f38cb73f2d95..0fefcbbc560fdfafb0febaa0d611ae9365803bc8 100644 (file)
--- a/server/lib/activitypub/share.ts
+++ b/server/lib/activitypub/share.ts
@@ -1,15 +1,15 @@
-import * as Bluebird from 'bluebird'
+import { map } from 'bluebird'
 import { Transaction } from 'sequelize'
 import { getServerActor } from '@server/models/application/application'
-import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
 import { logger, loggerTagsFactory } from '../../helpers/logger'
 import { doJSONRequest } from '../../helpers/requests'
 import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants'
 import { VideoShareModel } from '../../models/video/video-share'
 import { MChannelActorLight, MVideo, MVideoAccountLight, MVideoId } from '../../types/models/video'
-import { getOrCreateActorAndServerAndModel } from './actor'
+import { getAPId } from './activity'
+import { getOrCreateAPActor } from './actors'
 import { sendUndoAnnounce, sendVideoAnnounce } from './send'
-import { getLocalVideoAnnounceActivityPubUrl } from './url'
+import { checkUrlsSameHost, getLocalVideoAnnounceActivityPubUrl } from './url'
 
 const lTags = loggerTagsFactory('share')
 
@@ -38,25 +38,9 @@ async function changeVideoChannelShare (
 }
 
 async function addVideoShares (shareUrls: string[], video: MVideoId) {
-  await Bluebird.map(shareUrls, async shareUrl => {
+  await map(shareUrls, async shareUrl => {
     try {
-      const { body } = await doJSONRequest<any>(shareUrl, { activityPub: true })
-      if (!body || !body.actor) throw new Error('Body or body actor is invalid')
-
-      const actorUrl = getAPId(body.actor)
-      if (checkUrlsSameHost(shareUrl, actorUrl) !== true) {
-        throw new Error(`Actor url ${actorUrl} has not the same host than the share url ${shareUrl}`)
-      }
-
-      const actor = await getOrCreateActorAndServerAndModel(actorUrl)
-
-      const entry = {
-        actorId: actor.id,
-        videoId: video.id,
-        url: shareUrl
-      }
-
-      await VideoShareModel.upsert(entry)
+      await addVideoShare(shareUrl, video)
     } catch (err) {
       logger.warn('Cannot add share %s.', shareUrl, { err })
     }
@@ -71,6 +55,26 @@ export {
 
 // ---------------------------------------------------------------------------
 
+async function addVideoShare (shareUrl: string, video: MVideoId) {
+  const { body } = await doJSONRequest<any>(shareUrl, { activityPub: true })
+  if (!body || !body.actor) throw new Error('Body or body actor is invalid')
+
+  const actorUrl = getAPId(body.actor)
+  if (checkUrlsSameHost(shareUrl, actorUrl) !== true) {
+    throw new Error(`Actor url ${actorUrl} has not the same host than the share url ${shareUrl}`)
+  }
+
+  const actor = await getOrCreateAPActor(actorUrl)
+
+  const entry = {
+    actorId: actor.id,
+    videoId: video.id,
+    url: shareUrl
+  }
+
+  await VideoShareModel.upsert(entry)
+}
+
 async function shareByServer (video: MVideo, t: Transaction) {
   const serverActor = await getServerActor()