oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Pull Requests Packages Releases 2 Activity

Merge upstream

Browse Source
This commit is contained in:
オスカー、 2024-08-27 22:05:10 +09:00
commit a8828c6485
Signed by: SWREI
GPG Key ID: 139D6573F92DA9F7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend/src/core/SearchService.ts
View File

@ -174,6 +174,7 @@ export class SearchService {
if (note.text == null && note.cw == null) return;
// if (!['home', 'public'].includes(note.visibility)) return;
const createdAt = this.idService.parse(note.id).date;
if (this.meilisearch) {
switch (this.meilisearchIndexScope) {
case 'global':
@ -192,7 +193,7 @@ export class SearchService {
await this.meilisearchNoteIndex?.addDocuments([{
id: note.id,
createdAt: this.idService.parse(note.id).date.getTime(),
createdAt: createdAt.getTime(),
userId: note.userId,
userHost: note.userHost,
channelId: note.channelId,
@ -204,7 +205,7 @@ export class SearchService {
});
} else if (this.elasticsearch) {
const body = {
createdAt: this.idService.parse(note.id).date.getTime(),
createdAt: createdAt.getTime(),
userId: note.userId,
userHost: note.userHost,
channelId: note.channelId,
@ -213,11 +214,11 @@ export class SearchService {
tags: note.tags,
};
await this.elasticsearch.index({
index: this.elasticsearchNoteIndex + `-${new Date().toISOString().slice(0, 7).replace(/-/g, '')}` as string,
index: `${this.elasticsearchNoteIndex}-${createdAt.toISOString().slice(0, 7).replace(/-/g, '')}`,
id: note.id,
body: body,
}).catch((error: any) => {
console.error(error);
this.logger.error(error);
});
}
}
@ -228,6 +229,13 @@ export class SearchService {
if (this.meilisearch) {
this.meilisearchNoteIndex?.deleteDocument(note.id);
} else if (this.elasticsearch) {
await this.elasticsearch.delete({
index: `${this.elasticsearchNoteIndex}-${this.idService.parse(note.id).date.toISOString().slice(0, 7).replace(/-/g, '')}`,
id: note.id,
}).catch((error) => {
this.logger.error(error);
});
}
}