Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upd: completely change handling of indexable

Browse source
This commit is contained in:
Mar0xy 2023-11-17 15:05:58 +01:00
parent 902e5a81f9
commit 55ef4c4d93
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
12 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/core/NoteCreateService.ts
View file

@ -223,7 +223,7 @@ export class NoteCreateService implements OnApplicationShutdown {
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
isIndexable: MiUser['isIndexable'];
noindex: MiUser['noindex'];
}, data: Option, silent = false): Promise<MiNote> {
// チャンネル外にリプライしたら対象のスコープに合わせる
// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
@ -384,7 +384,7 @@ export class NoteCreateService implements OnApplicationShutdown {
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
isIndexable: MiUser['isIndexable'];
noindex: MiUser['noindex'];
}, data: Option, silent = false): Promise<MiNote> {
// チャンネル外にリプライしたら対象のスコープに合わせる
// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
@ -642,7 +642,7 @@ export class NoteCreateService implements OnApplicationShutdown {
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
isIndexable: MiUser['isIndexable'];
noindex: MiUser['noindex'];
}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
const meta = await this.metaService.fetch();
@ -873,7 +873,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
// Register to search database
if (user.isIndexable) this.index(note);
if (!user.noindex) this.index(note);
}
@bindThis
@ -882,7 +882,7 @@ export class NoteCreateService implements OnApplicationShutdown {
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
isIndexable: MiUser['isIndexable'];
noindex: MiUser['noindex'];
}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
const meta = await this.metaService.fetch();
@ -972,7 +972,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
// Register to search database
if (user.isIndexable) this.index(note);
if (!user.noindex) this.index(note);
}
@bindThis

6
packages/backend/src/core/NoteEditService.ts
View file

@ -224,7 +224,7 @@ export class NoteEditService implements OnApplicationShutdown {
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
isIndexable: MiUser['isIndexable'];
noindex: MiUser['noindex'];
}, editid: MiNote['id'], data: Option, silent = false): Promise<MiNote> {
if (!editid) {
throw new Error('fail');
@ -499,7 +499,7 @@ export class NoteEditService implements OnApplicationShutdown {
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
isIndexable: MiUser['isIndexable'];
noindex: MiUser['noindex'];
}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
// Register host
if (this.userEntityService.isRemoteUser(user)) {
@ -688,7 +688,7 @@ export class NoteEditService implements OnApplicationShutdown {
}
// Register to search database
if (user.isIndexable) this.index(note);
if (!user.noindex) this.index(note);
}
@bindThis

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

@ -525,7 +525,7 @@ export class ApRendererService {
discoverable: user.isExplorable,
publicKey: this.renderKey(user, keypair, '#main-key'),
isCat: user.isCat,
noindex: user.isIndexable,
noindex: user.noindex,
speakAsCat: user.speakAsCat,
attachment: attachment.length ? attachment : undefined,
};

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

@ -310,7 +310,7 @@ export class ApPersonService implements OnModuleInit {
backgroundId: null,
lastFetchedAt: new Date(),
name: truncate(person.name, nameLength),
isIndexable: (person as any).noindex ?? true,
noindex: (person as any).noindex ?? false,
isLocked: person.manuallyApprovesFollowers,
movedToUri: person.movedTo,
movedAt: person.movedTo ? new Date() : null,
@ -477,7 +477,7 @@ export class ApPersonService implements OnModuleInit {
isBot: getApType(object) === 'Service' || getApType(object) === 'Application',
isCat: (person as any).isCat === true,
speakAsCat: (person as any).speakAsCat != null ? (person as any).speakAsCat === true : (person as any).isCat === true,
isIndexable: (person as any).noindex ?? true,
noindex: (person as any).noindex ?? false,
isLocked: person.manuallyApprovesFollowers,
movedToUri: person.movedTo ?? null,
alsoKnownAs: person.alsoKnownAs ?? null,

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

@ -184,7 +184,7 @@ export interface IActor extends IObject {
};
'vcard:bday'?: string;
'vcard:Address'?: string;
isIndexable?: boolean;
noindex?: boolean;
listenbrainz?: string;
backgroundUrl?: string;
}

2
packages/backend/src/core/entities/UserEntityService.ts
View file

@ -399,7 +399,7 @@ export class UserEntityService implements OnModuleInit {
}))) : [],
isBot: user.isBot,
isCat: user.isCat,
isIndexable: user.isIndexable,
noindex: user.noindex,
isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
speakAsCat: user.speakAsCat ?? false,
approved: user.approved,