misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into configrobotstxt

Browse source
This commit is contained in:
Kinetix 2025-01-29 09:30:21 -08:00
commit bf1f263d72
4 changed files with 53 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -398,7 +398,7 @@ export class ApPersonService implements OnModuleInit {
alsoKnownAs: person.alsoKnownAs,
// We use "!== false" to handle incorrect types, missing / null values, and "default to true" logic.
hideOnlineStatus: person.hideOnlineStatus !== false,
isExplorable: person.discoverable,
isExplorable: person.discoverable !== false,
username: person.preferredUsername,
approved: true,
usernameLower: person.preferredUsername?.toLowerCase(),
@ -602,7 +602,7 @@ export class ApPersonService implements OnModuleInit {
alsoKnownAs: person.alsoKnownAs ?? null,
// We use "!== false" to handle incorrect types, missing / null values, and "default to true" logic.
hideOnlineStatus: person.hideOnlineStatus !== false,
isExplorable: person.discoverable,
isExplorable: person.discoverable !== false,
...(await this.resolveAvatarAndBanner(exist, person.icon, person.image, person.backgroundUrl).catch(() => ({}))),
} as Partial<MiRemoteUser> & Pick<MiRemoteUser, 'isBot' | 'isCat' | 'speakAsCat' | 'isLocked' | 'movedToUri' | 'alsoKnownAs' | 'isExplorable'>;

2
packages/backend/src/core/activitypub/type.ts
View file

@ -202,7 +202,7 @@ export interface IActor extends IObject {
manuallyApprovesFollowers?: boolean;
movedTo?: string;
alsoKnownAs?: string[];
discoverable?: boolean;
discoverable?: boolean | null;
inbox: string;
sharedInbox?: string; // 後方互換性のため
publicKey?: {