diff options
| author | InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> | 2021-02-05 19:50:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-06 11:50:33 +0900 |
| commit | 885f8e18560ea7cc55970f552fae4ae6780213de (patch) | |
| tree | a7bdff8df153fa6a83d771e2257d4099c3f20761 /src/remote | |
| parent | s3ForcePathStyle (#7122) (diff) | |
| download | sharkey-885f8e18560ea7cc55970f552fae4ae6780213de.tar.gz sharkey-885f8e18560ea7cc55970f552fae4ae6780213de.tar.bz2 sharkey-885f8e18560ea7cc55970f552fae4ae6780213de.zip | |
Parse followers audience from followers URI (#7112)
* add followersUri
* add followersUri to audience parse
* fetch followersUri
* followersUri db migration
* update followersUri
* Rename 1611354329133-followersUri to 1611354329133-followersUri.ts
* typo
* Update person.ts
* create/update person consistency
* Update audience.ts
* missing paren
* tabs
* use strict equality
* Update audience.ts
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/audience.ts | 7 | ||||
| -rw-r--r-- | src/remote/activitypub/models/person.ts | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/remote/activitypub/audience.ts b/src/remote/activitypub/audience.ts index 7cff678ae3..85a70f8286 100644 --- a/src/remote/activitypub/audience.ts +++ b/src/remote/activitypub/audience.ts @@ -86,8 +86,7 @@ function isPublic(id: string) { } function isFollowers(id: string, actor: IRemoteUser) { - return [ - `${actor.uri}/followers`, - // actor.followerUri, // TODO - ].includes(id); + return ( + id === (actor.followersUri || `${actor.uri}/followers`) + ); } diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index f0a312b21a..8f1483ab43 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -159,6 +159,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us host, inbox: person.inbox, sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined), + followersUri: person.followers ? getApId(person.followers) : undefined, featured: person.featured ? getApId(person.featured) : undefined, uri: person.id, tags, @@ -330,6 +331,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint lastFetchedAt: new Date(), inbox: person.inbox, sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined), + followersUri: person.followers ? getApId(person.followers) : undefined, featured: person.featured, emojis: emojiNames, name: person.name, |