diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-03 16:02:29 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-03 16:40:32 +0200 |
commit | 136d7efde798d3dc0ec0dd18aac674365f7d162e (patch) | |
tree | 3a0e2a7a5d04dedf0d8ffda99c2787cecb838891 /server/lib/job-queue/handlers/activitypub-follow.ts | |
parent | 49af5ac8c2653cb0ef23479c9d3256c5b724d49d (diff) | |
download | PeerTube-136d7efde798d3dc0ec0dd18aac674365f7d162e.tar.gz PeerTube-136d7efde798d3dc0ec0dd18aac674365f7d162e.tar.zst PeerTube-136d7efde798d3dc0ec0dd18aac674365f7d162e.zip |
Refactor AP actors
Diffstat (limited to 'server/lib/job-queue/handlers/activitypub-follow.ts')
-rw-r--r-- | server/lib/job-queue/handlers/activitypub-follow.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts index ec8df8969..76b6fcaae 100644 --- a/server/lib/job-queue/handlers/activitypub-follow.ts +++ b/server/lib/job-queue/handlers/activitypub-follow.ts | |||
@@ -10,7 +10,7 @@ import { sequelizeTypescript } from '../../../initializers/database' | |||
10 | import { ActorModel } from '../../../models/actor/actor' | 10 | import { ActorModel } from '../../../models/actor/actor' |
11 | import { ActorFollowModel } from '../../../models/actor/actor-follow' | 11 | import { ActorFollowModel } from '../../../models/actor/actor-follow' |
12 | import { MActor, MActorFollowActors, MActorFull } from '../../../types/models' | 12 | import { MActor, MActorFollowActors, MActorFull } from '../../../types/models' |
13 | import { getOrCreateActorAndServerAndModel } from '../../activitypub/actor' | 13 | import { getOrCreateAPActor } from '../../activitypub/actors' |
14 | import { sendFollow } from '../../activitypub/send' | 14 | import { sendFollow } from '../../activitypub/send' |
15 | import { Notifier } from '../../notifier' | 15 | import { Notifier } from '../../notifier' |
16 | 16 | ||
@@ -26,7 +26,7 @@ async function processActivityPubFollow (job: Bull.Job) { | |||
26 | } else { | 26 | } else { |
27 | const sanitizedHost = sanitizeHost(host, REMOTE_SCHEME.HTTP) | 27 | const sanitizedHost = sanitizeHost(host, REMOTE_SCHEME.HTTP) |
28 | const actorUrl = await loadActorUrlOrGetFromWebfinger(payload.name + '@' + sanitizedHost) | 28 | const actorUrl = await loadActorUrlOrGetFromWebfinger(payload.name + '@' + sanitizedHost) |
29 | targetActor = await getOrCreateActorAndServerAndModel(actorUrl, 'all') | 29 | targetActor = await getOrCreateAPActor(actorUrl, 'all') |
30 | } | 30 | } |
31 | 31 | ||
32 | if (payload.assertIsChannel && !targetActor.VideoChannel) { | 32 | if (payload.assertIsChannel && !targetActor.VideoChannel) { |