Merge pull request #22 from 1673beta/fix-scheduled-note-delete

delete scheduled note delete
1673beta · Mar 14, 2024 · e1d97b8 · e1d97b8
2 parents 2d29fa2 + 347afa4
commit e1d97b8
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 321 deletions.
diff --git a/packages/backend/migration/1710383352620-ScheduledDeleteNote.js b/packages/backend/migration/1710383352620-ScheduledDeleteNote.js
@@ -7,10 +7,10 @@ export class ScheduledDeleteNote1710383352620 {
 	name = 'ScheduledDeleteNote1710383352620'
 
 	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "notes" ADD "deleteAt" TIMESTAMP WITH TIME ZONE`)
+		await queryRunner.query(`ALTER TABLE "note" ADD "deleteAt" TIMESTAMP WITH TIME ZONE`)
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "notes" DROP COLUMN "deleteAt"`)
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "deleteAt"`)
 	}
 }
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
@@ -150,7 +150,6 @@ type Option = {
 	uri?: string | null;
 	url?: string | null;
 	app?: MiApp | null;
-	deleteAt?: Date | null;
 };
 
 @Injectable()
@@ -413,7 +412,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			text: data.text,
 			hasPoll: data.poll != null,
 			hasEvent: data.event != null,
-			deleteAt: data.deleteAt,
 			cw: data.cw ?? null,
 			tags: tags.map(tag => normalizeForSearch(tag)),
 			emojis,
@@ -584,16 +582,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 		}
 
-		if (data.deleteAt) {
-			const delay = data.deleteAt.getTime() - Date.now();
-			this.queueService.scheduledNoteDeletionQueue.add(note.id, {
-				noteId: note.id,
-			}, {
-				delay,
-				removeOnComplete: true,
-			});
-		}
-
 		if (!silent) {
 			if (this.userEntityService.isLocalUser(user)) this.activeUsersChart.write(user);
 

diff --git a/packages/backend/src/core/QueueModule.ts b/packages/backend/src/core/QueueModule.ts
@@ -11,7 +11,7 @@ import type { Config } from '@/config.js';
 import { QUEUE, baseQueueOptions } from '@/queue/const.js';
 import { allSettled } from '@/misc/promise-tracker.js';
 import type { Provider } from '@nestjs/common';
-import type { DeliverJobData, InboxJobData, EndedPollNotificationJobData, WebhookDeliverJobData, RelationshipJobData, ScheduledNoteDeleteJobData } from '../queue/types.js';
+import type { DeliverJobData, InboxJobData, EndedPollNotificationJobData, WebhookDeliverJobData, RelationshipJobData } from '../queue/types.js';
 
 export type SystemQueue = Bull.Queue<Record<string, unknown>>;
 export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
@@ -21,7 +21,6 @@ export type DbQueue = Bull.Queue;
 export type RelationshipQueue = Bull.Queue<RelationshipJobData>;
 export type ObjectStorageQueue = Bull.Queue;
 export type WebhookDeliverQueue = Bull.Queue<WebhookDeliverJobData>;
-export type ScheduledNoteDeleteJobQueue = Bull.Queue<ScheduledNoteDeleteJobData>;
 
 const $system: Provider = {
 	provide: 'queue:system',
@@ -35,12 +34,6 @@ const $endedPollNotification: Provider = {
 	inject: [DI.config, DI.redisForJobQueue],
 };
 
-const $scheduledNoteDelete: Provider = {
-	provide: 'queue:scheduledNoteDelete',
-	useFactory: (config: Config, redisForJobQueue: Redis.Redis) => new Bull.Queue(QUEUE.SCHEDULED_NOTE_DELETE, baseQueueOptions(config, QUEUE.SCHEDULED_NOTE_DELETE, redisForJobQueue)),
-	inject: [DI.config, DI.redisForJobQueue],
-};
-
 const $deliver: Provider = {
 	provide: 'queue:deliver',
 	useFactory: (config: Config, redisForJobQueue: Redis.Redis) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER, redisForJobQueue)),
@@ -83,7 +76,6 @@ const $webhookDeliver: Provider = {
 	providers: [
 		$system,
 		$endedPollNotification,
-		$scheduledNoteDelete,
 		$deliver,
 		$inbox,
 		$db,
@@ -94,7 +86,6 @@ const $webhookDeliver: Provider = {
 	exports: [
 		$system,
 		$endedPollNotification,
-		$scheduledNoteDelete,
 		$deliver,
 		$inbox,
 		$db,
@@ -107,7 +98,6 @@ export class QueueModule implements OnApplicationShutdown {
 	constructor(
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteJobQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -123,7 +113,6 @@ export class QueueModule implements OnApplicationShutdown {
 		await Promise.all([
 			this.systemQueue.close(),
 			this.endedPollNotificationQueue.close(),
-			this.scheduledNoteDeleteQueue.close(),
 			this.deliverQueue.close(),
 			this.inboxQueue.close(),
 			this.dbQueue.close(),

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
@@ -14,7 +14,7 @@ import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
 import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
-import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, RelationshipQueue, SystemQueue, WebhookDeliverQueue, ScheduledNoteDeleteJobQueue } from './QueueModule.js';
+import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, RelationshipQueue, SystemQueue, WebhookDeliverQueue } from './QueueModule.js';
 import type { DbJobData, DeliverJobData, RelationshipJobData, ThinUser } from '../queue/types.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
@@ -27,7 +27,6 @@ export class QueueService {
 
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteJobQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -393,7 +393,6 @@ export class NoteEntityService implements OnModuleInit {
 
 				poll: note.hasPoll ? this.populatePoll(note, meId) : undefined,
 				event: note.hasEvent ? this.populateEvent(note) : undefined,
-				deleteAt: note.deleteAt?.toISOString() ?? undefined,
 
 				...(meId && Object.keys(note.reactions).length > 0 ? {
 					myReaction: this.populateMyReaction(note, meId, options?._hint_),

diff --git a/packages/backend/src/models/Note.ts b/packages/backend/src/models/Note.ts
@@ -210,11 +210,6 @@ export class MiNote {
 	})
 	public hasPoll: boolean;
 
-	@Column('timestamp with time zone', {
-		nullable: true,
-	})
-	public deleteAt: Date | null;
-
 	@Index()
 	@Column({
 		...id(),

diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
@@ -187,11 +187,6 @@ export const packedNoteSchema = {
 			type: 'object',
 			optional: true, nullable: true,
 		},
-		deleteAt: {
-			type: 'string',
-			optional: true, nullable: true,
-			format: 'date-time',
-		},
 		channelId: {
 			type: 'string',
 			optional: true, nullable: true,

diff --git a/packages/backend/src/queue/QueueProcessorModule.ts b/packages/backend/src/queue/QueueProcessorModule.ts
@@ -8,7 +8,6 @@ import { CoreModule } from '@/core/CoreModule.js';
 import { GlobalModule } from '@/GlobalModule.js';
 import { QueueLoggerService } from './QueueLoggerService.js';
 import { QueueProcessorService } from './QueueProcessorService.js';
-import { ScheduledNoteDeleteProcessorService } from './processors/ScheduledNoteDeleteService.js';
 import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
 import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
 import { InboxProcessorService } from './processors/InboxProcessorService.js';
@@ -76,7 +75,6 @@ import { RelationshipProcessorService } from './processors/RelationshipProcessor
 		ReportAbuseProcessorService,
 		WebhookDeliverProcessorService,
 		EndedPollNotificationProcessorService,
-		ScheduledNoteDeleteProcessorService,
 		DeliverProcessorService,
 		InboxProcessorService,
 		AggregateRetentionProcessorService,

diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
@@ -12,7 +12,6 @@ import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import { WebhookDeliverProcessorService } from './processors/WebhookDeliverProcessorService.js';
 import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
-import { ScheduledNoteDeleteProcessorService } from './processors/ScheduledNoteDeleteService.js';
 import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
 import { InboxProcessorService } from './processors/InboxProcessorService.js';
 import { DeleteDriveFilesProcessorService } from './processors/DeleteDriveFilesProcessorService.js';
@@ -76,7 +75,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 	private logger: Logger;
 	private systemQueueWorker: Bull.Worker;
 	private dbQueueWorker: Bull.Worker;
-	private scheduleNoteDeleteQueueWorker: Bull.Worker;
 	private deliverQueueWorker: Bull.Worker;
 	private inboxQueueWorker: Bull.Worker;
 	private webhookDeliverQueueWorker: Bull.Worker;
@@ -123,7 +121,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		private aggregateRetentionProcessorService: AggregateRetentionProcessorService,
 		private checkExpiredMutingsProcessorService: CheckExpiredMutingsProcessorService,
 		private cleanProcessorService: CleanProcessorService,
-		private scheduledNoteDeleteProcessorService: ScheduledNoteDeleteProcessorService,
 	) {
 		this.logger = this.queueLoggerService.logger;
 
@@ -339,13 +336,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			autorun: false,
 		});
 		//#endregion
-
-		//#region scheduled note delete
-		this.scheduledNoteDeleteProcessorService = new Bull.Worker(QUEUE.SCHEDULED_NOTE_DELETE, (job) => this.scheduledNoteDeleteProcessorService.process(job), {
-			...baseQueueOptions(this.config, QUEUE.SCHEDULED_NOTE_DELETE),
-			autorun: false,
-		});
-		//#endregion
 	}
 
 	@bindThis
@@ -359,7 +349,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			this.relationshipQueueWorker.run(),
 			this.objectStorageQueueWorker.run(),
 			this.endedPollNotificationQueueWorker.run(),
-			this.scheduleNoteDeleteQueueWorker.run(),
 		]);
 	}
 
@@ -374,7 +363,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			this.relationshipQueueWorker.close(),
 			this.objectStorageQueueWorker.close(),
 			this.endedPollNotificationQueueWorker.close(),
-			this.scheduleNoteDeleteQueueWorker.close(),
 		]);
 	}
 

diff --git a/packages/backend/src/queue/const.ts b/packages/backend/src/queue/const.ts
@@ -12,7 +12,6 @@ export const QUEUE = {
 	INBOX: 'inbox',
 	SYSTEM: 'system',
 	ENDED_POLL_NOTIFICATION: 'endedPollNotification',
-	SCHEDULED_NOTE_DELETE: 'scheduledNoteDelete',
 	DB: 'db',
 	RELATIONSHIP: 'relationship',
 	OBJECT_STORAGE: 'objectStorage',

diff --git a/packages/backend/src/queue/processors/ScheduledNoteDeleteService.ts b/packages/backend/src/queue/processors/ScheduledNoteDeleteService.ts
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
@@ -109,10 +109,6 @@ export type EndedPollNotificationJobData = {
 	noteId: MiNote['id'];
 };
 
-export type ScheduledNoteDeleteJobData = {
-	noteId: MiNote['id'];
-};
-
 export type WebhookDeliverJobData = {
 	type: string;
 	content: unknown;

diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -189,14 +189,6 @@ export const paramDef = {
 				metadata: { type: 'object' },
 			},
 		},
-		scheduledDelete: {
-			type: 'object',
-			nullable: true,
-			properties: {
-				deleteAt: { type: 'integer', nullable: true },
-				deleteAfter: { type: 'integer', nullable: true, minimum: 1 },
-			},
-		},
 	},
 	// (re)note with text, files and poll are optional
 	if: {
@@ -357,16 +349,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}
 			}
 
-			if (ps.scheduledDelete) {
-				if (typeof ps.scheduledDelete.deleteAt === 'number') {
-					if (ps.scheduledDelete.deleteAt < Date.now()) {
-						throw new ApiError(meta.errors.cannotScheduleDeleteEarlierThanNow);
-					}
-				} else if (typeof ps.scheduledDelete.deleteAfter === 'number') {
-					ps.scheduledDelete.deleteAt = Date.now() + ps.scheduledDelete.deleteAfter;
-				}
-			}
-
 			let channel: MiChannel | null = null;
 			if (ps.channelId != null) {
 				channel = await this.channelsRepository.findOneBy({ id: ps.channelId, isArchived: false });
@@ -405,7 +387,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					apMentions: ps.noExtractMentions ? [] : undefined,
 					apHashtags: ps.noExtractHashtags ? [] : undefined,
 					apEmojis: ps.noExtractEmojis ? [] : undefined,
-					deleteAt: ps.scheduledDelete?.deleteAt ? new Date(ps.scheduledDelete.deleteAt) : null,
 				});
 
 				return {

diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
@@ -24,7 +24,7 @@ import { getNoteSummary } from '@/misc/get-note-summary.js';
 import { DI } from '@/di-symbols.js';
 import * as Acct from '@/misc/acct.js';
 import { MetaService } from '@/core/MetaService.js';
-import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, SystemQueue, WebhookDeliverQueue, ScheduledNoteDeleteJobQueue } from '@/core/QueueModule.js';
+import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, SystemQueue, WebhookDeliverQueue } from '@/core/QueueModule.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { PageEntityService } from '@/core/entities/PageEntityService.js';
@@ -105,7 +105,6 @@ export class ClientServerService {
 
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteJobQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -223,7 +222,6 @@ export class ClientServerService {
 			queues: [
 				this.systemQueue,
 				this.endedPollNotificationQueue,
-				this.scheduledNoteDeleteQueue,
 				this.deliverQueue,
 				this.inboxQueue,
 				this.dbQueue,