usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2025-07-30 16:52:44 +09:00
parent a48429a274
commit 120d43a234
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/backend/src/models/Meta.ts
View File

@ -701,6 +701,16 @@ export class MiMeta {
default: true, default: true,
}) })
public allowExternalApRedirect: boolean; public allowExternalApRedirect: boolean;
@Column('boolean', {
default: true,
})
public enableRemoteNotesCleaning: boolean;
@Column('integer', {
default: 60, // minutes
})
public remoteNotesCleaningMaxDurationInMinutes: number;
} }
export type SoftwareSuspension = { export type SoftwareSuspension = {

25
packages/backend/src/queue/processors/CleanRemoteNotesProcessorService.ts
View File

@ -7,7 +7,7 @@ import { setTimeout } from 'node:timers/promises';
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import { And, In, IsNull, LessThan, MoreThan, Not } from 'typeorm'; import { And, In, IsNull, LessThan, MoreThan, Not } from 'typeorm';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { MiNote, NoteFavoritesRepository, NotesRepository } from '@/models/_.js'; import type { MiMeta, MiNote, NoteFavoritesRepository, NotesRepository } 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';
@ -19,6 +19,9 @@ export class CleanRemoteNotesProcessorService {
private logger: Logger; private logger: Logger;
constructor( constructor(
@Inject(DI.meta)
private meta: MiMeta,
@Inject(DI.notesRepository) @Inject(DI.notesRepository)
private notesRepository: NotesRepository, private notesRepository: NotesRepository,
@ -36,10 +39,21 @@ export class CleanRemoteNotesProcessorService {
deletedCount: number; deletedCount: number;
oldest: number | null; oldest: number | null;
newest: number | null; newest: number | null;
skipped?: boolean;
}> { }> {
this.logger.info('garbage collecting remote notes...'); if (!this.meta.enableRemoteNotesCleaning) {
this.logger.info('Remote notes cleaning is disabled, skipping...');
return {
deletedCount: 0,
oldest: null,
newest: null,
skipped: true,
};
}
const maxDuration = 1000 * 60 * 60; // 1 hour this.logger.info('cleaning remote notes...');
const maxDuration = this.meta.remoteNotesCleaningMaxDurationInMinutes * 60 * 1000; // Convert minutes to milliseconds
const startAt = Date.now(); const startAt = Date.now();
const maxId = this.idService.gen(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30 days ago const maxId = this.idService.gen(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30 days ago
@ -107,7 +121,7 @@ export class CleanRemoteNotesProcessorService {
if (elapsed >= maxDuration) { if (elapsed >= maxDuration) {
this.logger.info(`Reached maximum duration of ${maxDuration}ms, stopping...`); this.logger.info(`Reached maximum duration of ${maxDuration}ms, stopping...`);
job.log('Reached maximum duration, stopping garbage collection.'); job.log('Reached maximum duration, stopping cleaning.');
job.updateProgress(100); job.updateProgress(100);
break; break;
} }
@ -117,12 +131,13 @@ export class CleanRemoteNotesProcessorService {
await setTimeout(1000 * 5); // Wait a moment to avoid overwhelming the db await setTimeout(1000 * 5); // Wait a moment to avoid overwhelming the db
} }
this.logger.succ('garbage collection of remote notes completed.'); this.logger.succ('cleaning of remote notes completed.');
return { return {
deletedCount: stats.deletedCount, deletedCount: stats.deletedCount,
oldest: stats.oldest, oldest: stats.oldest,
newest: stats.newest, newest: stats.newest,
skipped: false,
}; };
} }
} }