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

SearchService.tsの改行などの修正

Browse source
This commit is contained in:
mattyatea 2024-07-13 07:44:58 +09:00 • committed by 丈槍由紀
parent 12d2a9a5eb
commit 020f7cbde4
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/backend/src/core/SearchService.ts
View file

@ -8,6 +8,7 @@ import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
import { bindThis } from '@/decorators.js';
import { LoggerService } from '@/core/LoggerService.js';
import { MiNote } from '@/models/Note.js';
import { MiUser } from '@/models/_.js';
import type { NotesRepository } from '@/models/_.js';
@ -16,6 +17,7 @@ import { isUserRelated } from '@/misc/is-user-related.js';
import { CacheService } from '@/core/CacheService.js';
import { QueryService } from '@/core/QueryService.js';
import { IdService } from '@/core/IdService.js';
import type Logger from '@/logger.js';
import type { Index, MeiliSearch } from 'meilisearch';
import type { Client as ElasticSearch } from '@elastic/elasticsearch';
@ -67,6 +69,8 @@ export class SearchService {
private readonly meilisearchIndexScope: 'local' | 'global' | string[] = 'local';
private meilisearchNoteIndex: Index | null = null;
private elasticsearchNoteIndex: string | null = null;
private logger: Logger;
constructor(
@Inject(DI.config)
private config: Config,
@ -84,8 +88,13 @@ export class SearchService {
private queryService: QueryService,
private idService: IdService,
) {
this.logger = this.loggerService.getLogger('note:search');
if (meilisearch) {
this.meilisearchNoteIndex = meilisearch.index(`${this.config.meilisearch?.index}---notes`);
this.meilisearchNoteIndex = meilisearch.index(`${config.meilisearch!.index}---notes`);
if (config.meilisearch?.scope) {
this.meilisearchIndexScope = config.meilisearch.scope;
}
this.meilisearchNoteIndex.updateSettings({
searchableAttributes: [
'text',
@ -151,16 +160,13 @@ export class SearchService {
},
},
).catch((error) => {
console.error(error);
this.logger.error(error);
});
}
}).catch((error) => {
console.error(error);
this.logger.error('Error while checking if index exists', error);
});
}
if (config.meilisearch?.scope) {
this.meilisearchIndexScope = config.meilisearch.scope;
}
}
@bindThis