aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/activitypub
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-11-16 10:05:12 +0100
committerChocobozzz <me@florianbigard.com>2021-11-16 10:28:31 +0100
commita2f99b54dfdfe489e14714681189cb13c89f60a3 (patch)
treec8c06b8ebd9bd35e709882cf7cf535b11e53d481 /server/lib/activitypub
parent11a554cfcf96dab55681001976a553ff8e3d9dcf (diff)
downloadPeerTube-a2f99b54dfdfe489e14714681189cb13c89f60a3.tar.gz
PeerTube-a2f99b54dfdfe489e14714681189cb13c89f60a3.tar.zst
PeerTube-a2f99b54dfdfe489e14714681189cb13c89f60a3.zip
Optimize AP fetch
Diffstat (limited to 'server/lib/activitypub')
-rw-r--r--server/lib/activitypub/process/process-announce.ts6
-rw-r--r--server/lib/activitypub/process/process-create.ts3
2 files changed, 8 insertions, 1 deletions
diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index ec23c705e..2619d9754 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -8,12 +8,16 @@ import { Notifier } from '../../notifier'
8import { logger } from '../../../helpers/logger' 8import { logger } from '../../../helpers/logger'
9import { APProcessorOptions } from '../../../types/activitypub-processor.model' 9import { APProcessorOptions } from '../../../types/activitypub-processor.model'
10import { MActorSignature, MVideoAccountLightBlacklistAllFiles } from '../../../types/models' 10import { MActorSignature, MVideoAccountLightBlacklistAllFiles } from '../../../types/models'
11import { getAPId } from '@server/helpers/activitypub'
11 12
12async function processAnnounceActivity (options: APProcessorOptions<ActivityAnnounce>) { 13async function processAnnounceActivity (options: APProcessorOptions<ActivityAnnounce>) {
13 const { activity, byActor: actorAnnouncer } = options 14 const { activity, byActor: actorAnnouncer } = options
14 // Only notify if it is not from a fetcher job 15 // Only notify if it is not from a fetcher job
15 const notify = options.fromFetch !== true 16 const notify = options.fromFetch !== true
16 17
18 // Announces on accounts are not supported
19 if (actorAnnouncer.type !== 'Application' && actorAnnouncer.type !== 'Group') return
20
17 return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity, notify) 21 return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity, notify)
18} 22}
19 23
@@ -26,7 +30,7 @@ export {
26// --------------------------------------------------------------------------- 30// ---------------------------------------------------------------------------
27 31
28async function processVideoShare (actorAnnouncer: MActorSignature, activity: ActivityAnnounce, notify: boolean) { 32async function processVideoShare (actorAnnouncer: MActorSignature, activity: ActivityAnnounce, notify: boolean) {
29 const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id 33 const objectUri = getAPId(activity.object)
30 34
31 let video: MVideoAccountLightBlacklistAllFiles 35 let video: MVideoAccountLightBlacklistAllFiles
32 let videoCreated: boolean 36 let videoCreated: boolean
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index 70e048d6e..93f1d1c59 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -28,6 +28,9 @@ async function processCreateActivity (options: APProcessorOptions<ActivityCreate
28 } 28 }
29 29
30 if (activityType === 'Note') { 30 if (activityType === 'Note') {
31 // Comments will be fetched from videos
32 if (options.fromFetch) return
33
31 return retryTransactionWrapper(processCreateVideoComment, activity, byActor, notify) 34 return retryTransactionWrapper(processCreateVideoComment, activity, byActor, notify)
32 } 35 }
33 36