oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

chore: bump version

Browse source 
fix: queue problem
This commit is contained in:
아르페 2024-02-16 14:54:48 +09:00 • committed by 무라쿠모
parent c28afda4bf
commit de6db7aefc
No known key found for this signature in database
GPG key ID: 139D6573F92DA9F7
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packages/backend/src/queue/processors/AutoNoteRemovalProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { And, In, MoreThan, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { MiUserNotePining, NotesRepository, UserNotePiningsRepository, UsersRepository } from '@/models/_.js';
import type { AutoRemovalConditionRepository, MiUserNotePining, NotesRepository, UserNotePiningsRepository, UsersRepository } from '@/models/_.js';
import type Logger from '@/logger.js';
import type { MiNote } from '@/models/Note.js';
import { bindThis } from '@/decorators.js';
@ -21,9 +21,16 @@ export class AutoNoteRemovalProcessorService {
constructor(
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
@Inject(DI.userNotePiningsRepository)
private userNotePiningsRepository: UserNotePiningsRepository,
@Inject(DI.autoRemovalConditionRepository)
private autoRemovalConditionRepository: AutoRemovalConditionRepository,
private idService: IdService,
private noteDeleteService: NoteDeleteService,
private queueLoggerService: QueueLoggerService,
@ -43,9 +50,7 @@ export class AutoNoteRemovalProcessorService {
const now = Date.now();
for (const user of users) {
if (user.autoRemovalCondition === null) {
continue;
}
const autoRemovalCondition = await this.autoRemovalConditionRepository.findOneByOrFail({ id: user.autoRemovalConditionId });
const pinings: MiUserNotePining[] = await this.userNotePiningsRepository.findBy({ userId: user.id });
const piningNoteIds: string[] = pinings.map(pining => pining.noteId); // pining.note always undefined (bug?)
@ -54,16 +59,16 @@ export class AutoNoteRemovalProcessorService {
visibility: Not(In(['public', 'home', 'followers'])),
});
const specifiedNoteIds: string[] = specifiedNotes.map(note => note.id);
const deleteAfter: number = user.autoRemovalCondition.deleteAfter * 86400000;
const deleteAfter: number = autoRemovalCondition.deleteAfter * 86400000;
// Delete notes
let cursor: MiNote['id'] | null = null;
let condition: string[] = [];
if (user.autoRemovalCondition.noSpecifiedNotes === true) {
if (autoRemovalCondition.noSpecifiedNotes === true) {
condition = [...condition, ...specifiedNoteIds];
}
if (user.autoRemovalCondition.noPiningNotes === true) {
if (autoRemovalCondition.noPiningNotes === true) {
condition = [...condition, ...piningNoteIds];
}