summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorCaipira <caipira@libnare.net>2023-07-08 21:31:38 +0900
committerGitHub <noreply@github.com>2023-07-08 21:31:38 +0900
commit60366a45585654115d5178486cc747cf0ee9450a (patch)
tree47cad89d513a3bae6459156125b1d6dd2a8c18eb /packages/backend/src
parentperf(backend): Reduce memory usage of MemoryKVCache (#11076) (diff)
downloadmisskey-60366a45585654115d5178486cc747cf0ee9450a.tar.gz
misskey-60366a45585654115d5178486cc747cf0ee9450a.tar.bz2
misskey-60366a45585654115d5178486cc747cf0ee9450a.zip
fix(backend): Remove Meilisearch index when notes are deleted (#10988)
* fix(backend): Include feature to delete Meilisearch index notes * Update variable name `cascadingNotesFilter` -> `federatedLocalCascadingNotes` * tweak --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/core/NoteDeleteService.ts14
-rw-r--r--packages/backend/src/core/SearchService.ts9
-rw-r--r--packages/backend/src/queue/processors/DeleteAccountProcessorService.ts6
3 files changed, 26 insertions, 3 deletions
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 10381c7e65..f77ea8aab4 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -17,6 +17,7 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { bindThis } from '@/decorators.js';
import { MetaService } from '@/core/MetaService.js';
+import { SearchService } from '@/core/SearchService.js';
@Injectable()
export class NoteDeleteService {
@@ -41,6 +42,7 @@ export class NoteDeleteService {
private apRendererService: ApRendererService,
private apDeliverManagerService: ApDeliverManagerService,
private metaService: MetaService,
+ private searchService: SearchService,
private notesChart: NotesChart,
private perUserNotesChart: PerUserNotesChart,
private instanceChart: InstanceChart,
@@ -53,6 +55,7 @@ export class NoteDeleteService {
*/
async delete(user: { id: User['id']; uri: User['uri']; host: User['host']; isBot: User['isBot']; }, note: Note, quiet = false) {
const deletedAt = new Date();
+ const cascadingNotes = await this.findCascadingNotes(note);
// この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
if (note.renoteId && (await this.noteEntityService.countSameRenotes(user.id, note.renoteId, note.id)) === 0) {
@@ -88,8 +91,8 @@ export class NoteDeleteService {
}
// also deliever delete activity to cascaded notes
- const cascadingNotes = (await this.findCascadingNotes(note)).filter(note => !note.localOnly); // filter out local-only notes
- for (const cascadingNote of cascadingNotes) {
+ const federatedLocalCascadingNotes = (cascadingNotes).filter(note => !note.localOnly && note.userHost == null); // filter out local-only notes
+ for (const cascadingNote of federatedLocalCascadingNotes) {
if (!cascadingNote.user) continue;
if (!this.userEntityService.isLocalUser(cascadingNote.user)) continue;
const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.apRendererService.renderTombstone(`${this.config.url}/notes/${cascadingNote.id}`), cascadingNote.user));
@@ -114,6 +117,11 @@ export class NoteDeleteService {
}
}
+ for (const cascadingNote of cascadingNotes) {
+ this.searchService.unindexNote(cascadingNote);
+ }
+ this.searchService.unindexNote(note);
+
await this.notesRepository.delete({
id: note.id,
userId: user.id,
@@ -140,7 +148,7 @@ export class NoteDeleteService {
const cascadingNotes: Note[] = await recursive(note.id);
- return cascadingNotes.filter(note => note.userHost === null); // filter out non-local users
+ return cascadingNotes;
}
@bindThis
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 956c4cc09c..28b8ee8073 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -116,6 +116,15 @@ export class SearchService {
}
@bindThis
+ public async unindexNote(note: Note): Promise<void> {
+ if (!['home', 'public'].includes(note.visibility)) return;
+
+ if (this.meilisearch) {
+ this.meilisearchNoteIndex!.deleteDocument(note.id);
+ }
+ }
+
+ @bindThis
public async searchNote(q: string, me: User | null, opts: {
userId?: Note['userId'] | null;
channelId?: Note['channelId'] | null;
diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
index 39dd801af0..65ded170b7 100644
--- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
@@ -12,6 +12,7 @@ import { bindThis } from '@/decorators.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq';
import type { DbUserDeleteJobData } from '../types.js';
+import { SearchService } from "@/core/SearchService.js";
@Injectable()
export class DeleteAccountProcessorService {
@@ -36,6 +37,7 @@ export class DeleteAccountProcessorService {
private driveService: DriveService,
private emailService: EmailService,
private queueLoggerService: QueueLoggerService,
+ private searchService: SearchService,
) {
this.logger = this.queueLoggerService.logger.createSubLogger('delete-account');
}
@@ -71,6 +73,10 @@ export class DeleteAccountProcessorService {
cursor = notes[notes.length - 1].id;
await this.notesRepository.delete(notes.map(note => note.id));
+
+ for (const note of notes) {
+ await this.searchService.unindexNote(note);
+ }
}
this.logger.succ('All of notes deleted');