diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-03 18:10:56 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-03 18:10:56 +0200 |
commit | 868fce62f86812759ccedccf7634236ac3701d9a (patch) | |
tree | 79074e065d885bf8903920bf38af06cb209919b6 /server/lib/activitypub/actors | |
parent | 10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4 (diff) | |
download | PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.tar.gz PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.tar.zst PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.zip |
fetch -> load
avoid confusion with AP fetch functions
Diffstat (limited to 'server/lib/activitypub/actors')
-rw-r--r-- | server/lib/activitypub/actors/get.ts | 8 | ||||
-rw-r--r-- | server/lib/activitypub/actors/refresh.ts | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/server/lib/activitypub/actors/get.ts b/server/lib/activitypub/actors/get.ts index e7e87a967..c7b49d6e4 100644 --- a/server/lib/activitypub/actors/get.ts +++ b/server/lib/activitypub/actors/get.ts | |||
@@ -3,7 +3,7 @@ import { checkUrlsSameHost, getAPId } from '@server/helpers/activitypub' | |||
3 | import { retryTransactionWrapper } from '@server/helpers/database-utils' | 3 | import { retryTransactionWrapper } from '@server/helpers/database-utils' |
4 | import { logger } from '@server/helpers/logger' | 4 | import { logger } from '@server/helpers/logger' |
5 | import { JobQueue } from '@server/lib/job-queue' | 5 | import { JobQueue } from '@server/lib/job-queue' |
6 | import { ActorFetchByUrlType, fetchActorByUrl } from '@server/lib/model-loaders' | 6 | import { ActorLoadByUrlType, loadActorByUrl } from '@server/lib/model-loaders' |
7 | import { MActor, MActorAccountChannelId, MActorAccountChannelIdActor, MActorAccountId, MActorFullActor } from '@server/types/models' | 7 | import { MActor, MActorAccountChannelId, MActorAccountChannelIdActor, MActorAccountId, MActorFullActor } from '@server/types/models' |
8 | import { ActivityPubActor } from '@shared/models' | 8 | import { ActivityPubActor } from '@shared/models' |
9 | import { refreshActorIfNeeded } from './refresh' | 9 | import { refreshActorIfNeeded } from './refresh' |
@@ -25,7 +25,7 @@ function getOrCreateAPActor ( | |||
25 | 25 | ||
26 | async function getOrCreateAPActor ( | 26 | async function getOrCreateAPActor ( |
27 | activityActor: string | ActivityPubActor, | 27 | activityActor: string | ActivityPubActor, |
28 | fetchType: ActorFetchByUrlType = 'association-ids', | 28 | fetchType: ActorLoadByUrlType = 'association-ids', |
29 | recurseIfNeeded = true, | 29 | recurseIfNeeded = true, |
30 | updateCollections = false | 30 | updateCollections = false |
31 | ): Promise<MActorFullActor | MActorAccountChannelId> { | 31 | ): Promise<MActorFullActor | MActorAccountChannelId> { |
@@ -73,8 +73,8 @@ export { | |||
73 | 73 | ||
74 | // --------------------------------------------------------------------------- | 74 | // --------------------------------------------------------------------------- |
75 | 75 | ||
76 | async function loadActorFromDB (actorUrl: string, fetchType: ActorFetchByUrlType) { | 76 | async function loadActorFromDB (actorUrl: string, fetchType: ActorLoadByUrlType) { |
77 | let actor = await fetchActorByUrl(actorUrl, fetchType) | 77 | let actor = await loadActorByUrl(actorUrl, fetchType) |
78 | 78 | ||
79 | // Orphan actor (not associated to an account of channel) so recreate it | 79 | // Orphan actor (not associated to an account of channel) so recreate it |
80 | if (actor && (!actor.Account && !actor.VideoChannel)) { | 80 | if (actor && (!actor.Account && !actor.VideoChannel)) { |
diff --git a/server/lib/activitypub/actors/refresh.ts b/server/lib/activitypub/actors/refresh.ts index 9f2289bfa..9758649a5 100644 --- a/server/lib/activitypub/actors/refresh.ts +++ b/server/lib/activitypub/actors/refresh.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { logger } from '@server/helpers/logger' | 1 | import { logger } from '@server/helpers/logger' |
2 | import { PeerTubeRequestError } from '@server/helpers/requests' | 2 | import { PeerTubeRequestError } from '@server/helpers/requests' |
3 | import { ActorFetchByUrlType } from '@server/lib/model-loaders' | 3 | import { ActorLoadByUrlType } from '@server/lib/model-loaders' |
4 | import { ActorModel } from '@server/models/actor/actor' | 4 | import { ActorModel } from '@server/models/actor/actor' |
5 | import { MActorAccountChannelId, MActorFull } from '@server/types/models' | 5 | import { MActorAccountChannelId, MActorFull } from '@server/types/models' |
6 | import { HttpStatusCode } from '@shared/core-utils' | 6 | import { HttpStatusCode } from '@shared/core-utils' |
@@ -10,7 +10,7 @@ import { getUrlFromWebfinger } from './webfinger' | |||
10 | 10 | ||
11 | async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannelId> ( | 11 | async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannelId> ( |
12 | actorArg: T, | 12 | actorArg: T, |
13 | fetchedType: ActorFetchByUrlType | 13 | fetchedType: ActorLoadByUrlType |
14 | ): Promise<{ actor: T | MActorFull, refreshed: boolean }> { | 14 | ): Promise<{ actor: T | MActorFull, refreshed: boolean }> { |
15 | if (!actorArg.isOutdated()) return { actor: actorArg, refreshed: false } | 15 | if (!actorArg.isOutdated()) return { actor: actorArg, refreshed: false } |
16 | 16 | ||