chore: remove preserving remote note with RemoteNotesCleaning
This commit is contained in:
parent
e4da21684b
commit
a890ff675f
|
@ -5,11 +5,9 @@
|
||||||
|
|
||||||
import { setTimeout } from 'node:timers/promises';
|
import { setTimeout } from 'node:timers/promises';
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import { MiNote } from '@/models/Note.js';
|
import { MiNote } from '@/models/Note.js';
|
||||||
import { MiDeletedNote } from '@/models/DeletedNote.js';
|
import type { MiMeta, NotesRepository } from '@/models/_.js';
|
||||||
import type { MiMeta, NoteFavoritesRepository, NotesRepository, UserNotePiningsRepository } from '@/models/_.js';
|
|
||||||
import type Logger from '@/logger.js';
|
import type Logger from '@/logger.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
|
@ -24,18 +22,9 @@ export class CleanRemoteNotesProcessorService {
|
||||||
@Inject(DI.meta)
|
@Inject(DI.meta)
|
||||||
private meta: MiMeta,
|
private meta: MiMeta,
|
||||||
|
|
||||||
@Inject(DI.db)
|
|
||||||
private db: DataSource,
|
|
||||||
|
|
||||||
@Inject(DI.notesRepository)
|
@Inject(DI.notesRepository)
|
||||||
private notesRepository: NotesRepository,
|
private notesRepository: NotesRepository,
|
||||||
|
|
||||||
@Inject(DI.noteFavoritesRepository)
|
|
||||||
private noteFavoritesRepository: NoteFavoritesRepository,
|
|
||||||
|
|
||||||
@Inject(DI.userNotePiningsRepository)
|
|
||||||
private userNotePiningsRepository: UserNotePiningsRepository,
|
|
||||||
|
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
private queueLoggerService: QueueLoggerService,
|
private queueLoggerService: QueueLoggerService,
|
||||||
) {
|
) {
|
||||||
|
@ -146,21 +135,7 @@ export class CleanRemoteNotesProcessorService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (notes.length > 0) {
|
if (notes.length > 0) {
|
||||||
await this.db.transaction(async (transaction) => {
|
await this.notesRepository.delete(notes.map(note => note.id));
|
||||||
await transaction.save(MiDeletedNote, notes.filter(x => x.replyId != null || x.renoteId != null || noteIdsWithReplies.has(x.id) || noteIdsWithRenotes.has(x.id)).map(note => ({
|
|
||||||
id: note.id,
|
|
||||||
deletedAt: null, // This is existing note on the remote, so we set deletedAt to null.
|
|
||||||
replyId: note.replyId,
|
|
||||||
renoteId: note.renoteId,
|
|
||||||
userId: note.userId,
|
|
||||||
localOnly: note.localOnly,
|
|
||||||
uri: note.uri,
|
|
||||||
url: note.url,
|
|
||||||
replyUserId: note.replyUserId,
|
|
||||||
renoteUserId: note.renoteUserId,
|
|
||||||
})));
|
|
||||||
await transaction.delete(MiNote, notes.map(note => note.id));
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const note of notes) {
|
for (const note of notes) {
|
||||||
const t = this.idService.parse(note.id).date.getTime();
|
const t = this.idService.parse(note.id).date.getTime();
|
||||||
|
|
Loading…
Reference in New Issue