From 4b08e978ce7a17f644f2b391d94605619448e400 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 17 Jun 2025 14:06:15 -0400
Subject: [PATCH 001/107] implement background task queue

---
 .config/ci.yml                                | 41 ++++++--
 .config/cypress-devcontainer.yml              | 37 ++++++--
 .config/docker_example.yml                    | 25 ++++-
 .config/example.yml                           | 25 ++++-
 packages/backend/src/config.ts                |  9 ++
 .../src/core/FetchInstanceMetadataService.ts  | 15 +++
 packages/backend/src/core/QueueModule.ts      | 12 +++
 packages/backend/src/core/QueueService.ts     | 76 +++++++++++++++
 .../src/core/activitypub/ApInboxService.ts    | 29 ++----
 .../activitypub/models/ApPersonService.ts     | 50 +++++++---
 .../backend/src/queue/QueueProcessorModule.ts |  3 +-
 .../src/queue/QueueProcessorService.ts        | 47 +++++++++-
 packages/backend/src/queue/const.ts           |  1 +
 .../BackgroundTaskProcessorService.ts         | 93 +++++++++++++++++++
 .../processors/DeliverProcessorService.ts     |  8 +-
 .../queue/processors/InboxProcessorService.ts |  4 +-
 packages/backend/src/queue/types.ts           | 20 ++++
 .../test/misc/immediateBackgroundTasks.ts     | 50 ++++++++++
 18 files changed, 482 insertions(+), 63 deletions(-)
 create mode 100644 packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
 create mode 100644 packages/backend/test/misc/immediateBackgroundTasks.ts

diff --git a/.config/ci.yml b/.config/ci.yml
index 8543205b17..d5f288fc05 100644
--- a/.config/ci.yml
+++ b/.config/ci.yml
@@ -253,21 +253,42 @@ id: 'aidx'
 # Number of worker processes
 #clusterLimit: 1
 
+# +-------------------------+
+# | Job concurrency options |
+# +-------------------------+
+#
+### Available options:
+# [type]JobConcurrency - limits the number jobs that can run at the same time.
+#   Sharkey will allow this many jobs of this type *per worker process*.
+# [type]JobPerSec - limits the total number of jobs that may complete within a single second.
+#   If this limit is exceeded, then Sharkey will pause this type of job until the next second.
+# [type]JobMaxAttempts - limits the number of times that a job is allowed to fail and re-try before it's permanently stopped.
+#   If this limit is exceeded, then the job is considered "failed" and recorded for debugging.
+#
+### Job types:
+# inbox - processes ActivityPub messages (AKA "Activities") received from remote instances.
+#   All inbound activities are queued and processed in chronological order by this job.
+# deliver - processes ActivityPub messages (AKA "Activities") being set to remote instances.
+#   All outbound activities are queued and processed in chronological order by this job.
+# relationship - processes user-to-user tasks including follow/unfollow, block/unblock, account migrations, and all follow import jobs.
+# background - processes background synchronization tasks that need to happen soon (but not immediately), such as remote user updates and instance metadata updates.
+
 # Job concurrency per worker
-# deliverJobConcurrency: 128
-# inboxJobConcurrency: 16
-# relashionshipJobConcurrency: 16
-#  What's relashionshipJob?:
-#   Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
+#deliverJobConcurrency: 128
+#inboxJobConcurrency: 16
+#relationshipJobConcurrency: 16
+#backgroundJobConcurrency: 32
 
 # Job rate limiter
-# deliverJobPerSec: 128
-# inboxJobPerSec: 32
-# relashionshipJobPerSec: 64
+#deliverJobPerSec: 128
+#inboxJobPerSec: 32
+#relationshipJobPerSec: 64
+#backgroundJobPerSec: 256
 
 # Job attempts
-# deliverJobMaxAttempts: 12
-# inboxJobMaxAttempts: 8
+#deliverJobMaxAttempts: 12
+#inboxJobMaxAttempts: 8
+#backgroundJobMaxAttempts: 8
 
 # Local address used for outgoing requests
 #outgoingAddress: 127.0.0.1
diff --git a/.config/cypress-devcontainer.yml b/.config/cypress-devcontainer.yml
index f705d06d45..ba6d51959c 100644
--- a/.config/cypress-devcontainer.yml
+++ b/.config/cypress-devcontainer.yml
@@ -223,17 +223,42 @@ id: 'aidx'
 # Number of worker processes
 #clusterLimit: 1
 
+# +-------------------------+
+# | Job concurrency options |
+# +-------------------------+
+#
+### Available options:
+# [type]JobConcurrency - limits the number jobs that can run at the same time.
+#   Sharkey will allow this many jobs of this type *per worker process*.
+# [type]JobPerSec - limits the total number of jobs that may complete within a single second.
+#   If this limit is exceeded, then Sharkey will pause this type of job until the next second.
+# [type]JobMaxAttempts - limits the number of times that a job is allowed to fail and re-try before it's permanently stopped.
+#   If this limit is exceeded, then the job is considered "failed" and recorded for debugging.
+#
+### Job types:
+# inbox - processes ActivityPub messages (AKA "Activities") received from remote instances.
+#   All inbound activities are queued and processed in chronological order by this job.
+# deliver - processes ActivityPub messages (AKA "Activities") being set to remote instances.
+#   All outbound activities are queued and processed in chronological order by this job.
+# relationship - processes user-to-user tasks including follow/unfollow, block/unblock, account migrations, and all follow import jobs.
+# background - processes background synchronization tasks that need to happen soon (but not immediately), such as remote user updates and instance metadata updates.
+
 # Job concurrency per worker
-# deliverJobConcurrency: 128
-# inboxJobConcurrency: 16
+#deliverJobConcurrency: 128
+#inboxJobConcurrency: 16
+#relationshipJobConcurrency: 16
+#backgroundJobConcurrency: 32
 
 # Job rate limiter
-# deliverJobPerSec: 128
-# inboxJobPerSec: 32
+#deliverJobPerSec: 128
+#inboxJobPerSec: 32
+#relationshipJobPerSec: 64
+#backgroundJobPerSec: 256
 
 # Job attempts
-# deliverJobMaxAttempts: 12
-# inboxJobMaxAttempts: 8
+#deliverJobMaxAttempts: 12
+#inboxJobMaxAttempts: 8
+#backgroundJobMaxAttempts: 8
 
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index 5905e3deed..8ca8d7ff50 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -307,21 +307,42 @@ id: 'aidx'
 # Number of worker processes
 #clusterLimit: 1
 
+# +-------------------------+
+# | Job concurrency options |
+# +-------------------------+
+#
+### Available options:
+# [type]JobConcurrency - limits the number jobs that can run at the same time.
+#   Sharkey will allow this many jobs of this type *per worker process*.
+# [type]JobPerSec - limits the total number of jobs that may complete within a single second.
+#   If this limit is exceeded, then Sharkey will pause this type of job until the next second.
+# [type]JobMaxAttempts - limits the number of times that a job is allowed to fail and re-try before it's permanently stopped.
+#   If this limit is exceeded, then the job is considered "failed" and recorded for debugging.
+#
+### Job types:
+# inbox - processes ActivityPub messages (AKA "Activities") received from remote instances.
+#   All inbound activities are queued and processed in chronological order by this job.
+# deliver - processes ActivityPub messages (AKA "Activities") being set to remote instances.
+#   All outbound activities are queued and processed in chronological order by this job.
+# relationship - processes user-to-user tasks including follow/unfollow, block/unblock, account migrations, and all follow import jobs.
+# background - processes background synchronization tasks that need to happen soon (but not immediately), such as remote user updates and instance metadata updates.
+
 # Job concurrency per worker
 #deliverJobConcurrency: 128
 #inboxJobConcurrency: 16
 #relationshipJobConcurrency: 16
-# What's relationshipJob?:
-#  Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
+#backgroundJobConcurrency: 32
 
 # Job rate limiter
 #deliverJobPerSec: 128
 #inboxJobPerSec: 32
 #relationshipJobPerSec: 64
+#backgroundJobPerSec: 256
 
 # Job attempts
 #deliverJobMaxAttempts: 12
 #inboxJobMaxAttempts: 8
+#backgroundJobMaxAttempts: 8
 
 # Local address used for outgoing requests
 #outgoingAddress: 127.0.0.1
diff --git a/.config/example.yml b/.config/example.yml
index cffc333d14..6fa3f02026 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -310,21 +310,42 @@ id: 'aidx'
 # Number of worker processes
 #clusterLimit: 1
 
+# +-------------------------+
+# | Job concurrency options |
+# +-------------------------+
+#
+### Available options:
+# [type]JobConcurrency - limits the number jobs that can run at the same time.
+#   Sharkey will allow this many jobs of this type *per worker process*.
+# [type]JobPerSec - limits the total number of jobs that may complete within a single second.
+#   If this limit is exceeded, then Sharkey will pause this type of job until the next second.
+# [type]JobMaxAttempts - limits the number of times that a job is allowed to fail and re-try before it's permanently stopped.
+#   If this limit is exceeded, then the job is considered "failed" and recorded for debugging.
+#
+### Job types:
+# inbox - processes ActivityPub messages (AKA "Activities") received from remote instances.
+#   All inbound activities are queued and processed in chronological order by this job.
+# deliver - processes ActivityPub messages (AKA "Activities") being set to remote instances.
+#   All outbound activities are queued and processed in chronological order by this job.
+# relationship - processes user-to-user tasks including follow/unfollow, block/unblock, account migrations, and all follow import jobs.
+# background - processes background synchronization tasks that need to happen soon (but not immediately), such as remote user updates and instance metadata updates.
+
 # Job concurrency per worker
 #deliverJobConcurrency: 128
 #inboxJobConcurrency: 16
 #relationshipJobConcurrency: 16
-# What's relationshipJob?:
-#  Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
+#backgroundJobConcurrency: 32
 
 # Job rate limiter
 #deliverJobPerSec: 128
 #inboxJobPerSec: 32
 #relationshipJobPerSec: 64
+#backgroundJobPerSec: 256
 
 # Job attempts
 #deliverJobMaxAttempts: 12
 #inboxJobMaxAttempts: 8
+#backgroundJobMaxAttempts: 8
 
 # Local address used for outgoing requests
 #outgoingAddress: 127.0.0.1
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 5607f50eb7..be3892e942 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -111,11 +111,14 @@ type Source = {
 	deliverJobConcurrency?: number;
 	inboxJobConcurrency?: number;
 	relationshipJobConcurrency?: number;
+	backgroundJobConcurrency?: number;
 	deliverJobPerSec?: number;
 	inboxJobPerSec?: number;
 	relationshipJobPerSec?: number;
+	backgroundJobPerSec?: number;
 	deliverJobMaxAttempts?: number;
 	inboxJobMaxAttempts?: number;
+	backgroundJobMaxAttempts?: number;
 
 	mediaDirectory?: string;
 	mediaProxy?: string;
@@ -272,11 +275,14 @@ export type Config = {
 	deliverJobConcurrency: number | undefined;
 	inboxJobConcurrency: number | undefined;
 	relationshipJobConcurrency: number | undefined;
+	backgroundJobConcurrency: number | undefined;
 	deliverJobPerSec: number | undefined;
 	inboxJobPerSec: number | undefined;
 	relationshipJobPerSec: number | undefined;
+	backgroundJobPerSec: number | undefined;
 	deliverJobMaxAttempts: number | undefined;
 	inboxJobMaxAttempts: number | undefined;
+	backgroundJobMaxAttempts: number | undefined;
 	proxyRemoteFiles: boolean | undefined;
 	customMOTD: string[] | undefined;
 	signToActivityPubGet: boolean;
@@ -475,11 +481,14 @@ export function loadConfig(loggerService: LoggerService): Config {
 		deliverJobConcurrency: config.deliverJobConcurrency,
 		inboxJobConcurrency: config.inboxJobConcurrency,
 		relationshipJobConcurrency: config.relationshipJobConcurrency,
+		backgroundJobConcurrency: config.backgroundJobConcurrency,
 		deliverJobPerSec: config.deliverJobPerSec,
 		inboxJobPerSec: config.inboxJobPerSec,
 		relationshipJobPerSec: config.relationshipJobPerSec,
+		backgroundJobPerSec: config.backgroundJobPerSec,
 		deliverJobMaxAttempts: config.deliverJobMaxAttempts,
 		inboxJobMaxAttempts: config.inboxJobMaxAttempts,
+		backgroundJobMaxAttempts: config.backgroundJobMaxAttempts,
 		proxyRemoteFiles: config.proxyRemoteFiles,
 		customMOTD: config.customMOTD,
 		signToActivityPubGet: config.signToActivityPubGet ?? true,
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index d288c5d231..0ba61ce4f9 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -17,6 +17,7 @@ import { bindThis } from '@/decorators.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
+import { QueueService } from '@/core/QueueService.js';
 import type { CheerioAPI } from 'cheerio/slim';
 
 type NodeInfo = {
@@ -50,6 +51,7 @@ export class FetchInstanceMetadataService {
 		private redisClient: Redis.Redis,
 
 		private readonly timeService: TimeService,
+		private readonly queueService: QueueService,
 	) {
 		this.logger = this.loggerService.getLogger('metadata', 'cyan');
 	}
@@ -73,8 +75,21 @@ export class FetchInstanceMetadataService {
 		return this.redisClient.del(`fetchInstanceMetadata:mutex:v2:${host}`);
 	}
 
+	/**
+	 * Schedules a deferred update on the background task worker.
+	 * Duplicate updates are automatically skipped.
+	 */
+	@bindThis
+	public async fetchInstanceMetadataLazy(instance: MiInstance): Promise<void> {
+		if (!instance.isBlocked) {
+			await this.queueService.createUpdateInstanceJob(instance.host);
+		}
+	}
+
 	@bindThis
 	public async fetchInstanceMetadata(instance: MiInstance, force = false): Promise<void> {
+		if (instance.isBlocked) return;
+
 		const host = instance.host;
 
 		// finallyでunlockされてしまうのでtry内でロックチェックをしない
diff --git a/packages/backend/src/core/QueueModule.ts b/packages/backend/src/core/QueueModule.ts
index 2f594394a6..078c6002e8 100644
--- a/packages/backend/src/core/QueueModule.ts
+++ b/packages/backend/src/core/QueueModule.ts
@@ -20,6 +20,7 @@ import {
 	UserWebhookDeliverJobData,
 	SystemWebhookDeliverJobData,
 	ScheduleNotePostJobData,
+	BackgroundTaskJobData,
 } from '../queue/types.js';
 import type { Provider } from '@nestjs/common';
 
@@ -33,6 +34,7 @@ export type ObjectStorageQueue = Bull.Queue;
 export type UserWebhookDeliverQueue = Bull.Queue<UserWebhookDeliverJobData>;
 export type SystemWebhookDeliverQueue = Bull.Queue<SystemWebhookDeliverJobData>;
 export type ScheduleNotePostQueue = Bull.Queue<ScheduleNotePostJobData>;
+export type BackgroundTaskQueue = Bull.Queue<BackgroundTaskJobData>;
 
 const $system: Provider = {
 	provide: 'queue:system',
@@ -94,6 +96,12 @@ const $scheduleNotePost: Provider = {
 	inject: [DI.config],
 };
 
+const $backgroundTask: Provider = {
+	provide: 'queue:backgroundTask',
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.BACKGROUND_TASK, baseQueueOptions(config, QUEUE.BACKGROUND_TASK)),
+	inject: [DI.config],
+};
+
 @Module({
 	imports: [
 	],
@@ -108,6 +116,7 @@ const $scheduleNotePost: Provider = {
 		$userWebhookDeliver,
 		$systemWebhookDeliver,
 		$scheduleNotePost,
+		$backgroundTask,
 	],
 	exports: [
 		$system,
@@ -120,6 +129,7 @@ const $scheduleNotePost: Provider = {
 		$userWebhookDeliver,
 		$systemWebhookDeliver,
 		$scheduleNotePost,
+		$backgroundTask,
 	],
 })
 export class QueueModule implements OnApplicationShutdown {
@@ -136,6 +146,7 @@ export class QueueModule implements OnApplicationShutdown {
 		@Inject('queue:userWebhookDeliver') public userWebhookDeliverQueue: UserWebhookDeliverQueue,
 		@Inject('queue:systemWebhookDeliver') public systemWebhookDeliverQueue: SystemWebhookDeliverQueue,
 		@Inject('queue:scheduleNotePost') public scheduleNotePostQueue: ScheduleNotePostQueue,
+		@Inject('queue:backgroundTask') public readonly backgroundTaskQueue: BackgroundTaskQueue,
 	) {}
 
 	public async dispose(): Promise<void> {
@@ -155,6 +166,7 @@ export class QueueModule implements OnApplicationShutdown {
 			this.userWebhookDeliverQueue.close(),
 			this.systemWebhookDeliverQueue.close(),
 			this.scheduleNotePostQueue.close(),
+			this.backgroundTaskQueue.close(),
 		]).then(res => {
 			for (const result of res) {
 				if (result.status === 'rejected') {
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 9fd646e655..71716f0f6b 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -21,6 +21,7 @@ import type { SystemWebhookPayload } from '@/core/SystemWebhookService.js';
 import type { MiNote } from '@/models/Note.js';
 import { type UserWebhookPayload } from './UserWebhookService.js';
 import type {
+	BackgroundTaskJobData,
 	DbJobData,
 	DeliverJobData,
 	RelationshipJobData,
@@ -39,6 +40,7 @@ import type {
 	SystemWebhookDeliverQueue,
 	UserWebhookDeliverQueue,
 	ScheduleNotePostQueue,
+	BackgroundTaskQueue,
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
@@ -54,6 +56,7 @@ export const QUEUE_TYPES = [
 	'userWebhookDeliver',
 	'systemWebhookDeliver',
 	'scheduleNotePost',
+	'backgroundTask',
 ] as const;
 
 @Injectable()
@@ -72,6 +75,7 @@ export class QueueService implements OnModuleInit {
 		@Inject('queue:userWebhookDeliver') public userWebhookDeliverQueue: UserWebhookDeliverQueue,
 		@Inject('queue:systemWebhookDeliver') public systemWebhookDeliverQueue: SystemWebhookDeliverQueue,
 		@Inject('queue:scheduleNotePost') public ScheduleNotePostQueue: ScheduleNotePostQueue,
+		@Inject('queue:backgroundTask') public readonly backgroundTaskQueue: BackgroundTaskQueue,
 
 		private readonly timeService: TimeService,
 	) {}
@@ -839,6 +843,78 @@ export class QueueService implements OnModuleInit {
 		});
 	}
 
+	@bindThis
+	public async createUpdateUserJob(userId: string) {
+		return await this.createBackgroundTask(
+			'update-user',
+			{
+				type: 'update-user',
+				userId,
+			},
+			{
+				id: `update-user:${userId}`,
+				// ttl: 1000 * 60 * 60 * 24,
+			},
+		);
+	}
+
+	@bindThis
+	public async createUpdateFeaturedJob(userId: string) {
+		return await this.createBackgroundTask(
+			'update-featured',
+			{
+				type: 'update-featured',
+				userId,
+			},
+			{
+				id: `update-featured:${userId}`,
+				// ttl: 1000 * 60 * 60 * 24,
+			},
+		);
+	}
+
+	@bindThis
+	public async createUpdateInstanceJob(host: string) {
+		return await this.createBackgroundTask(
+			'update-instance',
+			{
+				type: 'update-instance',
+				host,
+			},
+			{
+				id: `update-instance:${host}`,
+				// ttl: 1000 * 60 * 60 * 24,
+			},
+		);
+	}
+
+	private async createBackgroundTask(name: string, data: BackgroundTaskJobData, duplication: { id: string, ttl?: number }) {
+		return await this.backgroundTaskQueue.add(
+			name,
+			data,
+			{
+				removeOnComplete: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 30,
+				},
+				removeOnFail: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 100,
+				},
+
+				// https://docs.bullmq.io/guide/retrying-failing-jobs#custom-back-off-strategies
+				attempts: this.config.backgroundJobMaxAttempts ?? 8,
+				backoff: {
+					// Resolves to QueueProcessorService::HttpRelatedBackoff()
+					type: 'custom',
+				},
+
+				// https://docs.bullmq.io/guide/jobs/deduplication
+				deduplication: duplication,
+			},
+		);
+	};
+
 	/**
 	 * @see UserWebhookDeliverJobData
 	 * @see UserWebhookDeliverProcessorService
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index 91eba793d6..309259120d 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -153,11 +153,10 @@ export class ApInboxService {
 		// ついでにリモートユーザーの情報が古かったら更新しておく
 		if (actor.uri) {
 			if (actor.lastFetchedAt == null || this.timeService.now - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
-				setImmediate(() => {
+				{
 					// 同一ユーザーの情報を再度処理するので、使用済みのresolverを再利用してはいけない
-					this.apPersonService.updatePerson(actor.uri)
-						.catch(err => this.logger.error(`Failed to update person: ${renderInlineError(err)}`));
-				});
+					await this.apPersonService.updatePersonLazy(actor);
+				}
 			}
 		}
 		return result;
@@ -441,25 +440,15 @@ export class ApInboxService {
 				this.instanceChart.requestReceived(i.host).then();
 			}
 
-			this.fetchInstanceMetadataService.fetchInstanceMetadata(i).then();
+			await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
 		});
 
 		// Process it!
-		return await this.performOneActivity(actor, activity, resolver)
-			.finally(() => {
-				// Update user (adapted from performActivity)
-				if (actor.lastFetchedAt == null || this.timeService.now - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
-					setImmediate(() => {
-						// Don't re-use the resolver, or it may throw recursion errors.
-						// Instead, create a new resolver with an appropriately-reduced recursion limit.
-						const subResolver = this.apResolverService.createResolver({
-							recursionLimit: resolver.getRecursionLimit() - resolver.getHistory().length,
-						});
-						this.apPersonService.updatePerson(actor.uri, subResolver)
-							.catch(err => this.logger.error(`Failed to update person: ${renderInlineError(err)}`));
-					});
-				}
-			});
+		try {
+			return await this.performOneActivity(actor, activity, resolver);
+		} finally {
+			await this.apPersonService.updatePersonLazy(actor);
+		}
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 4ce0e8db3f..096480047f 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -579,7 +579,7 @@ export class ApPersonService implements OnModuleInit {
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.newUser(i.host);
 				}
-				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
+				this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
 			});
 		}
 
@@ -604,16 +604,26 @@ export class ApPersonService implements OnModuleInit {
 		}
 		//#endregion
 
-		await this.updateFeatured(user.id, resolver).catch(err => {
-			// Permanent error implies hidden or inaccessible, which is a normal thing.
-			if (isRetryableError(err)) {
-				this.logger.error(`Error updating featured notes: ${renderInlineError(err)}`);
-			}
-		});
+		await this.updateFeaturedLazy(user);
 
 		return user;
 	}
 
+	/**
+	 * Schedules a deferred update on the background task worker.
+	 * Duplicate updates are automatically skipped.
+	 */
+	@bindThis
+	public async updatePersonLazy(uriOrUser: string | MiUser): Promise<void> {
+		const user = typeof(uriOrUser) === 'string'
+			?	await this.fetchPerson(uriOrUser)
+			: uriOrUser;
+
+		if (user && user.host != null) {
+			await this.queueService.createUpdateUserJob(user.id);
+		}
+	}
+
 	/**
 	 * Personの情報を更新します。
 	 * Misskeyに対象のPersonが登録されていなければ無視します。
@@ -817,12 +827,7 @@ export class ApPersonService implements OnModuleInit {
 			await this.cacheService.refreshFollowRelationsFor(exist.id);
 		}
 
-		await this.updateFeatured(exist.id, resolver).catch(err => {
-			// Permanent error implies hidden or inaccessible, which is a normal thing.
-			if (isRetryableError(err)) {
-				this.logger.error(`Error updating featured notes: ${renderInlineError(err)}`);
-			}
-		});
+		await this.updateFeaturedLazy(exist);
 
 		const updated = { ...exist, ...updates };
 
@@ -902,9 +907,24 @@ export class ApPersonService implements OnModuleInit {
 		return fields;
 	}
 
+	/**
+	 * Schedules a deferred update on the background task worker.
+	 * Duplicate updates are automatically skipped.
+	 */
 	@bindThis
-	public async updateFeatured(userId: MiUser['id'], resolver?: Resolver): Promise<void> {
-		const user = await this.usersRepository.findOneByOrFail({ id: userId, isDeleted: false });
+	public async updateFeaturedLazy(userOrId: MiUser | MiUser['id']): Promise<void> {
+		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
+		const user = typeof(userOrId) === 'object' ? userOrId : await this.usersRepository.findOneByOrFail({ id: userId, isDeleted: false });
+
+		if (isRemoteUser(user) && user.featured) {
+			await this.queueService.createUpdateFeaturedJob(userId);
+		}
+	}
+
+	@bindThis
+	public async updateFeatured(userOrId: MiUser | MiUser['id'], resolver?: Resolver): Promise<void> {
+		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
+		const user = typeof(userOrId) === 'object' ? userOrId : await this.usersRepository.findOneByOrFail({ id: userId, isDeleted: false });
 		if (!isRemoteUser(user)) return;
 		if (!user.featured) return;
 
diff --git a/packages/backend/src/queue/QueueProcessorModule.ts b/packages/backend/src/queue/QueueProcessorModule.ts
index b6469229d2..d76b29340d 100644
--- a/packages/backend/src/queue/QueueProcessorModule.ts
+++ b/packages/backend/src/queue/QueueProcessorModule.ts
@@ -46,7 +46,7 @@ import { RelationshipProcessorService } from './processors/RelationshipProcessor
 import { ScheduleNotePostProcessorService } from './processors/ScheduleNotePostProcessorService.js';
 import { CleanupApLogsProcessorService } from './processors/CleanupApLogsProcessorService.js';
 import { HibernateUsersProcessorService } from './processors/HibernateUsersProcessorService.js';
-
+import { BackgroundTaskProcessorService } from './processors/BackgroundTaskProcessorService.js';
 @Module({
 	imports: [
 		CoreModule,
@@ -93,6 +93,7 @@ import { HibernateUsersProcessorService } from './processors/HibernateUsersProce
 		ScheduleNotePostProcessorService,
 		CleanupApLogsProcessorService,
 		HibernateUsersProcessorService,
+		BackgroundTaskProcessorService,
 	],
 	exports: [
 		QueueProcessorService,
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index cd85db3122..b04d19618f 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -14,6 +14,7 @@ import { CheckModeratorsActivityProcessorService } from '@/queue/processors/Chec
 import { TimeService } from '@/global/TimeService.js';
 import { renderFullError } from '@/misc/render-full-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
+import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
 import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
 import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
@@ -53,9 +54,16 @@ import { QUEUE, baseWorkerOptions } from './const.js';
 import { ImportNotesProcessorService } from './processors/ImportNotesProcessorService.js';
 import { CleanupApLogsProcessorService } from './processors/CleanupApLogsProcessorService.js';
 import { HibernateUsersProcessorService } from './processors/HibernateUsersProcessorService.js';
+import { BackgroundTaskProcessorService } from './processors/BackgroundTaskProcessorService.js';
 
 // ref. https://github.com/misskey-dev/misskey/pull/7635#issue-971097019
-function httpRelatedBackoff(attemptsMade: number) {
+function httpRelatedBackoff(attemptsMade: number, type?: string, error?: Error) {
+	// Don't retry permanent errors
+	// https://docs.bullmq.io/guide/retrying-failing-jobs#custom-back-off-strategies
+	if (error && !isRetryableError(error)) {
+		return -1;
+	}
+
 	const baseDelay = 60 * 1000;	// 1min
 	const maxBackoff = 8 * 60 * 60 * 1000;	// 8hours
 	let backoff = (Math.pow(2, attemptsMade) - 1) * baseDelay;
@@ -95,6 +103,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 	private objectStorageQueueWorker: Bull.Worker;
 	private endedPollNotificationQueueWorker: Bull.Worker;
 	private schedulerNotePostQueueWorker: Bull.Worker;
+	private readonly backgroundTaskWorker: Bull.Worker;
 
 	constructor(
 		@Inject(DI.config)
@@ -140,6 +149,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		private readonly timeService: TimeService,
 		private readonly cleanupApLogsProcessorService: CleanupApLogsProcessorService,
 		private readonly hibernateUsersProcessorService: HibernateUsersProcessorService,
+		private readonly backgroundTaskProcessorService: BackgroundTaskProcessorService,
 	) {
 		this.logger = this.queueLoggerService.logger;
 
@@ -565,6 +575,39 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
 		}
 		//#endregion
+
+		//#region background tasks
+		{
+			const logger = this.logger.createSubLogger('backgroundTask');
+
+			this.backgroundTaskWorker = new Bull.Worker(QUEUE.BACKGROUND_TASK, (job) => this.backgroundTaskProcessorService.process(job), {
+				...baseWorkerOptions(this.config, QUEUE.BACKGROUND_TASK),
+				autorun: false,
+				concurrency: this.config.backgroundJobConcurrency ?? 32,
+				limiter: {
+					max: this.config.backgroundJobPerSec ?? 256,
+					duration: 1000,
+				},
+				settings: {
+					backoffStrategy: httpRelatedBackoff,
+				},
+			});
+			this.backgroundTaskWorker
+				.on('active', (job) => logger.debug(`active id=${job.id}`))
+				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
+				.on('failed', (job, err) => {
+					this.logError(logger, err, job);
+					if (config.sentryForBackend) {
+						Sentry.captureMessage(`Queue: ${QUEUE.BACKGROUND_TASK}: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
+							level: 'error',
+							extra: { job, err },
+						});
+					}
+				})
+				.on('error', (err: Error) => this.logError(logger, err))
+				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
+		}
+		//#endregion
 	}
 
 	private logError(logger: Logger, err: unknown, job?: Bull.Job | null): void {
@@ -606,6 +649,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			this.objectStorageQueueWorker.run(),
 			this.endedPollNotificationQueueWorker.run(),
 			this.schedulerNotePostQueueWorker.run(),
+			this.backgroundTaskWorker.run(),
 		]);
 	}
 
@@ -622,6 +666,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			this.objectStorageQueueWorker.close(),
 			this.endedPollNotificationQueueWorker.close(),
 			this.schedulerNotePostQueueWorker.close(),
+			this.backgroundTaskWorker.close(),
 		]).then(res => {
 			for (const result of res) {
 				if (result.status === 'rejected') {
diff --git a/packages/backend/src/queue/const.ts b/packages/backend/src/queue/const.ts
index 17c6b81736..44192c280e 100644
--- a/packages/backend/src/queue/const.ts
+++ b/packages/backend/src/queue/const.ts
@@ -18,6 +18,7 @@ export const QUEUE = {
 	USER_WEBHOOK_DELIVER: 'userWebhookDeliver',
 	SYSTEM_WEBHOOK_DELIVER: 'systemWebhookDeliver',
 	SCHEDULE_NOTE_POST: 'scheduleNotePost',
+	BACKGROUND_TASK: 'backgroundTask',
 };
 
 export function baseQueueOptions(config: Config, queueName: typeof QUEUE[keyof typeof QUEUE]): Bull.QueueOptions {
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
new file mode 100644
index 0000000000..b237990a4c
--- /dev/null
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -0,0 +1,93 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import * as Bull from 'bullmq';
+import { BackgroundTaskJobData, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserBackgroundTask } from '@/queue/types.js';
+import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
+import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
+import Logger from '@/logger.js';
+import { isRetryableError } from '@/misc/is-retryable-error.js';
+import { DI } from '@/di-symbols.js';
+import type { Config } from '@/config.js';
+import { CacheService } from '@/core/CacheService.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
+import { renderInlineError } from '@/misc/render-inline-error.js';
+
+@Injectable()
+export class BackgroundTaskProcessorService {
+	private readonly logger: Logger;
+
+	constructor(
+		@Inject(DI.config)
+		private readonly config: Config,
+
+		private readonly apPersonService: ApPersonService,
+		private readonly cacheService: CacheService,
+		private readonly federatedInstanceService: FederatedInstanceService,
+		private readonly fetchInstanceMetadataService: FetchInstanceMetadataService,
+
+		queueLoggerService: QueueLoggerService,
+	) {
+		this.logger = queueLoggerService.logger.createSubLogger('background-task');
+	}
+
+	public async process(job: Bull.Job<BackgroundTaskJobData>): Promise<string> {
+		if (job.data.type === 'update-user') {
+			return await this.processUpdateUser(job.data);
+		} else if (job.data.type === 'update-featured') {
+			return await this.processUpdateFeatured(job.data);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'update-instance') {
+			return await this.processUpdateInstance(job.data);
+		} else {
+			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
+			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
+		}
+	}
+
+	private async processUpdateUser(task: UpdateUserBackgroundTask): Promise<string> {
+		const user = await this.cacheService.findOptionalUserById(task.userId);
+		if (!user || user.isDeleted) return `Skipping update-user task: user ${task.userId} has been deleted`;
+		if (user.isSuspended) return `Skipping update-user task: user ${task.userId} is suspended`;
+		if (!user.uri) return `Skipping update-user task: user ${task.userId} is local`;
+
+		if (user.lastFetchedAt && Date.now() - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
+			return `Skipping update-user task: user ${task.userId} was recently updated`;
+		}
+
+		await this.apPersonService.updatePerson(user.uri);
+		return 'ok';
+	}
+
+	private async processUpdateFeatured(task: UpdateFeaturedBackgroundTask): Promise<string> {
+		const user = await this.cacheService.findOptionalUserById(task.userId);
+		if (!user || user.isDeleted) return `Skipping update-featured task: user ${task.userId} has been deleted`;
+		if (user.isSuspended) return `Skipping update-featured task: user ${task.userId} is suspended`;
+		if (!user.uri) return `Skipping update-featured task: user ${task.userId} is local`;
+		if (!user.featured) return `Skipping update-featured task: user ${task.userId} has no featured collection`;
+
+		if (user.lastFetchedAt && Date.now() - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
+			return `Skipping update-featured task: user ${task.userId} was recently updated`;
+		}
+
+		await this.apPersonService.updateFeatured(user);
+		return 'ok';
+	}
+
+	private async processUpdateInstance(task: UpdateInstanceBackgroundTask): Promise<string> {
+		const instance = await this.federatedInstanceService.fetch(task.host);
+		if (!instance) return `Skipping update-instance task: instance ${task.host} has been deleted`;
+		if (instance.isBlocked) return `Skipping update-instance task: instance ${task.host} is blocked`;
+
+		if (instance.infoUpdatedAt && Date.now() - instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24) {
+			return `Skipping update-instance task: instance ${task.host} was recently updated`;
+		}
+
+		await this.fetchInstanceMetadataService.fetchInstanceMetadata(instance);
+		return 'ok';
+	}
+}
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index 0b1ef03a7a..792ec4b015 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -80,21 +80,21 @@ export class DeliverProcessorService {
 				if (i == null) return;
 
 				if (i.isNotResponding) {
-					this.federatedInstanceService.update(i.id, {
+					await this.federatedInstanceService.update(i.id, {
 						isNotResponding: false,
 						notRespondingSince: null,
 					});
 				}
 
 				if (this.meta.enableChartsForFederatedInstances) {
-					this.instanceChart.requestSent(i.host, true);
+					await this.instanceChart.requestSent(i.host, true);
 				}
 			});
 
 			return 'Success';
 		} catch (res) {
-			this.apRequestChart.deliverFail();
-			this.federationChart.deliverd(host, false);
+			await this.apRequestChart.deliverFail();
+			await this.federationChart.deliverd(host, false);
 
 			// Update instance stats
 			this.federatedInstanceService.fetchOrRegister(host).then(i => {
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 13b2885263..3b73e98e5c 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -275,10 +275,10 @@ export class InboxProcessorService implements OnApplicationShutdown {
 			});
 
 			if (this.meta.enableChartsForFederatedInstances) {
-				this.instanceChart.requestReceived(i.host);
+				await this.instanceChart.requestReceived(i.host);
 			}
 
-			this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
+			await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
 		});
 
 		// アクティビティを処理
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 6dc9f88034..0c3d790a97 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -168,3 +168,23 @@ export type ThinUser = {
 export type ScheduleNotePostJobData = {
 	scheduleNoteId: MiNote['id'];
 };
+
+export type BackgroundTaskJobData =
+	UpdateUserBackgroundTask |
+	UpdateFeaturedBackgroundTask |
+	UpdateInstanceBackgroundTask;
+
+export type UpdateUserBackgroundTask = {
+	type: 'update-user';
+	userId: string;
+};
+
+export type UpdateFeaturedBackgroundTask = {
+	type: 'update-featured';
+	userId: string;
+};
+
+export type UpdateInstanceBackgroundTask = {
+	type: 'update-instance';
+	host: string;
+};
diff --git a/packages/backend/test/misc/immediateBackgroundTasks.ts b/packages/backend/test/misc/immediateBackgroundTasks.ts
new file mode 100644
index 0000000000..fd059e3f10
--- /dev/null
+++ b/packages/backend/test/misc/immediateBackgroundTasks.ts
@@ -0,0 +1,50 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { IObject } from '@/core/activitypub/type.js';
+import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
+import { MiRemoteUser, MiUser } from '@/models/User.js';
+import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
+import { MiInstance } from '@/models/Instance.js';
+import { Resolver } from '@/core/activitypub/ApResolverService.js';
+import { bindThis } from '@/decorators.js';
+
+export class ImmediateApPersonService extends ApPersonService {
+	@bindThis
+	async createPerson(uri: string, resolver?: Resolver): Promise<MiRemoteUser> {
+		const user = await super.createPerson(uri, resolver);
+		await this.updateFeatured(user, resolver);
+		return user;
+	}
+
+	@bindThis
+	async updatePerson(uri: string, resolver?: Resolver | null, hint?: IObject, movePreventUris: string[] = []): Promise<string | void> {
+		const result = await super.updatePerson(uri, resolver, hint, movePreventUris);
+
+		const user = await this.fetchPerson(uri);
+		if (user == null) throw new Error('updated user is null, did you forget to mock out caches?');
+		await this.updateFeatured(user, resolver ?? undefined);
+
+		return result;
+	}
+
+	@bindThis
+	async updatePersonLazy(uriOrUser: string | MiUser): Promise<void> {
+		const userId = typeof(uriOrUser) === 'object' ? uriOrUser.id : uriOrUser;
+		await this.updatePerson(userId);
+	}
+
+	@bindThis
+	async updateFeaturedLazy(userOrId: string | MiUser): Promise<void> {
+		await this.updateFeatured(userOrId);
+	}
+}
+
+export class ImmediateFetchInstanceMetadataService extends FetchInstanceMetadataService {
+	@bindThis
+	async fetchInstanceMetadataLazy(instance: MiInstance): Promise<void> {
+		return await this.fetchInstanceMetadata(instance);
+	}
+}

From 8f436ef8cac6e68ed322e9c740dfbc1ac43eab43 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 17 Jun 2025 20:30:32 -0400
Subject: [PATCH 002/107] implement background queue charts

---
 packages/backend/src/core/QueueService.ts     |  1 +
 packages/backend/src/core/SponsorsService.ts  |  2 ++
 .../backend/src/daemons/QueueStatsService.ts  | 28 ++++++++++++++++-
 .../frontend/src/pages/admin/job-queue.vue    |  1 +
 .../frontend/src/widgets/WidgetJobQueue.vue   | 31 +++++++++++++++++--
 5 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 71716f0f6b..15c50e4d83 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -1003,6 +1003,7 @@ export class QueueService implements OnModuleInit {
 			case 'userWebhookDeliver': return this.userWebhookDeliverQueue;
 			case 'systemWebhookDeliver': return this.systemWebhookDeliverQueue;
 			case 'scheduleNotePost': return this.ScheduleNotePostQueue;
+			case 'backgroundTask': return this.backgroundTaskQueue;
 			default: throw new Error(`Unrecognized queue type: ${type}`);
 		}
 	}
diff --git a/packages/backend/src/core/SponsorsService.ts b/packages/backend/src/core/SponsorsService.ts
index 551768bdc9..23994b5761 100644
--- a/packages/backend/src/core/SponsorsService.ts
+++ b/packages/backend/src/core/SponsorsService.ts
@@ -61,6 +61,7 @@ export class SponsorsService {
 		}
 
 		try {
+			// TODO use HTTP service
 			const backers = await fetch(`${this.meta.donationUrl}/members/users.json`).then((response) => response.json() as Promise<Sponsor[]>);
 
 			// Merge both together into one array and make sure it only has Active subscriptions
@@ -76,6 +77,7 @@ export class SponsorsService {
 	@bindThis
 	private async fetchSharkeySponsors(): Promise<Sponsor[]> {
 		try {
+			// TODO use HTTP service
 			const backers = await fetch('https://opencollective.com/sharkey/tiers/backer/all.json').then((response) => response.json() as Promise<Sponsor[]>);
 			const sponsorsOC = await fetch('https://opencollective.com/sharkey/tiers/sponsor/all.json').then((response) => response.json() as Promise<Sponsor[]>);
 
diff --git a/packages/backend/src/daemons/QueueStatsService.ts b/packages/backend/src/daemons/QueueStatsService.ts
index 3779172517..9d2266e7e7 100644
--- a/packages/backend/src/daemons/QueueStatsService.ts
+++ b/packages/backend/src/daemons/QueueStatsService.ts
@@ -24,6 +24,7 @@ export interface StatsEntry {
 export interface Stats {
 	deliver: StatsEntry,
 	inbox: StatsEntry,
+	background: StatsEntry,
 }
 
 const ev = new Xev();
@@ -35,9 +36,11 @@ export class QueueStatsService implements OnApplicationShutdown {
 	private intervalId?: TimerHandle;
 	private activeDeliverJobs = 0;
 	private activeInboxJobs = 0;
+	private activeBackgroundJobs = 0;
 
 	private deliverQueueEvents?: Bull.QueueEvents;
 	private inboxQueueEvents?: Bull.QueueEvents;
+	private backgroundQueueEvents?: Bull.QueueEvents;
 
 	private log?: Stats[];
 
@@ -60,6 +63,11 @@ export class QueueStatsService implements OnApplicationShutdown {
 		this.activeInboxJobs++;
 	}
 
+	@bindThis
+	private onBackgroundActive() {
+		this.activeBackgroundJobs++;
+	}
+
 	@bindThis
 	private onRequestQueueStatsLog(x: { id: string, length?: number }) {
 		if (this.log) {
@@ -80,13 +88,16 @@ export class QueueStatsService implements OnApplicationShutdown {
 
 		this.deliverQueueEvents = new Bull.QueueEvents(QUEUE.DELIVER, baseQueueOptions(this.config, QUEUE.DELIVER));
 		this.inboxQueueEvents = new Bull.QueueEvents(QUEUE.INBOX, baseQueueOptions(this.config, QUEUE.INBOX));
+		this.backgroundQueueEvents = new Bull.QueueEvents(QUEUE.BACKGROUND_TASK, baseQueueOptions(this.config, QUEUE.BACKGROUND_TASK));
 
 		this.deliverQueueEvents.on('active', this.onDeliverActive);
 		this.inboxQueueEvents.on('active', this.onInboxActive);
+		this.backgroundQueueEvents.on('active', this.onBackgroundActive);
 
 		const tick = async () => {
 			const deliverJobCounts = await this.queueService.deliverQueue.getJobCounts();
 			const inboxJobCounts = await this.queueService.inboxQueue.getJobCounts();
+			const backgroundJobCounts = await this.queueService.backgroundTaskQueue.getJobCounts();
 
 			const stats = {
 				deliver: {
@@ -101,6 +112,12 @@ export class QueueStatsService implements OnApplicationShutdown {
 					waiting: inboxJobCounts.waiting,
 					delayed: inboxJobCounts.delayed,
 				},
+				background: {
+					activeSincePrevTick: this.activeBackgroundJobs,
+					active: backgroundJobCounts.active,
+					waiting: backgroundJobCounts.waiting,
+					delayed: backgroundJobCounts.delayed,
+				},
 			};
 
 			ev.emit('queueStats', stats);
@@ -112,6 +129,7 @@ export class QueueStatsService implements OnApplicationShutdown {
 
 			this.activeDeliverJobs = 0;
 			this.activeInboxJobs = 0;
+			this.activeBackgroundJobs = 0;
 		};
 
 		tick();
@@ -120,7 +138,7 @@ export class QueueStatsService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async stop() {
+	public async stop(): void {
 		if (this.intervalId) {
 			this.timeService.stopTimer(this.intervalId);
 		}
@@ -130,12 +148,20 @@ export class QueueStatsService implements OnApplicationShutdown {
 
 		this.deliverQueueEvents?.off('active', this.onDeliverActive);
 		this.inboxQueueEvents?.off('active', this.onInboxActive);
+		this.backgroundQueueEvents?.off('active', this.onBackgroundActive);
 
 		await this.deliverQueueEvents?.close();
 		await this.inboxQueueEvents?.close();
+		await this.backgroundQueueEvents?.close();
 
 		this.activeDeliverJobs = 0;
 		this.activeInboxJobs = 0;
+		this.activeBackgroundJobs = 0;
+	}
+
+	@bindThis
+	public async dispose(): void {
+		await this.stop();
 	}
 
 	@bindThis
diff --git a/packages/frontend/src/pages/admin/job-queue.vue b/packages/frontend/src/pages/admin/job-queue.vue
index 155277c976..a37c8f872b 100644
--- a/packages/frontend/src/pages/admin/job-queue.vue
+++ b/packages/frontend/src/pages/admin/job-queue.vue
@@ -204,6 +204,7 @@ const QUEUE_TYPES = [
 	'userWebhookDeliver',
 	'systemWebhookDeliver',
 	'scheduleNotePost',
+	'backgroundTask',
 ] as const;
 
 const tab: Ref<typeof QUEUE_TYPES[number] | '-'> = ref('-');
diff --git a/packages/frontend/src/widgets/WidgetJobQueue.vue b/packages/frontend/src/widgets/WidgetJobQueue.vue
index 485e532d51..7ecc663f45 100644
--- a/packages/frontend/src/widgets/WidgetJobQueue.vue
+++ b/packages/frontend/src/widgets/WidgetJobQueue.vue
@@ -47,6 +47,27 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 	</div>
+	<div class="background">
+		<div class="label">Background queue<i v-if="current.background.waiting > 0" class="ti ti-alert-triangle icon"></i></div>
+		<div class="values">
+			<div>
+				<div>Process</div>
+				<div :class="{ inc: current.background.activeSincePrevTick > prev.deliver.activeSincePrevTick, dec: current.background.activeSincePrevTick < prev.deliver.activeSincePrevTick }" :title="`${current.background.activeSincePrevTick}`">{{ kmg(current.background.activeSincePrevTick, 2) }}</div>
+			</div>
+			<div>
+				<div>Active</div>
+				<div :class="{ inc: current.background.active > prev.deliver.active, dec: current.background.active < prev.deliver.active }" :title="`${current.background.active}`">{{ kmg(current.background.active, 2) }}</div>
+			</div>
+			<div>
+				<div>Delayed</div>
+				<div :class="{ inc: current.background.delayed > prev.deliver.delayed, dec: current.background.delayed < prev.deliver.delayed }" :title="`${current.background.delayed}`">{{ kmg(current.background.delayed, 2) }}</div>
+			</div>
+			<div>
+				<div>Waiting</div>
+				<div :class="{ inc: current.background.waiting > prev.deliver.waiting, dec: current.background.waiting < prev.deliver.waiting }" :title="`${current.background.waiting}`">{{ kmg(current.background.waiting, 2) }}</div>
+			</div>
+		</div>
+	</div>
 </div>
 </template>
 
@@ -99,6 +120,12 @@ const current = reactive({
 		waiting: 0,
 		delayed: 0,
 	},
+	background: {
+		activeSincePrevTick: 0,
+		active: 0,
+		waiting: 0,
+		delayed: 0,
+	},
 });
 const prev = reactive({} as typeof current);
 const jammedAudioBuffer = ref<AudioBuffer | null>(null);
@@ -111,12 +138,12 @@ if (prefer.s['sound.masterVolume']) {
 	});
 }
 
-for (const domain of ['inbox', 'deliver']) {
+for (const domain of ['inbox', 'deliver', 'background']) {
 	prev[domain] = deepClone(current[domain]);
 }
 
 const onStats = (stats) => {
-	for (const domain of ['inbox', 'deliver']) {
+	for (const domain of ['inbox', 'deliver', 'background']) {
 		prev[domain] = deepClone(current[domain]);
 		current[domain].activeSincePrevTick = stats[domain].activeSincePrevTick;
 		current[domain].active = stats[domain].active;

From 86b8a8a734d64589b61678f92fa28a398fbd8f4f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 18 Jun 2025 01:34:38 -0400
Subject: [PATCH 003/107] use QuantumKVCache in FederatedInstanceService

---
 packages/backend/src/core/MetaService.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/backend/src/core/MetaService.ts b/packages/backend/src/core/MetaService.ts
index 68902ef539..519994e57e 100644
--- a/packages/backend/src/core/MetaService.ts
+++ b/packages/backend/src/core/MetaService.ts
@@ -16,6 +16,7 @@ import { TimeService, type TimerHandle } from '@/global/TimeService.js';
 import { MiInstance } from '@/models/Instance.js';
 import { diffArrays } from '@/misc/diff-arrays.js';
 import type { MetasRepository } from '@/models/_.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -36,6 +37,7 @@ export class MetaService implements OnApplicationShutdown {
 		private featuredService: FeaturedService,
 		private globalEventService: GlobalEventService,
 		private readonly timeService: TimeService,
+		private readonly federatedInstanceService: FederatedInstanceService,
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
@@ -156,6 +158,7 @@ export class MetaService implements OnApplicationShutdown {
 			});
 		}
 
+		await this.federatedInstanceService.syncCache(before, updated);
 		this.globalEventService.publishInternalEvent('metaUpdated', { before, after: updated });
 
 		return updated;

From ce8c8e9851de5df8153a822a146df4399ee76d20 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 18 Jun 2025 01:37:28 -0400
Subject: [PATCH 004/107] slightly reduce stalls when updating MiInstance

---
 ...50217001651-enable-instance-HOT-updates.js | 29 +++++++++++++++++++
 .../src/core/FetchInstanceMetadataService.ts  | 23 ++++++++-------
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 packages/backend/migration/1750217001651-enable-instance-HOT-updates.js

diff --git a/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js b/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js
new file mode 100644
index 0000000000..995c3ed445
--- /dev/null
+++ b/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+// https://www.cybertec-postgresql.com/en/hot-updates-in-postgresql-for-better-performance/
+
+/**
+ * @typedef {import('typeorm').MigrationInterface} MigrationInterface
+ */
+
+/**
+ * @class
+ * @implements {MigrationInterface}
+ */
+export class EnableInstanceHOTUpdates1750217001651 {
+	name = 'EnableInstanceHOTUpdates1750217001651';
+
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" SET (fillfactor = 50)`);
+
+		// Vacuum can't run inside a transaction block, so query directly from the connection.
+		await queryRunner.connection.query(`VACUUM (FULL, VERBOSE) "instance"`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" SET (fillfactor = 100)`);
+	}
+}
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 0ba61ce4f9..855ecd7553 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -132,18 +132,21 @@ export class FetchInstanceMetadataService {
 			} as Record<string, any>;
 
 			if (info) {
-				updates.softwareName = typeof info.software?.name === 'string' ? info.software.name.toLowerCase() : '?';
-				updates.softwareVersion = info.software?.version;
-				updates.openRegistrations = info.openRegistrations;
-				updates.maintainerName = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.name ?? null) : null : null;
-				updates.maintainerEmail = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.email ?? null) : null : null;
+				const softwareName = typeof info.software?.name === 'string' ? info.software.name.toLowerCase() : '?';
+				if (softwareName !== instance.softwareName) updates.softwareName = updates.softwareVersion = info.software?.version;
+				if (info.openRegistrations !== instance.openRegistrations) updates.openRegistrations = info.openRegistrations;
+				const maintainerName = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.name ?? null) : null : null;
+				if (maintainerName !== instance.maintainerName) updates.maintainerName = maintainerName;
+				const maintainerEmail = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.email ?? null) : null : null;
+				if (maintainerEmail !== instance.maintainerEmail) updates.maintainerEmail = maintainerEmail;
 			}
 
-			if (name) updates.name = name;
-			if (description) updates.description = description;
-			if (icon ?? favicon) updates.iconUrl = (icon && !icon.includes('data:image/png;base64')) ? icon : favicon;
-			if (favicon) updates.faviconUrl = favicon;
-			if (themeColor) updates.themeColor = themeColor;
+			if (name !== instance.name) updates.name = name;
+			if (description !== instance.description) updates.description = description;
+			const iconUrl = (icon && !icon.includes('data:image/png;base64')) ? icon : favicon;
+			if (iconUrl !== instance.iconUrl) updates.iconUrl = iconUrl;
+			if (favicon !== instance.faviconUrl) updates.faviconUrl = favicon;
+			if (themeColor !== instance.themeColor) updates.themeColor = themeColor;
 
 			await this.federatedInstanceService.update(instance.id, updates);
 

From 41e50eeb0ee7a3a149db6544b1d1a35e52da1a2e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 18 Jun 2025 01:53:59 -0400
Subject: [PATCH 005/107] add update-user-tags, update-note-tags, post-deliver,
 post-inbox, post-note, and check-hibernation background tasks

---
 ...1748990662839-fix-IDX_instance_host_key.js |   2 +
 ...991828473-create-IDX_note_for_timelines.js |   2 +
 ...017688-create-IDX_instance_host_filters.js |   2 +
 .../1748992128683-create-statistics.js        |   2 +
 ...1749097536193-fix-IDX_note_for_timeline.js |   2 +
 ...016885-remove-IDX_instance_host_filters.js |   2 +
 packages/backend/src/core/HashtagService.ts   |  12 +-
 .../backend/src/core/NoteCreateService.ts     |  19 +-
 packages/backend/src/core/NoteEditService.ts  |  13 +-
 packages/backend/src/core/QueueService.ts     |  87 +++++++++-
 packages/backend/src/core/ReactionService.ts  |   1 +
 .../src/core/activitypub/ApInboxService.ts    |  28 +--
 .../activitypub/models/ApPersonService.ts     |  14 +-
 .../BackgroundTaskProcessorService.ts         | 162 +++++++++++++++++-
 .../processors/DeliverProcessorService.ts     |  57 +-----
 .../queue/processors/InboxProcessorService.ts |  26 +--
 packages/backend/src/queue/types.ts           |  41 ++++-
 .../src/server/api/endpoints/i/update.ts      |   8 +-
 18 files changed, 331 insertions(+), 149 deletions(-)

diff --git a/packages/backend/migration/1748990662839-fix-IDX_instance_host_key.js b/packages/backend/migration/1748990662839-fix-IDX_instance_host_key.js
index fc6d303743..e423ecd1b6 100644
--- a/packages/backend/migration/1748990662839-fix-IDX_instance_host_key.js
+++ b/packages/backend/migration/1748990662839-fix-IDX_instance_host_key.js
@@ -4,6 +4,8 @@
  */
 
 export class FixIDXInstanceHostKey1748990662839 {
+	name = 'FixIDXInstanceHostKey1748990662839';
+
 	async up(queryRunner) {
 		// must include host for index-only scans: https://www.postgresql.org/docs/current/indexes-index-only-scans.html
 		await queryRunner.query(`DROP INDEX "public"."IDX_instance_host_key"`);
diff --git a/packages/backend/migration/1748991828473-create-IDX_note_for_timelines.js b/packages/backend/migration/1748991828473-create-IDX_note_for_timelines.js
index 2ea7fe95d2..54debcee27 100644
--- a/packages/backend/migration/1748991828473-create-IDX_note_for_timelines.js
+++ b/packages/backend/migration/1748991828473-create-IDX_note_for_timelines.js
@@ -4,6 +4,8 @@
  */
 
 export class CreateIDXNoteForTimelines1748991828473 {
+	name = 'CreateIDXNoteForTimelines1748991828473';
+
 	async up(queryRunner) {
 		await queryRunner.query(`
 			create index "IDX_note_for_timelines"
diff --git a/packages/backend/migration/1748992017688-create-IDX_instance_host_filters.js b/packages/backend/migration/1748992017688-create-IDX_instance_host_filters.js
index 76cf16a6de..24b2b1894f 100644
--- a/packages/backend/migration/1748992017688-create-IDX_instance_host_filters.js
+++ b/packages/backend/migration/1748992017688-create-IDX_instance_host_filters.js
@@ -4,6 +4,8 @@
  */
 
 export class CreateIDXInstanceHostFilters1748992017688 {
+	name = 'CreateIDXInstanceHostFilters1748992017688';
+
 	async up(queryRunner) {
 		await queryRunner.query(`
 			create index "IDX_instance_host_filters"
diff --git a/packages/backend/migration/1748992128683-create-statistics.js b/packages/backend/migration/1748992128683-create-statistics.js
index 5d08868536..daa50332ff 100644
--- a/packages/backend/migration/1748992128683-create-statistics.js
+++ b/packages/backend/migration/1748992128683-create-statistics.js
@@ -4,6 +4,8 @@
  */
 
 export class CreateStatistics1748992128683 {
+	name = 'CreateStatistics1748992128683';
+
 	async up(queryRunner) {
 		await queryRunner.query(`CREATE STATISTICS "STTS_instance_isBlocked_isBubbled" (mcv) ON "isBlocked", "isBubbled" FROM "instance"`);
 		await queryRunner.query(`CREATE STATISTICS "STTS_instance_isBlocked_isSilenced" (mcv) ON "isBlocked", "isSilenced" FROM "instance"`);
diff --git a/packages/backend/migration/1749097536193-fix-IDX_note_for_timeline.js b/packages/backend/migration/1749097536193-fix-IDX_note_for_timeline.js
index 9a651e5871..57c5579110 100644
--- a/packages/backend/migration/1749097536193-fix-IDX_note_for_timeline.js
+++ b/packages/backend/migration/1749097536193-fix-IDX_note_for_timeline.js
@@ -4,6 +4,8 @@
  */
 
 export class FixIDXNoteForTimeline1749097536193 {
+	name = 'FixIDXNoteForTimeline1749097536193';
+
 	async up(queryRunner) {
 		await queryRunner.query('drop index "IDX_note_for_timelines"');
 		await queryRunner.query(`
diff --git a/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js b/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js
index d0a4e4f91e..4236399a6e 100644
--- a/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js
+++ b/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js
@@ -4,6 +4,8 @@
  */
 
 export class RemoveIDXInstanceHostFilters1749267016885 {
+	name = 'RemoveIDXInstanceHostFilters1749267016885';
+
 	async up(queryRunner) {
 		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_instance_host_filters"`);
 	}
diff --git a/packages/backend/src/core/HashtagService.ts b/packages/backend/src/core/HashtagService.ts
index 0035c4b0d5..b9945d34b3 100644
--- a/packages/backend/src/core/HashtagService.ts
+++ b/packages/backend/src/core/HashtagService.ts
@@ -59,7 +59,7 @@ export class HashtagService {
 		tag = normalizeForSearch(tag);
 
 		// TODO: サンプリング
-		this.updateHashtagsRanking(tag, user.id);
+		await this.updateHashtagsRanking(tag, user.id);
 
 		const index = await this.hashtagsRepository.findOneBy({ name: tag });
 
@@ -119,11 +119,11 @@ export class HashtagService {
 
 			if (Object.keys(set).length > 0) {
 				q.set(set);
-				q.execute();
+				await q.execute();
 			}
 		} else {
 			if (isUserAttached) {
-				this.hashtagsRepository.insert({
+				await this.hashtagsRepository.insert({
 					id: this.idService.gen(),
 					name: tag,
 					mentionedUserIds: [],
@@ -140,7 +140,7 @@ export class HashtagService {
 					attachedRemoteUsersCount: isRemoteUser(user) ? 1 : 0,
 				} as MiHashtag);
 			} else {
-				this.hashtagsRepository.insert({
+				await this.hashtagsRepository.insert({
 					id: this.idService.gen(),
 					name: tag,
 					mentionedUserIds: [user.id],
@@ -174,7 +174,7 @@ export class HashtagService {
 		const exist = await this.redisClient.sismember(`hashtagUsers:${hashtag}`, userId);
 		if (exist === 1) return;
 
-		this.featuredService.updateHashtagsRanking(hashtag, 1);
+		await this.featuredService.updateHashtagsRanking(hashtag, 1);
 
 		const redisPipeline = this.redisClient.pipeline();
 
@@ -193,7 +193,7 @@ export class HashtagService {
 			'NX', // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
 		);
 
-		redisPipeline.exec();
+		await redisPipeline.exec();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index fd55c33bfb..484f7e01d0 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -458,10 +458,10 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		const note = await this.insertNote(user, data, tags, emojis, mentionedUsers);
 
-		setImmediate('post created', { signal: this.#shutdownController.signal }).then(
-			() => this.postNoteCreated(note, user, data, silent, tags!, mentionedUsers!),
-			() => { /* aborted, ignore this */ },
-		);
+		// Update the Latest Note index / following feed
+		this.latestNoteService.handleCreatedNoteBG(note);
+
+		await this.queueService.createPostNoteJob(note.id, silent, 'create');
 
 		return note;
 	}
@@ -577,7 +577,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private async postNoteCreated(note: MiNote, user: MiUser & {
+	public async postNoteCreated(note: MiNote, user: MiUser & {
 		id: MiUser['id'];
 		username: MiUser['username'];
 		host: MiUser['host'];
@@ -606,7 +606,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		// ハッシュタグ更新
 		if (data.visibility === 'public' || data.visibility === 'home') {
 			if (!user.isBot || this.meta.enableBotTrending) {
-				this.hashtagService.updateHashtags(user, tags);
+				await this.queueService.createUpdateNoteTagsJob(note.id);
 			}
 		}
 
@@ -807,9 +807,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 		}
 
-		// Update the Latest Note index / following feed
-		this.latestNoteService.handleCreatedNoteBG(note);
-
 		// Register to search database
 		if (!user.noindex) this.index(note);
 	}
@@ -1100,8 +1097,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		// Instance cannot quote
 		if (user.host) {
-			const instance = await this.federatedInstanceService.fetch(user.host);
-			if (instance?.rejectQuotes) {
+			const instance = await this.federatedInstanceService.fetchOrRegister(user.host);
+			if (instance.rejectQuotes) {
 				(data as Option).renote = null;
 				(data.processErrors ??= []).push('quoteUnavailable');
 			}
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 20afc4e63c..21991e2966 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -588,10 +588,10 @@ export class NoteEditService implements OnApplicationShutdown {
 			// Re-fetch note to get the default values of null / unset fields.
 			const edited = await this.notesRepository.findOneByOrFail({ id: note.id });
 
-			setImmediate('post edited', { signal: this.#shutdownController.signal }).then(
-				() => this.postNoteEdited(edited, oldnote, user, data, silent, tags!, mentionedUsers!),
-				() => { /* aborted, ignore this */ },
-			);
+			// Update the Latest Note index / following feed
+			this.latestNoteService.handleUpdatedNoteBG(edited, oldnote);
+
+			await this.queueService.createPostNoteJob(note.id, silent, 'edit');
 
 			return edited;
 		} else {
@@ -600,7 +600,7 @@ export class NoteEditService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private async postNoteEdited(note: MiNote, oldNote: MiNote, user: MiUser & {
+	public async postNoteEdited(note: MiNote, user: MiUser & {
 		id: MiUser['id'];
 		username: MiUser['username'];
 		host: MiUser['host'];
@@ -754,9 +754,6 @@ export class NoteEditService implements OnApplicationShutdown {
 			});
 		}
 
-		// Update the Latest Note index / following feed
-		this.latestNoteService.handleUpdatedNoteBG(oldNote, note);
-
 		// Register to search database
 		if (!user.noindex) this.index(note);
 	}
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 15c50e4d83..98b4d6cd8c 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -853,7 +853,6 @@ export class QueueService implements OnModuleInit {
 			},
 			{
 				id: `update-user:${userId}`,
-				// ttl: 1000 * 60 * 60 * 24,
 			},
 		);
 	}
@@ -868,7 +867,6 @@ export class QueueService implements OnModuleInit {
 			},
 			{
 				id: `update-featured:${userId}`,
-				// ttl: 1000 * 60 * 60 * 24,
 			},
 		);
 	}
@@ -883,12 +881,93 @@ export class QueueService implements OnModuleInit {
 			},
 			{
 				id: `update-instance:${host}`,
-				// ttl: 1000 * 60 * 60 * 24,
 			},
 		);
 	}
 
-	private async createBackgroundTask(name: string, data: BackgroundTaskJobData, duplication: { id: string, ttl?: number }) {
+	@bindThis
+	public async createPostDeliverJob(host: string, result: 'success' | 'temp-fail' | 'perm-fail') {
+		return await this.createBackgroundTask(
+			'post-deliver',
+			{
+				type: 'post-deliver',
+				host,
+				result,
+			},
+		);
+	}
+
+	@bindThis
+	public async createPostInboxJob(host: string) {
+		return await this.createBackgroundTask(
+			'post-inbox',
+			{
+				type: 'post-inbox',
+				host,
+			},
+		);
+	}
+
+	@bindThis
+	public async createPostNoteJob(noteId: string, silent: boolean, type: 'create' | 'edit') {
+		return await this.createBackgroundTask(
+			'post-note',
+			{
+				type: 'post-note',
+				noteId,
+				silent,
+				edit: type === 'edit',
+			},
+			{
+				id: `post-note:${noteId}:${type}`,
+			},
+		);
+	}
+
+	@bindThis
+	public async createCheckHibernationJob(userId: string) {
+		return await this.createBackgroundTask(
+			'check-hibernation',
+			{
+				type: 'check-hibernation',
+				userId,
+			},
+			{
+				id: `check-hibernation:${userId}`,
+				ttl: 1000 * 60 * 60 * 24, // This is a very heavy task, so only run once per day per user
+			},
+		);
+	}
+
+	@bindThis
+	public async createUpdateUserTagsJob(userId: string) {
+		return await this.createBackgroundTask(
+			'update-user-tags',
+			{
+				type: 'update-user-tags',
+				userId,
+			},
+			{
+				id: `update-user-tags:${userId}`,
+			},
+		);
+	}
+
+	@bindThis
+	public async createUpdateNoteTagsJob(noteId: string) {
+		return await this.createBackgroundTask(
+			'update-note-tags',
+			{
+				type: 'update-note-tags',
+				noteId,
+			},
+			{
+				id: `update-note-tags:${noteId}`,
+			},
+		);
+	}
+
+	private async createBackgroundTask(name: string, data: BackgroundTaskJobData, duplication?: { id: string, ttl?: number }) {
 		return await this.backgroundTaskQueue.add(
 			name,
 			data,
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index d3ab48e3ff..27a6d7b514 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -340,6 +340,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
+		// TODO update caches
 		this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index 309259120d..de37944344 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -33,10 +33,6 @@ import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { fromTuple } from '@/misc/from-tuple.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
-import InstanceChart from '@/core/chart/charts/instance.js';
-import FederationChart from '@/core/chart/charts/federation.js';
-import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
-import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { CacheService } from '@/core/CacheService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { TimeService } from '@/global/TimeService.js';
@@ -97,10 +93,6 @@ export class ApInboxService {
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private readonly federatedInstanceService: FederatedInstanceService,
-		private readonly fetchInstanceMetadataService: FetchInstanceMetadataService,
-		private readonly instanceChart: InstanceChart,
-		private readonly federationChart: FederationChart,
-		private readonly updateInstanceQueue: UpdateInstanceQueue,
 		private readonly cacheService: CacheService,
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly timeService: TimeService,
@@ -423,25 +415,7 @@ export class ApInboxService {
 		}
 
 		// Update stats (adapted from InboxProcessorService)
-		this.federationChart.inbox(actor.host).then();
-		process.nextTick(async () => {
-			const i = await (this.meta.enableStatsForFederatedInstances
-				? this.federatedInstanceService.fetchOrRegister(actor.host)
-				: this.federatedInstanceService.fetch(actor.host));
-
-			if (i == null) return;
-
-			this.updateInstanceQueue.enqueue(i.id, {
-				latestRequestReceivedAt: this.timeService.date,
-				shouldUnsuspend: i.suspensionState === 'autoSuspendedForNotResponding',
-			});
-
-			if (this.meta.enableChartsForFederatedInstances) {
-				this.instanceChart.requestReceived(i.host).then();
-			}
-
-			await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
-		});
+		await this.queueService.createPostInboxJob(actor.host);
 
 		// Process it!
 		try {
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 096480047f..f153d51c9d 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -585,9 +585,6 @@ export class ApPersonService implements OnModuleInit {
 
 		this.usersChart.update(user, true);
 
-		// ハッシュタグ更新
-		this.hashtagService.updateUsertags(user, tags);
-
 		//#region アバターとヘッダー画像をフェッチ
 		try {
 			const updates = await this.resolveAvatarAndBanner(user, person.icon, person.image, person.backgroundUrl);
@@ -604,6 +601,9 @@ export class ApPersonService implements OnModuleInit {
 		}
 		//#endregion
 
+		// ハッシュタグ更新
+		await this.queueService.createUpdateUserTagsJob(user.id);
+
 		await this.updateFeaturedLazy(user);
 
 		return user;
@@ -811,9 +811,6 @@ export class ApPersonService implements OnModuleInit {
 
 		this.globalEventService.publishInternalEvent('remoteUserUpdated', { id: exist.id });
 
-		// ハッシュタグ更新
-		this.hashtagService.updateUsertags(exist, tags);
-
 		// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
 		if (exist.inbox !== person.inbox || exist.sharedInbox !== (person.sharedInbox ?? person.endpoints?.sharedInbox)) {
 			await this.followingsRepository.update(
@@ -827,6 +824,9 @@ export class ApPersonService implements OnModuleInit {
 			await this.cacheService.refreshFollowRelationsFor(exist.id);
 		}
 
+		// ハッシュタグ更新
+		await this.queueService.createUpdateUserTagsJob(exist.id);
+
 		await this.updateFeaturedLazy(exist);
 
 		const updated = { ...exist, ...updates };
@@ -967,7 +967,7 @@ export class ApPersonService implements OnModuleInit {
 			let td = 0;
 			for (const note of featuredNotes.filter(x => x != null)) {
 				td -= 1000;
-				transactionalEntityManager.insert(MiUserNotePining, {
+				await transactionalEntityManager.insert(MiUserNotePining, {
 					id: this.idService.gen(this.timeService.now + td),
 					userId: user.id,
 					noteId: note.id,
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index b237990a4c..341c54883e 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -5,30 +5,46 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Bull from 'bullmq';
-import { BackgroundTaskJobData, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserBackgroundTask } from '@/queue/types.js';
+import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask } from '@/queue/types.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import Logger from '@/logger.js';
-import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { DI } from '@/di-symbols.js';
-import type { Config } from '@/config.js';
 import { CacheService } from '@/core/CacheService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
-import { renderInlineError } from '@/misc/render-inline-error.js';
+import { MiMeta } from '@/models/Meta.js';
+import InstanceChart from '@/core/chart/charts/instance.js';
+import ApRequestChart from '@/core/chart/charts/ap-request.js';
+import FederationChart from '@/core/chart/charts/federation.js';
+import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
+import { NoteCreateService } from '@/core/NoteCreateService.js';
+import type { NotesRepository } from '@/models/_.js';
+import { NoteEditService } from '@/core/NoteEditService.js';
+import { HashtagService } from '@/core/HashtagService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
 	private readonly logger: Logger;
 
 	constructor(
-		@Inject(DI.config)
-		private readonly config: Config,
+		@Inject(DI.meta)
+		private readonly meta: MiMeta,
+
+		@Inject(DI.notesRepository)
+		private readonly notesRepository: NotesRepository,
 
 		private readonly apPersonService: ApPersonService,
 		private readonly cacheService: CacheService,
 		private readonly federatedInstanceService: FederatedInstanceService,
 		private readonly fetchInstanceMetadataService: FetchInstanceMetadataService,
+		private readonly instanceChart: InstanceChart,
+		private readonly apRequestChart: ApRequestChart,
+		private readonly federationChart: FederationChart,
+		private readonly updateInstanceQueue: UpdateInstanceQueue,
+		private readonly noteCreateService: NoteCreateService,
+		private readonly noteEditService: NoteEditService,
+		private readonly hashtagService: HashtagService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -40,9 +56,21 @@ export class BackgroundTaskProcessorService {
 			return await this.processUpdateUser(job.data);
 		} else if (job.data.type === 'update-featured') {
 			return await this.processUpdateFeatured(job.data);
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'update-user-tags') {
+			return await this.processUpdateUserTags(job.data);
+		} else if (job.data.type === 'update-note-tags') {
+			return await this.processUpdateNoteTags(job.data);
 		} else if (job.data.type === 'update-instance') {
 			return await this.processUpdateInstance(job.data);
+		} else if (job.data.type === 'post-deliver') {
+			return await this.processPostDeliver(job.data);
+		} else if (job.data.type === 'post-inbox') {
+			return await this.processPostInbox(job.data);
+		} else if (job.data.type === 'post-note') {
+			return await this.processPostNote(job.data);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'check-hibernation') {
+			return await this.processCheckHibernation(job.data);
 		} else {
 			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
 			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
@@ -78,10 +106,30 @@ export class BackgroundTaskProcessorService {
 		return 'ok';
 	}
 
+	private async processUpdateUserTags(task: UpdateUserTagsBackgroundTask): Promise<string> {
+		const user = await this.cacheService.findOptionalUserById(task.userId);
+		if (!user || user.isDeleted) return `Skipping update-user-tags task: user ${task.userId} has been deleted`;
+		if (user.isSuspended) return `Skipping update-user-tags task: user ${task.userId} is suspended`;
+		if (!user.uri) return `Skipping update-user-tags task: user ${task.userId} is local`;
+
+		await this.hashtagService.updateUsertags(user, user.tags);
+		return 'ok';
+	}
+
+	private async processUpdateNoteTags(task: UpdateNoteTagsBackgroundTask): Promise<string> {
+		const note = await this.notesRepository.findOneBy({ id: task.noteId });
+		if (!note) return `Skipping update-note-tags task: note ${task.noteId} has been deleted`;
+		const user = await this.cacheService.findUserById(note.userId);
+		if (user.isSuspended) return `Skipping update-note-tags task: note ${task.noteId}'s user ${note.userId} is suspended`;
+
+		await this.hashtagService.updateHashtags(user, note.tags);
+		return 'ok';
+	}
+
 	private async processUpdateInstance(task: UpdateInstanceBackgroundTask): Promise<string> {
 		const instance = await this.federatedInstanceService.fetch(task.host);
-		if (!instance) return `Skipping update-instance task: instance ${task.host} has been deleted`;
 		if (instance.isBlocked) return `Skipping update-instance task: instance ${task.host} is blocked`;
+		if (instance.suspensionState === 'goneSuspended') return `Skipping update-instance task: instance ${task.host} is gone`;
 
 		if (instance.infoUpdatedAt && Date.now() - instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-instance task: instance ${task.host} was recently updated`;
@@ -90,4 +138,102 @@ export class BackgroundTaskProcessorService {
 		await this.fetchInstanceMetadataService.fetchInstanceMetadata(instance);
 		return 'ok';
 	}
+
+	private async processPostDeliver(task: PostDeliverBackgroundTask): Promise<string> {
+		let instance = await this.federatedInstanceService.fetchOrRegister(task.host);
+		if (instance.isBlocked) return `Skipping post-deliver task: instance ${task.host} is blocked`;
+
+		const success = task.result === 'success';
+
+		// isNotResponding should be the inverse of success, because:
+		//  1. We expect success (success=true) from a responding instance (isNotResponding=false).
+		//  2. We expect failure (success=false) from a non-responding instance (isNotResponding=true).
+		// If they are equal, then we need to update the cached state.
+		const updateNotResponding = success === instance.isNotResponding;
+
+		// If we get a permanent failure, then we need to immediately suspend the instance
+		const updateGoneSuspended = task.result === 'perm-fail' && instance.suspensionState !== 'goneSuspended';
+
+		// Check if we need to auto-suspend the instance
+		const updateAutoSuspended = instance.isNotResponding && instance.notRespondingSince && instance.suspensionState === 'none' && instance.notRespondingSince.getTime() <= Date.now() - 1000 * 60 * 60 * 24 * 7;
+
+		// This is messy, but we need to minimize updates to space in Postgres blocks.
+		if (updateNotResponding || updateGoneSuspended || updateAutoSuspended) {
+			instance = await this.federatedInstanceService.update(instance.id, {
+				isNotResponding: updateNotResponding ? !success : undefined,
+				notRespondingSince: updateNotResponding ? (success ? null : new Date()) : undefined,
+				suspensionState: updateGoneSuspended
+					? 'goneSuspended'
+					: updateAutoSuspended
+						? 'autoSuspendedForNotResponding'
+						: undefined,
+			});
+		}
+
+		// Update instance metadata (deferred)
+		if (success && this.meta.enableStatsForFederatedInstances) {
+			await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(instance);
+		}
+
+		// Update charts
+		if (this.meta.enableChartsForFederatedInstances) {
+			await this.instanceChart.requestSent(task.host, success);
+		}
+		if (success) {
+			await this.apRequestChart.deliverSucc();
+		} else {
+			await this.apRequestChart.deliverFail();
+		}
+		await this.federationChart.deliverd(task.host, success);
+
+		return 'ok';
+	}
+
+	private async processPostInbox(task: PostInboxBackgroundTask): Promise<string> {
+		const instance = await this.federatedInstanceService.fetchOrRegister(task.host);
+		if (instance.isBlocked) return `Skipping post-inbox task: instance ${task.host} is blocked`;
+
+		// Update charts
+		if (this.meta.enableChartsForFederatedInstances) {
+			await this.instanceChart.requestReceived(task.host);
+		}
+		await this.apRequestChart.inbox();
+		await this.federationChart.inbox(task.host);
+
+		// Update instance metadata (deferred)
+		await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(instance);
+
+		// Unsuspend instance (deferred)
+		this.updateInstanceQueue.enqueue(instance.id, {
+			latestRequestReceivedAt: new Date(),
+			shouldUnsuspend: instance.suspensionState === 'autoSuspendedForNotResponding',
+		});
+
+		return 'ok';
+	}
+
+	private async processPostNote(task: PostNoteBackgroundTask): Promise<string> {
+		const note = await this.notesRepository.findOneBy({ id: task.noteId });
+		if (!note) return `Skipping post-note task: note ${task.noteId} has been deleted`;
+		const user = await this.cacheService.findUserById(note.userId);
+		if (user.isSuspended) return `Skipping post-note task: note ${task.noteId}'s user ${note.userId} is suspended`;
+
+		const mentionedUsers = await this.cacheService.getUsers(note.mentions);
+
+		if (task.edit) {
+			await this.noteEditService.postNoteEdited(note, user, note, task.silent, note.tags, Array.from(mentionedUsers.values()));
+		} else {
+			await this.noteCreateService.postNoteCreated(note, user, note, task.silent, note.tags, Array.from(mentionedUsers.values()));
+		}
+
+		return 'ok';
+	}
+
+	private async processCheckHibernation(task: CheckHibernationBackgroundTask): Promise<string> {
+		const followers = await this.cacheService.getNonHibernatedFollowers(task.userId);
+		if (followers.length < 1) return `Skipping check-hibernation task: user ${task.userId} has no non-hibernated followers`;
+
+		await this.noteCreateService.checkHibernation(followers);
+		return 'ok';
+	}
 }
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index 792ec4b015..7e75a2105c 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -21,6 +21,7 @@ import { StatusError } from '@/misc/status-error.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { bindThis } from '@/decorators.js';
+import { QueueService } from '@/core/QueueService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type { DeliverJobData } from '../types.js';
 
@@ -44,13 +45,14 @@ export class DeliverProcessorService {
 		private federationChart: FederationChart,
 		private queueLoggerService: QueueLoggerService,
 		private readonly timeService: TimeService,
+		private readonly queueService: QueueService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('deliver');
 	}
 
 	@bindThis
 	public async process(job: Bull.Job<DeliverJobData>): Promise<string> {
-		const { host } = new URL(job.data.to);
+		const host = this.utilityService.extractDbHost(job.data.to);
 
 		if (!this.utilityService.isFederationAllowedUri(job.data.to)) {
 			return 'skip (blocked)';
@@ -72,66 +74,19 @@ export class DeliverProcessorService {
 		try {
 			await this.apRequestService.signedPost(job.data.user, job.data.to, job.data.content, job.data.digest);
 
-			this.apRequestChart.deliverSucc();
-			this.federationChart.deliverd(host, true);
-
 			// Update instance stats
-			process.nextTick(async () => {
-				if (i == null) return;
-
-				if (i.isNotResponding) {
-					await this.federatedInstanceService.update(i.id, {
-						isNotResponding: false,
-						notRespondingSince: null,
-					});
-				}
-
-				if (this.meta.enableChartsForFederatedInstances) {
-					await this.instanceChart.requestSent(i.host, true);
-				}
-			});
+			await this.queueService.createPostDeliverJob(host, 'success');
 
 			return 'Success';
 		} catch (res) {
-			await this.apRequestChart.deliverFail();
-			await this.federationChart.deliverd(host, false);
-
 			// Update instance stats
-			this.federatedInstanceService.fetchOrRegister(host).then(i => {
-				if (!i.isNotResponding) {
-					this.federatedInstanceService.update(i.id, {
-						isNotResponding: true,
-						notRespondingSince: this.timeService.date,
-					});
-				} else if (i.notRespondingSince) {
-					// 1週間以上不通ならサスペンド
-					if (i.suspensionState === 'none' && i.notRespondingSince.getTime() <= this.timeService.now - 1000 * 60 * 60 * 24 * 7) {
-						this.federatedInstanceService.update(i.id, {
-							suspensionState: 'autoSuspendedForNotResponding',
-						});
-					}
-				} else {
-					// isNotRespondingがtrueでnotRespondingSinceがnullの場合はnotRespondingSinceをセット
-					// notRespondingSinceは新たな機能なので、それ以前のデータにはnotRespondingSinceがない場合がある
-					this.federatedInstanceService.update(i.id, {
-						notRespondingSince: this.timeService.date,
-					});
-				}
-
-				if (this.meta.enableChartsForFederatedInstances) {
-					this.instanceChart.requestSent(i.host, false);
-				}
-			});
+			const isPerm = job.data.isSharedInbox && res instanceof StatusError && res.statusCode === 410;
+			await this.queueService.createPostDeliverJob(host, isPerm ? 'perm-fail' : 'temp-fail');
 
 			if (res instanceof StatusError && !res.isRetryable) {
 				// 4xx
 				// 相手が閉鎖していることを明示しているため、配送停止する
 				if (job.data.isSharedInbox && res.statusCode === 410) {
-					this.federatedInstanceService.fetchOrRegister(host).then(i => {
-						this.federatedInstanceService.update(i.id, {
-							suspensionState: 'goneSuspended',
-						});
-					});
 					throw new Bull.UnrecoverableError(`${host} is gone`);
 				}
 				throw new Bull.UnrecoverableError(`${res.statusCode} ${res.statusMessage}`);
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 3b73e98e5c..1c7765fddf 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -30,10 +30,10 @@ import { DI } from '@/di-symbols.js';
 import { SkApInboxLog } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import { ApLogService, calculateDurationSince } from '@/core/ApLogService.js';
-import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { TimeService } from '@/global/TimeService.js';
 import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
+import { QueueService } from '@/core/QueueService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type { InboxJobData } from '../types.js';
 
@@ -66,8 +66,8 @@ export class InboxProcessorService implements OnApplicationShutdown {
 		private federationChart: FederationChart,
 		private queueLoggerService: QueueLoggerService,
 		private readonly apLogService: ApLogService,
-		private readonly updateInstanceQueue: UpdateInstanceQueue,
 		private readonly timeService: TimeService,
+		private readonly queueService: QueueService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('inbox');
 	}
@@ -258,28 +258,8 @@ export class InboxProcessorService implements OnApplicationShutdown {
 			log.authUserId = authUser.user.id;
 		}
 
-		this.apRequestChart.inbox();
-		this.federationChart.inbox(authUser.user.host);
-
 		// Update instance stats
-		process.nextTick(async () => {
-			const i = await (this.meta.enableStatsForFederatedInstances
-				? this.federatedInstanceService.fetchOrRegister(authUser.user.host)
-				: this.federatedInstanceService.fetch(authUser.user.host));
-
-			if (i == null) return;
-
-			this.updateInstanceQueue.enqueue(i.id, {
-				latestRequestReceivedAt: this.timeService.date,
-				shouldUnsuspend: i.suspensionState === 'autoSuspendedForNotResponding',
-			});
-
-			if (this.meta.enableChartsForFederatedInstances) {
-				await this.instanceChart.requestReceived(i.host);
-			}
-
-			await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
-		});
+		await this.queueService.createPostInboxJob(authUser.user.host);
 
 		// アクティビティを処理
 		try {
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 0c3d790a97..64ae679033 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -172,7 +172,13 @@ export type ScheduleNotePostJobData = {
 export type BackgroundTaskJobData =
 	UpdateUserBackgroundTask |
 	UpdateFeaturedBackgroundTask |
-	UpdateInstanceBackgroundTask;
+	UpdateUserTagsBackgroundTask |
+	UpdateNoteTagsBackgroundTask |
+	UpdateInstanceBackgroundTask |
+	PostDeliverBackgroundTask |
+	PostInboxBackgroundTask |
+	PostNoteBackgroundTask |
+	CheckHibernationBackgroundTask;
 
 export type UpdateUserBackgroundTask = {
 	type: 'update-user';
@@ -184,7 +190,40 @@ export type UpdateFeaturedBackgroundTask = {
 	userId: string;
 };
 
+export type UpdateUserTagsBackgroundTask = {
+	type: 'update-user-tags';
+	userId: string;
+};
+
+export type UpdateNoteTagsBackgroundTask = {
+	type: 'update-note-tags';
+	noteId: string;
+};
+
 export type UpdateInstanceBackgroundTask = {
 	type: 'update-instance';
 	host: string;
 };
+
+export type PostDeliverBackgroundTask = {
+	type: 'post-deliver';
+	host: string;
+	result: 'success' | 'temp-fail' | 'perm-fail';
+};
+
+export type PostInboxBackgroundTask = {
+	type: 'post-inbox';
+	host: string;
+};
+
+export type PostNoteBackgroundTask = {
+	type: 'post-note';
+	noteId: string;
+	silent: boolean;
+	edit: boolean;
+};
+
+export type CheckHibernationBackgroundTask = {
+	type: 'check-hibernation';
+	userId: string;
+};
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index b2396d93eb..fe3f180aca 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -36,6 +36,7 @@ import { notificationRecieveConfig } from '@/models/json-schema/user.js';
 import { userUnsignedFetchOptions } from '@/const.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
+import { QueueService } from '@/core/QueueService.js';
 import { ApiLoggerService } from '../../ApiLoggerService.js';
 import { ApiError } from '../../error.js';
 
@@ -318,6 +319,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private httpRequestService: HttpRequestService,
 		private avatarDecorationService: AvatarDecorationService,
 		private utilityService: UtilityService,
+		private readonly queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, _user, token) => {
 			const user = await this.usersRepository.findOneByOrFail({ id: _user.id }) as MiLocalUser;
@@ -606,9 +608,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			updates.emojis = emojis;
 			updates.tags = tags;
-
-			// ハッシュタグ更新
-			this.hashtagService.updateUsertags(user, tags);
 			//#endregion
 
 			if (Object.keys(updates).length > 0) {
@@ -639,6 +638,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// Publish meUpdated event
 			this.globalEventService.publishMainStream(user.id, 'meUpdated', iObj);
 
+			// ハッシュタグ更新
+			await this.queueService.createUpdateUserTagsJob(user.id);
+
 			// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
 			if (user.isLocked && ps.isLocked === false) {
 				await this.userFollowingService.acceptAllFollowRequests(user);

From fe25e6f3677738b3f9493ec9053881acf494f4a9 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 18 Jun 2025 22:53:04 -0400
Subject: [PATCH 006/107] remove useless async/await from charts

---
 .../src/core/chart/charts/active-users.ts     |  8 +++---
 .../src/core/chart/charts/ap-request.ts       | 12 ++++----
 .../backend/src/core/chart/charts/drive.ts    |  4 +--
 .../src/core/chart/charts/federation.ts       |  8 +++---
 .../backend/src/core/chart/charts/instance.ts | 28 +++++++++----------
 .../backend/src/core/chart/charts/notes.ts    |  4 +--
 .../src/core/chart/charts/per-user-drive.ts   |  4 +--
 .../core/chart/charts/per-user-following.ts   |  2 +-
 .../src/core/chart/charts/per-user-pv.ts      |  8 +++---
 .../core/chart/charts/per-user-reactions.ts   |  2 +-
 .../src/core/chart/charts/test-grouped.ts     |  4 +--
 .../core/chart/charts/test-intersection.ts    |  8 +++---
 .../src/core/chart/charts/test-unique.ts      |  4 +--
 .../backend/src/core/chart/charts/test.ts     |  8 +++---
 .../backend/src/core/chart/charts/users.ts    |  4 +--
 15 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/packages/backend/src/core/chart/charts/active-users.ts b/packages/backend/src/core/chart/charts/active-users.ts
index 20432fb293..4858633973 100644
--- a/packages/backend/src/core/chart/charts/active-users.ts
+++ b/packages/backend/src/core/chart/charts/active-users.ts
@@ -50,9 +50,9 @@ export default class ActiveUsersChart extends Chart<typeof schema> { // eslint-d
 	}
 
 	@bindThis
-	public async read(user: { id: MiUser['id'], host: null }): Promise<void> {
+	public read(user: { id: MiUser['id'], host: null }): void {
 		const createdAt = this.idService.parse(user.id).date;
-		await this.commit({
+		this.commit({
 			'read': [user.id],
 			'registeredWithinWeek': (this.timeService.now - createdAt.getTime() < week) ? [user.id] : [],
 			'registeredWithinMonth': (this.timeService.now - createdAt.getTime() < month) ? [user.id] : [],
@@ -64,8 +64,8 @@ export default class ActiveUsersChart extends Chart<typeof schema> { // eslint-d
 	}
 
 	@bindThis
-	public async write(user: { id: MiUser['id'], host: null }): Promise<void> {
-		await this.commit({
+	public write(user: { id: MiUser['id'], host: null }): void {
+		this.commit({
 			'write': [user.id],
 		});
 	}
diff --git a/packages/backend/src/core/chart/charts/ap-request.ts b/packages/backend/src/core/chart/charts/ap-request.ts
index 8cae5753c7..f4177955b7 100644
--- a/packages/backend/src/core/chart/charts/ap-request.ts
+++ b/packages/backend/src/core/chart/charts/ap-request.ts
@@ -43,22 +43,22 @@ export default class ApRequestChart extends Chart<typeof schema> { // eslint-dis
 	}
 
 	@bindThis
-	public async deliverSucc(): Promise<void> {
-		await this.commit({
+	public deliverSucc(): void {
+		this.commit({
 			'deliverSucceeded': 1,
 		});
 	}
 
 	@bindThis
-	public async deliverFail(): Promise<void> {
-		await this.commit({
+	public deliverFail(): void {
+		this.commit({
 			'deliverFailed': 1,
 		});
 	}
 
 	@bindThis
-	public async inbox(): Promise<void> {
-		await this.commit({
+	public inbox(): void {
+		this.commit({
 			'inboxReceived': 1,
 		});
 	}
diff --git a/packages/backend/src/core/chart/charts/drive.ts b/packages/backend/src/core/chart/charts/drive.ts
index cce07f3b5b..2818faf1cb 100644
--- a/packages/backend/src/core/chart/charts/drive.ts
+++ b/packages/backend/src/core/chart/charts/drive.ts
@@ -44,9 +44,9 @@ export default class DriveChart extends Chart<typeof schema> { // eslint-disable
 	}
 
 	@bindThis
-	public async update(file: MiDriveFile, isAdditional: boolean): Promise<void> {
+	public update(file: MiDriveFile, isAdditional: boolean): void {
 		const fileSizeKb = file.size / 1000;
-		await this.commit(file.userHost === null ? {
+		this.commit(file.userHost === null ? {
 			'local.incCount': isAdditional ? 1 : 0,
 			'local.incSize': isAdditional ? fileSizeKb : 0,
 			'local.decCount': isAdditional ? 0 : 1,
diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts
index 199c263cce..ab160128f5 100644
--- a/packages/backend/src/core/chart/charts/federation.ts
+++ b/packages/backend/src/core/chart/charts/federation.ts
@@ -118,8 +118,8 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 	}
 
 	@bindThis
-	public async deliverd(host: string, succeeded: boolean): Promise<void> {
-		await this.commit(succeeded ? {
+	public deliverd(host: string, succeeded: boolean): void {
+		this.commit(succeeded ? {
 			'deliveredInstances': [host],
 		} : {
 			'stalled': [host],
@@ -127,8 +127,8 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 	}
 
 	@bindThis
-	public async inbox(host: string): Promise<void> {
-		await this.commit({
+	public inbox(host: string): void {
+		this.commit({
 			'inboxInstances': [host],
 		});
 	}
diff --git a/packages/backend/src/core/chart/charts/instance.ts b/packages/backend/src/core/chart/charts/instance.ts
index ca6c1c5026..d3690820e8 100644
--- a/packages/backend/src/core/chart/charts/instance.ts
+++ b/packages/backend/src/core/chart/charts/instance.ts
@@ -80,31 +80,31 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 	}
 
 	@bindThis
-	public async requestReceived(host: string): Promise<void> {
-		await this.commit({
+	public requestReceived(host: string): void {
+		this.commit({
 			'requests.received': 1,
 		}, this.utilityService.toPuny(host));
 	}
 
 	@bindThis
-	public async requestSent(host: string, isSucceeded: boolean): Promise<void> {
-		await this.commit({
+	public requestSent(host: string, isSucceeded: boolean): void {
+		this.commit({
 			'requests.succeeded': isSucceeded ? 1 : 0,
 			'requests.failed': isSucceeded ? 0 : 1,
 		}, this.utilityService.toPuny(host));
 	}
 
 	@bindThis
-	public async newUser(host: string): Promise<void> {
-		await this.commit({
+	public newUser(host: string): void {
+		this.commit({
 			'users.total': 1,
 			'users.inc': 1,
 		}, this.utilityService.toPuny(host));
 	}
 
 	@bindThis
-	public async updateNote(host: string, note: MiNote, isAdditional: boolean): Promise<void> {
-		await this.commit({
+	public updateNote(host: string, note: MiNote, isAdditional: boolean): void {
+		this.commit({
 			'notes.total': isAdditional ? 1 : -1,
 			'notes.inc': isAdditional ? 1 : 0,
 			'notes.dec': isAdditional ? 0 : 1,
@@ -116,8 +116,8 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 	}
 
 	@bindThis
-	public async updateFollowing(host: string, isAdditional: boolean): Promise<void> {
-		await this.commit({
+	public updateFollowing(host: string, isAdditional: boolean): void {
+		this.commit({
 			'following.total': isAdditional ? 1 : -1,
 			'following.inc': isAdditional ? 1 : 0,
 			'following.dec': isAdditional ? 0 : 1,
@@ -125,8 +125,8 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 	}
 
 	@bindThis
-	public async updateFollowers(host: string, isAdditional: boolean): Promise<void> {
-		await this.commit({
+	public updateFollowers(host: string, isAdditional: boolean): void {
+		this.commit({
 			'followers.total': isAdditional ? 1 : -1,
 			'followers.inc': isAdditional ? 1 : 0,
 			'followers.dec': isAdditional ? 0 : 1,
@@ -134,9 +134,9 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 	}
 
 	@bindThis
-	public async updateDrive(file: MiDriveFile, isAdditional: boolean): Promise<void> {
+	public updateDrive(file: MiDriveFile, isAdditional: boolean): void {
 		const fileSizeKb = file.size / 1000;
-		await this.commit({
+		this.commit({
 			'drive.totalFiles': isAdditional ? 1 : -1,
 			'drive.incFiles': isAdditional ? 1 : 0,
 			'drive.incUsage': isAdditional ? fileSizeKb : 0,
diff --git a/packages/backend/src/core/chart/charts/notes.ts b/packages/backend/src/core/chart/charts/notes.ts
index 43cabd0b98..f8c3676009 100644
--- a/packages/backend/src/core/chart/charts/notes.ts
+++ b/packages/backend/src/core/chart/charts/notes.ts
@@ -56,10 +56,10 @@ export default class NotesChart extends Chart<typeof schema> { // eslint-disable
 	}
 
 	@bindThis
-	public async update(note: MiNote, isAdditional: boolean): Promise<void> {
+	public update(note: MiNote, isAdditional: boolean): void {
 		const prefix = note.userHost === null ? 'local' : 'remote';
 
-		await this.commit({
+		this.commit({
 			[`${prefix}.total`]: isAdditional ? 1 : -1,
 			[`${prefix}.inc`]: isAdditional ? 1 : 0,
 			[`${prefix}.dec`]: isAdditional ? 0 : 1,
diff --git a/packages/backend/src/core/chart/charts/per-user-drive.ts b/packages/backend/src/core/chart/charts/per-user-drive.ts
index 663abc5f00..b1bd7c6173 100644
--- a/packages/backend/src/core/chart/charts/per-user-drive.ts
+++ b/packages/backend/src/core/chart/charts/per-user-drive.ts
@@ -58,9 +58,9 @@ export default class PerUserDriveChart extends Chart<typeof schema> { // eslint-
 	}
 
 	@bindThis
-	public async update(file: MiDriveFile, isAdditional: boolean): Promise<void> {
+	public update(file: MiDriveFile, isAdditional: boolean): void {
 		const fileSizeKb = file.size / 1000;
-		await this.commit({
+		this.commit({
 			'totalCount': isAdditional ? 1 : -1,
 			'totalSize': isAdditional ? fileSizeKb : -fileSizeKb,
 			'incCount': isAdditional ? 1 : 0,
diff --git a/packages/backend/src/core/chart/charts/per-user-following.ts b/packages/backend/src/core/chart/charts/per-user-following.ts
index 71678b0573..05e971616a 100644
--- a/packages/backend/src/core/chart/charts/per-user-following.ts
+++ b/packages/backend/src/core/chart/charts/per-user-following.ts
@@ -70,7 +70,7 @@ export default class PerUserFollowingChart extends Chart<typeof schema> { // esl
 	}
 
 	@bindThis
-	public async update(follower: { id: MiUser['id']; host: MiUser['host']; }, followee: { id: MiUser['id']; host: MiUser['host']; }, isFollow: boolean): Promise<void> {
+	public update(follower: { id: MiUser['id']; host: MiUser['host']; }, followee: { id: MiUser['id']; host: MiUser['host']; }, isFollow: boolean): void {
 		const prefixFollower = this.userEntityService.isLocalUser(follower) ? 'local' : 'remote';
 		const prefixFollowee = this.userEntityService.isLocalUser(followee) ? 'local' : 'remote';
 
diff --git a/packages/backend/src/core/chart/charts/per-user-pv.ts b/packages/backend/src/core/chart/charts/per-user-pv.ts
index 75a61aae07..272bc9180b 100644
--- a/packages/backend/src/core/chart/charts/per-user-pv.ts
+++ b/packages/backend/src/core/chart/charts/per-user-pv.ts
@@ -44,16 +44,16 @@ export default class PerUserPvChart extends Chart<typeof schema> { // eslint-dis
 	}
 
 	@bindThis
-	public async commitByUser(user: { id: MiUser['id'] }, key: string): Promise<void> {
-		await this.commit({
+	public commitByUser(user: { id: MiUser['id'] }, key: string): void {
+		this.commit({
 			'upv.user': [key],
 			'pv.user': 1,
 		}, user.id);
 	}
 
 	@bindThis
-	public async commitByVisitor(user: { id: MiUser['id'] }, key: string): Promise<void> {
-		await this.commit({
+	public commitByVisitor(user: { id: MiUser['id'] }, key: string): void {
+		this.commit({
 			'upv.visitor': [key],
 			'pv.visitor': 1,
 		}, user.id);
diff --git a/packages/backend/src/core/chart/charts/per-user-reactions.ts b/packages/backend/src/core/chart/charts/per-user-reactions.ts
index 9fb78a28e9..89f6567f50 100644
--- a/packages/backend/src/core/chart/charts/per-user-reactions.ts
+++ b/packages/backend/src/core/chart/charts/per-user-reactions.ts
@@ -47,7 +47,7 @@ export default class PerUserReactionsChart extends Chart<typeof schema> { // esl
 	}
 
 	@bindThis
-	public async update(user: { id: MiUser['id'], host: MiUser['host'] }, note: MiNote): Promise<void> {
+	public update(user: { id: MiUser['id'], host: MiUser['host'] }, note: MiNote): void {
 		const prefix = this.userEntityService.isLocalUser(user) ? 'local' : 'remote';
 		this.commit({
 			[`${prefix}.count`]: 1,
diff --git a/packages/backend/src/core/chart/charts/test-grouped.ts b/packages/backend/src/core/chart/charts/test-grouped.ts
index 6cc48d483d..186e056efc 100644
--- a/packages/backend/src/core/chart/charts/test-grouped.ts
+++ b/packages/backend/src/core/chart/charts/test-grouped.ts
@@ -48,12 +48,12 @@ export default class TestGroupedChart extends Chart<typeof schema> { // eslint-d
 	}
 
 	@bindThis
-	public async increment(group: string): Promise<void> {
+	public increment(group: string): void {
 		if (this.total[group] == null) this.total[group] = 0;
 
 		this.total[group]++;
 
-		await this.commit({
+		this.commit({
 			'foo.total': 1,
 			'foo.inc': 1,
 		}, group);
diff --git a/packages/backend/src/core/chart/charts/test-intersection.ts b/packages/backend/src/core/chart/charts/test-intersection.ts
index d0ae1dab24..f84d498d52 100644
--- a/packages/backend/src/core/chart/charts/test-intersection.ts
+++ b/packages/backend/src/core/chart/charts/test-intersection.ts
@@ -44,15 +44,15 @@ export default class TestIntersectionChart extends Chart<typeof schema> { // esl
 	}
 
 	@bindThis
-	public async addA(key: string): Promise<void> {
-		await this.commit({
+	public addA(key: string): void {
+		this.commit({
 			a: [key],
 		});
 	}
 
 	@bindThis
-	public async addB(key: string): Promise<void> {
-		await this.commit({
+	public addB(key: string): void {
+		this.commit({
 			b: [key],
 		});
 	}
diff --git a/packages/backend/src/core/chart/charts/test-unique.ts b/packages/backend/src/core/chart/charts/test-unique.ts
index 54a081fe2a..10a7e0dad2 100644
--- a/packages/backend/src/core/chart/charts/test-unique.ts
+++ b/packages/backend/src/core/chart/charts/test-unique.ts
@@ -44,8 +44,8 @@ export default class TestUniqueChart extends Chart<typeof schema> { // eslint-di
 	}
 
 	@bindThis
-	public async uniqueIncrement(key: string): Promise<void> {
-		await this.commit({
+	public uniqueIncrement(key: string): void {
+		this.commit({
 			foo: [key],
 		});
 	}
diff --git a/packages/backend/src/core/chart/charts/test.ts b/packages/backend/src/core/chart/charts/test.ts
index e95259f3b2..b281d50e67 100644
--- a/packages/backend/src/core/chart/charts/test.ts
+++ b/packages/backend/src/core/chart/charts/test.ts
@@ -48,20 +48,20 @@ export default class TestChart extends Chart<typeof schema> { // eslint-disable-
 	}
 
 	@bindThis
-	public async increment(): Promise<void> {
+	public increment(): void {
 		this.total++;
 
-		await this.commit({
+		this.commit({
 			'foo.total': 1,
 			'foo.inc': 1,
 		});
 	}
 
 	@bindThis
-	public async decrement(): Promise<void> {
+	public decrement(): void {
 		this.total--;
 
-		await this.commit({
+		this.commit({
 			'foo.total': -1,
 			'foo.dec': 1,
 		});
diff --git a/packages/backend/src/core/chart/charts/users.ts b/packages/backend/src/core/chart/charts/users.ts
index 91bf972371..ca5e58f07b 100644
--- a/packages/backend/src/core/chart/charts/users.ts
+++ b/packages/backend/src/core/chart/charts/users.ts
@@ -61,10 +61,10 @@ export default class UsersChart extends Chart<typeof schema> { // eslint-disable
 	}
 
 	@bindThis
-	public async update(user: { id: MiUser['id'], host: MiUser['host'] }, isAdditional: boolean): Promise<void> {
+	public update(user: { id: MiUser['id'], host: MiUser['host'] }, isAdditional: boolean): void {
 		const prefix = this.userEntityService.isLocalUser(user) ? 'local' : 'remote';
 
-		await this.commit({
+		this.commit({
 			[`${prefix}.total`]: isAdditional ? 1 : -1,
 			[`${prefix}.inc`]: isAdditional ? 1 : 0,
 			[`${prefix}.dec`]: isAdditional ? 0 : 1,

From 9c1208b6caee2cf746b86a2737d21b09fb425ccf Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 18 Jun 2025 22:55:56 -0400
Subject: [PATCH 007/107] implement delete-file background task

---
 packages/backend/src/core/QueueService.ts     | 17 +++++++++++
 .../BackgroundTaskProcessorService.ts         | 30 +++++++++++++++++--
 packages/backend/src/queue/types.ts           | 10 ++++++-
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 98b4d6cd8c..16b43ce4f7 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -44,6 +44,7 @@ import type {
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
+import type { MiUser } from '@/models/User.js';
 
 export const QUEUE_TYPES = [
 	'system',
@@ -967,6 +968,22 @@ export class QueueService implements OnModuleInit {
 		);
 	}
 
+	@bindThis
+	public async createDeleteFileJob(fileId: string, isExpired?: boolean, deleterId?: string) {
+		return await this.createBackgroundTask(
+			'delete-file',
+			{
+				type: 'delete-file',
+				fileId,
+				isExpired,
+				deleterId,
+			},
+			{
+				id: `delete-file:${fileId}`,
+			},
+		);
+	}
+
 	private async createBackgroundTask(name: string, data: BackgroundTaskJobData, duplication?: { id: string, ttl?: number }) {
 		return await this.backgroundTaskQueue.add(
 			name,
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 341c54883e..721e28a73d 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Bull from 'bullmq';
-import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask } from '@/queue/types.js';
+import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask } from '@/queue/types.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import Logger from '@/logger.js';
@@ -19,9 +19,11 @@ import ApRequestChart from '@/core/chart/charts/ap-request.js';
 import FederationChart from '@/core/chart/charts/federation.js';
 import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
-import type { NotesRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NotesRepository } from '@/models/_.js';
+import { MiUser } from '@/models/_.js';
 import { NoteEditService } from '@/core/NoteEditService.js';
 import { HashtagService } from '@/core/HashtagService.js';
+import { DriveService } from '@/core/DriveService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -34,6 +36,9 @@ export class BackgroundTaskProcessorService {
 		@Inject(DI.notesRepository)
 		private readonly notesRepository: NotesRepository,
 
+		@Inject(DI.driveFilesRepository)
+		private readonly driveFilesRepository: DriveFilesRepository,
+
 		private readonly apPersonService: ApPersonService,
 		private readonly cacheService: CacheService,
 		private readonly federatedInstanceService: FederatedInstanceService,
@@ -45,6 +50,7 @@ export class BackgroundTaskProcessorService {
 		private readonly noteCreateService: NoteCreateService,
 		private readonly noteEditService: NoteEditService,
 		private readonly hashtagService: HashtagService,
+		private readonly driveService: DriveService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -68,9 +74,11 @@ export class BackgroundTaskProcessorService {
 			return await this.processPostInbox(job.data);
 		} else if (job.data.type === 'post-note') {
 			return await this.processPostNote(job.data);
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (job.data.type === 'check-hibernation') {
 			return await this.processCheckHibernation(job.data);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'delete-file') {
+			return await this.processDeleteFile(job.data);
 		} else {
 			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
 			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
@@ -236,4 +244,20 @@ export class BackgroundTaskProcessorService {
 		await this.noteCreateService.checkHibernation(followers);
 		return 'ok';
 	}
+
+	private async processDeleteFile(task: DeleteFileBackgroundTask): Promise<string> {
+		const file = await this.driveFilesRepository.findOneBy({ id: task.fileId });
+		if (!file) return `Skipping delete-file task: file ${task.fileId} has been deleted`;
+
+		let deleter: MiUser | undefined = undefined;
+		if (task.deleterId) {
+			deleter = await this.cacheService.findOptionalUserById(task.deleterId);
+			if (!deleter) {
+				this.logger.warn(`[delete-file] Deleting user ${task.deleterId} has been deleted; proceeding with null deleter`);
+			}
+		}
+
+		await this.driveService.deleteFileSync(file, task.isExpired, deleter);
+		return 'ok';
+	}
 }
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 64ae679033..7f7f1b8a74 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -178,7 +178,8 @@ export type BackgroundTaskJobData =
 	PostDeliverBackgroundTask |
 	PostInboxBackgroundTask |
 	PostNoteBackgroundTask |
-	CheckHibernationBackgroundTask;
+	CheckHibernationBackgroundTask |
+	DeleteFileBackgroundTask;
 
 export type UpdateUserBackgroundTask = {
 	type: 'update-user';
@@ -227,3 +228,10 @@ export type CheckHibernationBackgroundTask = {
 	type: 'check-hibernation';
 	userId: string;
 };
+
+export type DeleteFileBackgroundTask = {
+	type: 'delete-file';
+	fileId: string;
+	isExpired?: boolean;
+	deleterId?: string;
+};

From 7934643090dddc2973e7625e411561325af1a64e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 18 Jun 2025 22:56:46 -0400
Subject: [PATCH 008/107] use delete-file task for async file deletions

---
 packages/backend/src/core/DriveService.ts | 40 +++++------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index 94289f237d..468c63a9cc 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -470,7 +470,7 @@ export class DriveService {
 		for (const fileId of exceedFileIds) {
 			const file = await this.driveFilesRepository.findOneBy({ id: fileId });
 			if (file == null) continue;
-			this.deleteFile(file, true);
+			await this.deleteFile(file, true);
 		}
 	}
 
@@ -718,14 +718,14 @@ export class DriveService {
 			if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive) {
 				const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
 				if (values.isSensitive) {
-					this.moderationLogService.log(updater, 'markSensitiveDriveFile', {
+					await this.moderationLogService.log(updater, 'markSensitiveDriveFile', {
 						fileId: file.id,
 						fileUserId: file.userId,
 						fileUserUsername: user?.username ?? null,
 						fileUserHost: user?.host ?? null,
 					});
 				} else {
-					this.moderationLogService.log(updater, 'unmarkSensitiveDriveFile', {
+					await this.moderationLogService.log(updater, 'unmarkSensitiveDriveFile', {
 						fileId: file.id,
 						fileUserId: file.userId,
 						fileUserUsername: user?.username ?? null,
@@ -739,30 +739,8 @@ export class DriveService {
 	}
 
 	@bindThis
-	public async deleteFile(file: MiDriveFile, isExpired = false, deleter?: { id: string }) {
-		if (file.storedInternal) {
-			this.deleteLocalFile(file.accessKey!);
-
-			if (file.thumbnailUrl) {
-				this.deleteLocalFile(file.thumbnailAccessKey!);
-			}
-
-			if (file.webpublicUrl) {
-				this.deleteLocalFile(file.webpublicAccessKey!);
-			}
-		} else if (!file.isLink) {
-			this.queueService.createDeleteObjectStorageFileJob(file.accessKey!);
-
-			if (file.thumbnailUrl) {
-				this.queueService.createDeleteObjectStorageFileJob(file.thumbnailAccessKey!);
-			}
-
-			if (file.webpublicUrl) {
-				this.queueService.createDeleteObjectStorageFileJob(file.webpublicAccessKey!);
-			}
-		}
-
-		this.deletePostProcess(file, isExpired, deleter);
+	public async deleteFile(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
+		await this.queueService.createDeleteFileJob(file.id, isExpired, deleter?.id);
 	}
 
 	@bindThis
@@ -793,14 +771,14 @@ export class DriveService {
 
 		await Promise.all(promises);
 
-		this.deletePostProcess(file, isExpired, deleter);
+		await this.deletePostProcess(file, isExpired, deleter);
 	}
 
 	@bindThis
 	private async deletePostProcess(file: MiDriveFile, isExpired = false, deleter?: { id: string }) {
 		// リモートファイル期限切れ削除後は直リンクにする
 		if (isExpired && file.userHost !== null && file.uri != null) {
-			this.driveFilesRepository.update(file.id, {
+			await this.driveFilesRepository.update(file.id, {
 				isLink: true,
 				url: file.uri,
 				thumbnailUrl: null,
@@ -812,7 +790,7 @@ export class DriveService {
 				webpublicAccessKey: 'webpublic-' + randomUUID(),
 			});
 		} else {
-			this.driveFilesRepository.delete(file.id);
+			await this.driveFilesRepository.delete(file.id);
 		}
 
 		this.driveChart.update(file, false);
@@ -831,7 +809,7 @@ export class DriveService {
 
 		if (deleter && await this.roleService.isModerator(deleter) && (file.userId !== deleter.id)) {
 			const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
-			this.moderationLogService.log(deleter, 'deleteDriveFile', {
+			await this.moderationLogService.log(deleter, 'deleteDriveFile', {
 				fileId: file.id,
 				fileUserId: file.userId,
 				fileUserUsername: user?.username ?? null,

From 8e75d6149ec24e99dd6ba188143c6000c4582cc8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:16:19 -0400
Subject: [PATCH 009/107] fix stall in EnableInstanceHOTUpdates1750217001651
 migration

---
 .../migration/1750217001651-enable-instance-HOT-updates.js     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js b/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js
index 995c3ed445..12b5f65ac2 100644
--- a/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js
+++ b/packages/backend/migration/1750217001651-enable-instance-HOT-updates.js
@@ -18,9 +18,6 @@ export class EnableInstanceHOTUpdates1750217001651 {
 
 	async up(queryRunner) {
 		await queryRunner.query(`ALTER TABLE "instance" SET (fillfactor = 50)`);
-
-		// Vacuum can't run inside a transaction block, so query directly from the connection.
-		await queryRunner.connection.query(`VACUUM (FULL, VERBOSE) "instance"`);
 	}
 
 	async down(queryRunner) {

From a4440e43a6f5e4843420f58530d6b039a33e5050 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:38:03 -0400
Subject: [PATCH 010/107] add UpdateLatestNote, PostSuspend, and PostUnsuspend
 background tasks

---
 .../1750353421706-more-note_edit-columns.js   |  75 +++++++++
 .../backend/src/core/LatestNoteService.ts     |  50 +++---
 .../backend/src/core/NoteCreateService.ts     |  66 ++++----
 .../backend/src/core/NoteDeleteService.ts     |  14 +-
 packages/backend/src/core/NoteEditService.ts  | 147 +++++++++--------
 packages/backend/src/core/QueueService.ts     | 152 ++++++------------
 .../backend/src/core/UserSuspendService.ts    |  30 ++--
 packages/backend/src/misc/is-renote.ts        | 101 ++++++++++--
 packages/backend/src/models/LatestNote.ts     |   6 +-
 packages/backend/src/models/NoteEdit.ts       |  62 ++++++-
 .../BackgroundTaskProcessorService.ts         |  77 ++++++++-
 packages/backend/src/queue/types.ts           |  21 ++-
 12 files changed, 512 insertions(+), 289 deletions(-)
 create mode 100644 packages/backend/migration/1750353421706-more-note_edit-columns.js

diff --git a/packages/backend/migration/1750353421706-more-note_edit-columns.js b/packages/backend/migration/1750353421706-more-note_edit-columns.js
new file mode 100644
index 0000000000..3bc24b1acc
--- /dev/null
+++ b/packages/backend/migration/1750353421706-more-note_edit-columns.js
@@ -0,0 +1,75 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class MoreNoteEditColumns1750353421706 {
+	name = 'MoreNoteEditColumns1750353421706'
+
+	async up(queryRunner) {
+		// Update column types
+		await queryRunner.query(`ALTER TABLE "note_edit" ALTER COLUMN "cw" TYPE text USING "cw"::text`);
+
+		// Rename columns
+		await queryRunner.query(`ALTER TABLE "note_edit" RENAME COLUMN "oldText" TO "text"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" RENAME COLUMN "cw" TO "newCw"`);
+
+		// Add new fields
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD "userId" character varying(32)`);
+		await queryRunner.query(`COMMENT ON COLUMN "note_edit"."userId" IS 'The ID of author.'`);
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD CONSTRAINT "FK_7f1ded0f6e8a5bef701b7e698ab" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD "renoteId" character varying(32)`);
+		await queryRunner.query(`COMMENT ON COLUMN "note_edit"."renoteId" IS 'The ID of renote target. Will always be null for older edits'`);
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD CONSTRAINT "FK_d3003e5256bcbfad6c3588835c0" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD "replyId" character varying(32)`);
+		await queryRunner.query(`COMMENT ON COLUMN "note_edit"."replyId" IS 'The ID of reply target. Will always be null for older edits'`);
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD CONSTRAINT "FK_f34b53ab9b39774ca014972ad84" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD "visibility" "public"."note_visibility_enum"`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD "cw" text`);
+		await queryRunner.query(`COMMENT ON COLUMN "note_edit"."cw" IS 'Will always be null for older edits'`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" ADD "hasPoll" boolean NOT NULL DEFAULT false`);
+		await queryRunner.query(`COMMENT ON COLUMN "note_edit"."hasPoll" IS 'Whether this revision had a poll. Will always be false for older edits'`);
+
+		// Populate non-nullable fields
+		await queryRunner.query(`
+			UPDATE "note_edit" "e"
+			SET
+				"visibility" = "n"."visibility",
+				"userId" = "n"."userId"
+			FROM "note" "n"
+			WHERE "n"."id" = "e"."noteId"
+		`);
+		await queryRunner.query(`ALTER TABLE "note_edit" ALTER COLUMN "visibility" SET NOT NULL`);
+		await queryRunner.query(`ALTER TABLE "note_edit" ALTER COLUMN "userId" SET NOT NULL`);
+	}
+
+	async down(queryRunner) {
+		// Drop new columns
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "visibility"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "hasPoll"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "cw"`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "userId"`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP CONSTRAINT "FK_f34b53ab9b39774ca014972ad84"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "replyId"`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP CONSTRAINT "FK_d3003e5256bcbfad6c3588835c0"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "renoteId"`);
+
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP CONSTRAINT "FK_7f1ded0f6e8a5bef701b7e698ab"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "userId"`);
+
+		// Rename new columns
+		await queryRunner.query(`ALTER TABLE "note_edit" RENAME COLUMN "text" TO "oldText"`);
+		await queryRunner.query(`ALTER TABLE "note_edit" RENAME COLUMN "newCw" TO "cw"`);
+
+		// Revert column types
+		await queryRunner.query(`ALTER TABLE "note_edit" ALTER COLUMN "cw" TYPE varchar(512) USING "cw"::varchar(512)`);
+	}
+}
diff --git a/packages/backend/src/core/LatestNoteService.ts b/packages/backend/src/core/LatestNoteService.ts
index 63f973c6c6..e714b50320 100644
--- a/packages/backend/src/core/LatestNoteService.ts
+++ b/packages/backend/src/core/LatestNoteService.ts
@@ -1,18 +1,14 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Not } from 'typeorm';
-import { MiNote } from '@/models/Note.js';
-import { isPureRenote } from '@/misc/is-renote.js';
+import { isPureRenote, MinimalNote } from '@/misc/is-renote.js';
 import { SkLatestNote } from '@/models/LatestNote.js';
 import { DI } from '@/di-symbols.js';
-import type { LatestNotesRepository, NotesRepository } from '@/models/_.js';
-import { LoggerService } from '@/core/LoggerService.js';
-import Logger from '@/logger.js';
-import { QueryService } from './QueryService.js';
+import type { LatestNotesRepository, MiNote, NotesRepository } from '@/models/_.js';
+import { QueryService } from '@/core/QueryService.js';
+import { QueueService } from '@/core/QueueService.js';
 
 @Injectable()
 export class LatestNoteService {
-	private readonly logger: Logger;
-
 	constructor(
 		@Inject(DI.notesRepository)
 		private readonly notesRepository: NotesRepository,
@@ -21,19 +17,23 @@ export class LatestNoteService {
 		private readonly latestNotesRepository: LatestNotesRepository,
 
 		private readonly queryService: QueryService,
-		loggerService: LoggerService,
-	) {
-		this.logger = loggerService.getLogger('LatestNoteService');
+		private readonly queueService: QueueService,
+	) {}
+
+	async handleUpdatedNoteDeferred(note: MiNote): Promise<void> {
+		await this.queueService.createUpdateLatestNoteJob(note);
 	}
 
-	handleUpdatedNoteBG(before: MiNote, after: MiNote): void {
-		this
-			.handleUpdatedNote(before, after)
-			.catch(err => this.logger.error('Unhandled exception while updating latest_note (after update):', err));
+	async handleCreatedNoteDeferred(note: MiNote): Promise<void> {
+		await this.queueService.createUpdateLatestNoteJob(note);
 	}
 
-	async handleUpdatedNote(before: MiNote, after: MiNote): Promise<void> {
-		// If the key didn't change, then there's nothing to update
+	async handleDeletedNoteDeferred(note: MiNote): Promise<void> {
+		await this.queueService.createUpdateLatestNoteJob(note);
+	}
+
+	async handleUpdatedNote(before: MinimalNote, after: MinimalNote): Promise<void> {
+		// If the key didn't change, then there's nothing to update.
 		if (SkLatestNote.areEquivalent(before, after)) return;
 
 		// Simulate update as delete + create
@@ -41,13 +41,7 @@ export class LatestNoteService {
 		await this.handleCreatedNote(after);
 	}
 
-	handleCreatedNoteBG(note: MiNote): void {
-		this
-			.handleCreatedNote(note)
-			.catch(err => this.logger.error('Unhandled exception while updating latest_note (after create):', err));
-	}
-
-	async handleCreatedNote(note: MiNote): Promise<void> {
+	async handleCreatedNote(note: MinimalNote): Promise<void> {
 		// Ignore DMs.
 		// Followers-only posts are *included*, as this table is used to back the "following" feed.
 		if (note.visibility === 'specified') return;
@@ -71,13 +65,7 @@ export class LatestNoteService {
 		await this.latestNotesRepository.upsert(latestNote, ['userId', 'isPublic', 'isReply', 'isQuote']);
 	}
 
-	handleDeletedNoteBG(note: MiNote): void {
-		this
-			.handleDeletedNote(note)
-			.catch(err => this.logger.error('Unhandled exception while updating latest_note (after delete):', err));
-	}
-
-	async handleDeletedNote(note: MiNote): Promise<void> {
+	async handleDeletedNote(note: MinimalNote): Promise<void> {
 		// If it's a DM, then it can't possibly be the latest note so we can safely skip this.
 		if (note.visibility === 'specified') return;
 
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 484f7e01d0..9b7ef57d9c 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -458,9 +458,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		const note = await this.insertNote(user, data, tags, emojis, mentionedUsers);
 
-		// Update the Latest Note index / following feed
-		this.latestNoteService.handleCreatedNoteBG(note);
-
 		await this.queueService.createPostNoteJob(note.id, silent, 'create');
 
 		return note;
@@ -474,7 +471,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		isBot: MiUser['isBot'];
 		noindex: MiUser['noindex'];
 	}, data: Option): Promise<MiNote> {
-		return this.create(user, data, true);
+		return await this.create(user, data, true);
 	}
 
 	@bindThis
@@ -583,7 +580,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		host: MiUser['host'];
 		isBot: MiUser['isBot'];
 		noindex: MiUser['noindex'];
-	}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
+	}, data: Option, silent: boolean, mentionedUsers: MinimumUser[]) {
 		this.notesChart.update(note, true);
 		if (note.visibility !== 'specified' && (this.meta.enableChartsForRemoteUser || (user.host == null))) {
 			this.perUserNotesChart.update(user, note, true);
@@ -612,20 +609,20 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		if (!this.isRenote(note) || this.isQuote(note)) {
 			// Increment notes count (user)
-			this.incNotesCountOfUser(user);
+			await this.incNotesCountOfUser(user);
 		} else {
-			this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+			await this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
 		}
 
-		this.pushToTl(note, user);
+		await this.pushToTl(note, user);
 
-		this.antennaService.addNoteToAntennas({
+		await this.antennaService.addNoteToAntennas({
 			...note,
 			channel: data.channel ?? null,
 		}, user);
 
 		if (data.reply) {
-			this.saveReply(data.reply, note);
+			await this.saveReply(data.reply, note);
 		}
 
 		if (data.reply == null) {
@@ -654,12 +651,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 
 		if (this.isRenote(data) && !this.isQuote(data) && data.renote.userId !== user.id && !user.isBot) {
-			this.incRenoteCount(data.renote, user);
+			await this.incRenoteCount(data.renote, user);
 		}
 
 		if (data.poll && data.poll.expiresAt) {
 			const delay = data.poll.expiresAt.getTime() - this.timeService.now;
-			this.queueService.endedPollNotificationQueue.add(note.id, {
+			await this.queueService.endedPollNotificationQueue.add(note.id, {
 				noteId: note.id,
 			}, {
 				jobId: `pollEnd_${note.id}`,
@@ -683,9 +680,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 			this.globalEventService.publishNotesStream(noteObj);
 
-			this.roleService.addNoteToRoleTimeline(noteObj);
+			await this.roleService.addNoteToRoleTimeline(noteObj);
 
-			this.webhookService.enqueueUserWebhook(user.id, 'note', { note: noteObj });
+			await this.webhookService.enqueueUserWebhook(user.id, 'note', { note: noteObj });
 
 			const nm = new NotificationManager(this.mutingsRepository, this.notificationService, user, note);
 
@@ -714,7 +711,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 					if (!isThreadMuted && !muted) {
 						nm.push(data.reply.userId, 'reply');
 						this.globalEventService.publishMainStream(data.reply.userId, 'reply', noteObj);
-						this.webhookService.enqueueUserWebhook(data.reply.userId, 'reply', { note: noteObj });
+						await this.webhookService.enqueueUserWebhook(data.reply.userId, 'reply', { note: noteObj });
 					}
 				}
 			}
@@ -745,15 +742,15 @@ export class NoteCreateService implements OnApplicationShutdown {
 				// Publish event
 				if ((user.id !== data.renote.userId) && data.renote.userHost === null) {
 					this.globalEventService.publishMainStream(data.renote.userId, 'renote', noteObj);
-					this.webhookService.enqueueUserWebhook(data.renote.userId, 'renote', { note: noteObj });
+					await this.webhookService.enqueueUserWebhook(data.renote.userId, 'renote', { note: noteObj });
 				}
 			}
 
-			nm.notify();
+			await nm.notify();
 
 			//#region AP deliver
 			if (!data.localOnly && isLocalUser(user)) {
-				trackTask(async () => {
+				await trackTask(async () => {
 					const noteActivity = await this.apRendererService.renderNoteOrRenoteActivity(note, user, { renote: data.renote });
 					const dm = this.apDeliverManagerService.createDeliverManager(user, noteActivity);
 
@@ -790,12 +787,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 
 		if (data.channel) {
-			this.channelsRepository.increment({ id: data.channel.id }, 'notesCount', 1);
-			this.channelsRepository.update(data.channel.id, {
+			await this.channelsRepository.increment({ id: data.channel.id }, 'notesCount', 1);
+			await this.channelsRepository.update(data.channel.id, {
 				lastNotedAt: this.timeService.date,
 			});
 
-			this.notesRepository.countBy({
+			await this.notesRepository.countBy({
 				userId: user.id,
 				channelId: data.channel.id,
 			}).then(count => {
@@ -807,8 +804,11 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 		}
 
+		// Update the Latest Note index / following feed
+		await this.latestNoteService.handleCreatedNoteDeferred(note);
+
 		// Register to search database
-		if (!user.noindex) this.index(note);
+		if (!user.noindex) await this.index(note);
 	}
 
 	/**
@@ -841,12 +841,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (policies.canTrend) {
 				if (renote.channelId != null) {
 					if (renote.replyId == null) {
-						this.featuredService.updateInChannelNotesRanking(renote.channelId, renote, 5);
+						await this.featuredService.updateInChannelNotesRanking(renote.channelId, renote, 5);
 					}
 				} else {
 					if (renote.visibility === 'public' && renote.userHost == null && renote.replyId == null) {
-						this.featuredService.updateGlobalNotesRanking(renote, 5);
-						this.featuredService.updatePerUserNotesRanking(renote.userId, renote, 5);
+						await this.featuredService.updateGlobalNotesRanking(renote, 5);
+						await this.featuredService.updatePerUserNotesRanking(renote.userId, renote, 5);
 					}
 				}
 			}
@@ -880,7 +880,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 
 			this.globalEventService.publishMainStream(u.id, 'mention', detailPackedNote);
-			this.webhookService.enqueueUserWebhook(u.id, 'mention', { note: detailPackedNote });
+			await this.webhookService.enqueueUserWebhook(u.id, 'mention', { note: detailPackedNote });
 
 			// Create notification
 			nm.push(u.id, 'mention');
@@ -888,20 +888,20 @@ export class NoteCreateService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private saveReply(reply: MiNote, note: MiNote) {
-		this.notesRepository.increment({ id: reply.id }, 'repliesCount', 1);
+	private async saveReply(reply: MiNote, note: MiNote) {
+		await this.notesRepository.increment({ id: reply.id }, 'repliesCount', 1);
 	}
 
 	@bindThis
-	private index(note: MiNote) {
+	private async index(note: MiNote) {
 		if (note.text == null && note.cw == null) return;
 
-		this.searchService.indexNote(note);
+		await this.searchService.indexNote(note);
 	}
 
 	@bindThis
-	private incNotesCountOfUser(user: { id: MiUser['id']; }) {
-		this.usersRepository.createQueryBuilder().update()
+	private async incNotesCountOfUser(user: { id: MiUser['id']; }) {
+		await this.usersRepository.createQueryBuilder().update()
 			.set({
 				updatedAt: this.timeService.date,
 				notesCount: () => '"notesCount" + 1',
@@ -1037,7 +1037,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			// checkHibernation moved to HibernateUsersProcessorService
 		}
 
-		r.exec();
+		await r.exec();
 	}
 
 	// checkHibernation moved to HibernateUsersProcessorService
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index c20b20c7ca..e9cf9bebef 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -158,7 +158,11 @@ export class NoteDeleteService {
 			userId: user.id,
 		});
 
-		this.latestNoteService.handleDeletedNoteBG(note);
+		// Update the Latest Note index / following feed
+		this.latestNoteService.handleDeletedNoteDeferred(note);
+		for (const cascadingNote of cascadingNotes) {
+			this.latestNoteService.handleDeletedNote(cascadingNote);
+		}
 
 		if (deleter && (note.userId !== deleter.id)) {
 			const user = await this.usersRepository.findOneByOrFail({ id: note.userId });
@@ -174,14 +178,14 @@ export class NoteDeleteService {
 			.map(n => n.uri)
 			.filter((u): u is string => u != null);
 		if (deletedUris.length > 0) {
-			this.apLogService.deleteObjectLogs(deletedUris)
-				.catch(err => this.logger.error(err, `Failed to delete AP logs for note '${note.uri}'`));
+			trackPromise(this.apLogService.deleteObjectLogs(deletedUris)
+				.catch(err => this.logger.error(err, `Failed to delete AP logs for note '${note.uri}'`)));
 		}
 	}
 
 	@bindThis
-	private decNotesCountOfUser(user: { id: MiUser['id']; }) {
-		this.usersRepository.createQueryBuilder().update()
+	private async decNotesCountOfUser(user: { id: MiUser['id']; }) {
+		await this.usersRepository.createQueryBuilder().update()
 			.set({
 				updatedAt: this.timeService.date,
 				notesCount: () => '"notesCount" - 1',
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 21991e2966..0c595cbf20 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -14,7 +14,7 @@ import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mf
 import { extractHashtags } from '@/misc/extract-hashtags.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { MiNote } from '@/models/Note.js';
-import type { NoteEditRepository, ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository, PollsRepository } from '@/models/_.js';
+import type { NoteEditsRepository, ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository, PollsRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiApp } from '@/models/App.js';
 import { concat } from '@/misc/prelude/array.js';
@@ -195,8 +195,8 @@ export class NoteEditService implements OnApplicationShutdown {
 		@Inject(DI.channelFollowingsRepository)
 		private channelFollowingsRepository: ChannelFollowingsRepository,
 
-		@Inject(DI.noteEditRepository)
-		private noteEditRepository: NoteEditRepository,
+		@Inject(DI.noteEditsRepository)
+		private noteEditsRepository: NoteEditsRepository,
 
 		@Inject(DI.pollsRepository)
 		private pollsRepository: PollsRepository,
@@ -234,29 +234,29 @@ export class NoteEditService implements OnApplicationShutdown {
 			throw new UnrecoverableError('edit failed: missing editid');
 		}
 
-		const oldnote = await this.notesRepository.findOneBy({
+		const oldNote = await this.notesRepository.findOneBy({
 			id: editid,
 		});
 
-		if (oldnote == null) {
+		if (oldNote == null) {
 			throw new UnrecoverableError(`edit failed for ${editid}: missing oldnote`);
 		}
 
-		if (oldnote.userId !== user.id) {
+		if (oldNote.userId !== user.id) {
 			throw new UnrecoverableError(`edit failed for ${editid}: user is not the note author`);
 		}
 
 		// we never want to change the replyId, so fetch the original "parent"
-		if (oldnote.replyId) {
-			data.reply = await this.notesRepository.findOneBy({ id: oldnote.replyId });
+		if (oldNote.replyId) {
+			data.reply = await this.notesRepository.findOneBy({ id: oldNote.replyId });
 		} else {
 			data.reply = undefined;
 		}
 
 		// changing visibility on an edit is ill-defined, let's try to
 		// keep the same visibility as the original note
-		data.visibility = oldnote.visibility;
-		data.localOnly = oldnote.localOnly;
+		data.visibility = oldNote.visibility;
+		data.localOnly = oldNote.localOnly;
 
 		// チャンネル外にリプライしたら対象のスコープに合わせる
 		// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
@@ -463,46 +463,55 @@ export class NoteEditService implements OnApplicationShutdown {
 		}
 
 		const update: Partial<MiNote> = {};
-		if (data.text !== undefined && data.text !== oldnote.text) {
+		if (data.text !== undefined && data.text !== oldNote.text) {
 			update.text = data.text;
 		}
-		if (data.cw !== undefined && data.cw !== oldnote.cw) {
+		if (data.cw !== undefined && data.cw !== oldNote.cw) {
 			update.cw = data.cw;
 		}
-		if (data.poll !== undefined && oldnote.hasPoll !== !!data.poll) {
+		if (data.poll !== undefined && oldNote.hasPoll !== !!data.poll) {
 			update.hasPoll = !!data.poll;
 		}
-		if (data.mandatoryCW !== undefined && oldnote.mandatoryCW !== data.mandatoryCW) {
+		if (data.mandatoryCW !== undefined && oldNote.mandatoryCW !== data.mandatoryCW) {
 			update.mandatoryCW = data.mandatoryCW;
 		}
 
 		// TODO deep-compare files
-		const filesChanged = oldnote.fileIds.length || data.files?.length;
+		const filesChanged = oldNote.fileIds.length || data.files?.length;
 
-		const poll = await this.pollsRepository.findOneBy({ noteId: oldnote.id });
+		const oldPoll = await this.pollsRepository.findOneBy({ noteId: oldNote.id });
 
-		const oldPoll = poll ? { choices: poll.choices, multiple: poll.multiple, expiresAt: poll.expiresAt } : null;
-		const pollChanged = data.poll != null && JSON.stringify(data.poll) !== JSON.stringify(oldPoll);
+		const oldPollData = oldPoll ? { choices: oldPoll.choices, multiple: oldPoll.multiple, expiresAt: oldPoll.expiresAt } : null;
+		const pollChanged =
+			(data.poll == null && oldPoll != null) ||
+			(data.poll != null && oldPoll == null) ||
+			(data.poll != null && oldPoll != null && JSON.stringify(data.poll) !== JSON.stringify(oldPollData));
 
 		if (Object.keys(update).length > 0 || filesChanged || pollChanged) {
-			const exists = await this.noteEditRepository.findOneBy({ noteId: oldnote.id });
+			const exists = await this.noteEditsRepository.findOneBy({ noteId: oldNote.id });
 
-			await this.noteEditRepository.insert({
+			await this.noteEditsRepository.insert({
 				id: this.idService.gen(),
-				noteId: oldnote.id,
-				oldText: oldnote.text || undefined,
+				userId: oldNote.userId,
+				noteId: oldNote.id,
+				renoteId: oldNote.renoteId,
+				replyId: oldNote.replyId,
+				visibility: oldNote.visibility,
+				text: oldNote.text || undefined,
 				newText: update.text || undefined,
-				cw: update.cw || undefined,
-				fileIds: undefined,
-				oldDate: exists ? oldnote.updatedAt as Date : this.idService.parse(oldnote.id).date,
+				cw: oldNote.cw || undefined,
+				newCw: update.cw || undefined,
+				fileIds: oldNote.fileIds,
+				oldDate: exists ? oldNote.updatedAt as Date : this.idService.parse(oldNote.id).date,
 				updatedAt: this.timeService.date,
+				hasPoll: oldPoll != null,
 			});
 
 			const note = new MiNote({
-				id: oldnote.id,
+				id: oldNote.id,
 				updatedAt: data.updatedAt ? data.updatedAt : this.timeService.date,
 				fileIds: data.files ? data.files.map(file => file.id) : [],
-				replyId: oldnote.replyId,
+				replyId: oldNote.replyId,
 				renoteId: data.renote ? data.renote.id : null,
 				channelId: data.channel ? data.channel.id : null,
 				threadId: data.reply
@@ -516,7 +525,7 @@ export class NoteEditService implements OnApplicationShutdown {
 				cw: data.cw ?? null,
 				tags: tags.map(tag => normalizeForSearch(tag)),
 				emojis,
-				reactions: oldnote.reactions,
+				reactions: oldNote.reactions,
 				userId: user.id,
 				localOnly: data.localOnly!,
 				reactionAcceptance: data.reactionAcceptance,
@@ -535,7 +544,7 @@ export class NoteEditService implements OnApplicationShutdown {
 				renoteUserId: data.renote ? data.renote.userId : null,
 				renoteUserHost: data.renote ? data.renote.userHost : null,
 				userHost: user.host,
-				reactionAndUserPairCache: oldnote.reactionAndUserPairCache,
+				reactionAndUserPairCache: oldNote.reactionAndUserPairCache,
 				mandatoryCW: data.mandatoryCW,
 			});
 
@@ -561,41 +570,44 @@ export class NoteEditService implements OnApplicationShutdown {
 			if (pollChanged) {
 				// Start transaction
 				await this.db.transaction(async transactionalEntityManager => {
-					await transactionalEntityManager.update(MiNote, oldnote.id, note);
+					await transactionalEntityManager.update(MiNote, oldNote.id, note);
 
-					const poll = new MiPoll({
-						noteId: note.id,
-						choices: data.poll!.choices,
-						expiresAt: data.poll!.expiresAt,
-						multiple: data.poll!.multiple,
-						votes: new Array(data.poll!.choices.length).fill(0),
-						noteVisibility: note.visibility,
-						userId: user.id,
-						userHost: user.host,
-						channelId: data.channel?.id ?? null,
-					});
+					// Insert or update poll
+					if (data.poll) {
+						const poll = new MiPoll({
+							noteId: note.id,
+							choices: data.poll.choices,
+							expiresAt: data.poll.expiresAt,
+							multiple: data.poll.multiple,
+							votes: new Array(data.poll.choices.length).fill(0),
+							noteVisibility: note.visibility,
+							userId: user.id,
+							userHost: user.host,
+							channelId: data.channel?.id ?? null,
+						});
 
-					if (!oldnote.hasPoll) {
-						await transactionalEntityManager.insert(MiPoll, poll);
-					} else {
-						await transactionalEntityManager.update(MiPoll, oldnote.id, poll);
+						if (oldPoll) {
+							await transactionalEntityManager.update(MiPoll, { pollId: oldPoll.noteId }, poll);
+						} else {
+							await transactionalEntityManager.insert(MiPoll, poll);
+						}
+					// Delete poll
+					} else if (oldPoll) {
+						await transactionalEntityManager.delete(MiPoll, { pollId: oldPoll.noteId });
 					}
 				});
 			} else {
-				await this.notesRepository.update(oldnote.id, note);
+				await this.notesRepository.update(oldNote.id, note);
 			}
 
 			// Re-fetch note to get the default values of null / unset fields.
 			const edited = await this.notesRepository.findOneByOrFail({ id: note.id });
 
-			// Update the Latest Note index / following feed
-			this.latestNoteService.handleUpdatedNoteBG(edited, oldnote);
-
 			await this.queueService.createPostNoteJob(note.id, silent, 'edit');
 
 			return edited;
 		} else {
-			return oldnote;
+			return oldNote;
 		}
 	}
 
@@ -606,7 +618,7 @@ export class NoteEditService implements OnApplicationShutdown {
 		host: MiUser['host'];
 		isBot: MiUser['isBot'];
 		noindex: MiUser['noindex'];
-	}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
+	}, data: Option, silent: boolean, mentionedUsers: MinimumUser[]) {
 		// Register host
 		if (this.meta.enableStatsForFederatedInstances) {
 			if (isRemoteUser(user)) {
@@ -621,15 +633,15 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+		await this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
 
 		// ハッシュタグ更新
-		this.pushToTl(note, user);
+		await this.pushToTl(note, user);
 
 		if (data.poll && data.poll.expiresAt) {
 			const delay = data.poll.expiresAt.getTime() - this.timeService.now;
-			this.queueService.endedPollNotificationQueue.remove(`pollEnd:${note.id}`);
-			this.queueService.endedPollNotificationQueue.add(note.id, {
+			await this.queueService.endedPollNotificationQueue.remove(`pollEnd:${note.id}`);
+			await this.queueService.endedPollNotificationQueue.add(note.id, {
 				noteId: note.id,
 			}, {
 				jobId: `pollEnd_${note.id}`,
@@ -648,9 +660,9 @@ export class NoteEditService implements OnApplicationShutdown {
 				text: note.text ?? '',
 			});
 
-			this.roleService.addNoteToRoleTimeline(noteObj);
+			await this.roleService.addNoteToRoleTimeline(noteObj);
 
-			this.webhookService.enqueueUserWebhook(user.id, 'note', { note: noteObj });
+			await this.webhookService.enqueueUserWebhook(user.id, 'note', { note: noteObj });
 
 			const nm = new NotificationManager(this.mutingsRepository, this.notificationService, user, note);
 
@@ -673,16 +685,16 @@ export class NoteEditService implements OnApplicationShutdown {
 					if (!isThreadMuted && !muted) {
 						nm.push(data.reply.userId, 'edited');
 						this.globalEventService.publishMainStream(data.reply.userId, 'edited', noteObj);
-						this.webhookService.enqueueUserWebhook(data.reply.userId, 'reply', { note: noteObj });
+						await this.webhookService.enqueueUserWebhook(data.reply.userId, 'reply', { note: noteObj });
 					}
 				}
 			}
 
-			nm.notify();
+			await nm.notify();
 
 			//#region AP deliver
 			if (!data.localOnly && isLocalUser(user)) {
-				trackTask(async () => {
+				await trackTask(async () => {
 					const noteActivity = await this.apRendererService.renderNoteOrRenoteActivity(note, user, { renote: data.renote });
 					const dm = this.apDeliverManagerService.createDeliverManager(user, noteActivity);
 
@@ -737,8 +749,8 @@ export class NoteEditService implements OnApplicationShutdown {
 		}
 
 		if (data.channel) {
-			this.channelsRepository.increment({ id: data.channel.id }, 'notesCount', 1);
-			this.channelsRepository.update(data.channel.id, {
+			await this.channelsRepository.increment({ id: data.channel.id }, 'notesCount', 1);
+			await this.channelsRepository.update(data.channel.id, {
 				lastNotedAt: this.timeService.date,
 			});
 
@@ -754,8 +766,11 @@ export class NoteEditService implements OnApplicationShutdown {
 			});
 		}
 
+		// Update the Latest Note index / following feed
+		await this.latestNoteService.handleUpdatedNoteDeferred(note);
+
 		// Register to search database
-		if (!user.noindex) this.index(note);
+		if (!user.noindex) await this.index(note);
 	}
 
 	@bindThis
@@ -776,10 +791,10 @@ export class NoteEditService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private index(note: MiNote) {
+	private async index(note: MiNote) {
 		if (note.text == null && note.cw == null) return;
 
-		this.searchService.indexNote(note);
+		await this.searchService.indexNote(note);
 	}
 
 	@bindThis
@@ -909,7 +924,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			// checkHibernation moved to HibernateUsersProcessorService
 		}
 
-		r.exec();
+		await r.exec();
 	}
 
 	// checkHibernation moved to HibernateUsersProcessorService
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 16b43ce4f7..95cc46c8cf 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -19,6 +19,7 @@ import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
 import { TimeService } from '@/global/TimeService.js';
 import type { SystemWebhookPayload } from '@/core/SystemWebhookService.js';
 import type { MiNote } from '@/models/Note.js';
+import type { MinimalNote } from '@/misc/is-renote.js';
 import { type UserWebhookPayload } from './UserWebhookService.js';
 import type {
 	BackgroundTaskJobData,
@@ -44,7 +45,6 @@ import type {
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
-import type { MiUser } from '@/models/User.js';
 
 export const QUEUE_TYPES = [
 	'system',
@@ -846,147 +846,93 @@ export class QueueService implements OnModuleInit {
 
 	@bindThis
 	public async createUpdateUserJob(userId: string) {
-		return await this.createBackgroundTask(
-			'update-user',
-			{
-				type: 'update-user',
-				userId,
-			},
-			{
-				id: `update-user:${userId}`,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'update-user', userId }, userId);
 	}
 
 	@bindThis
 	public async createUpdateFeaturedJob(userId: string) {
-		return await this.createBackgroundTask(
-			'update-featured',
-			{
-				type: 'update-featured',
-				userId,
-			},
-			{
-				id: `update-featured:${userId}`,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'update-featured', userId }, userId);
 	}
 
 	@bindThis
 	public async createUpdateInstanceJob(host: string) {
-		return await this.createBackgroundTask(
-			'update-instance',
-			{
-				type: 'update-instance',
-				host,
-			},
-			{
-				id: `update-instance:${host}`,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'update-instance', host }, host);
 	}
 
 	@bindThis
 	public async createPostDeliverJob(host: string, result: 'success' | 'temp-fail' | 'perm-fail') {
-		return await this.createBackgroundTask(
-			'post-deliver',
-			{
-				type: 'post-deliver',
-				host,
-				result,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'post-deliver', host, result });
 	}
 
 	@bindThis
 	public async createPostInboxJob(host: string) {
-		return await this.createBackgroundTask(
-			'post-inbox',
-			{
-				type: 'post-inbox',
-				host,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'post-inbox', host });
 	}
 
 	@bindThis
 	public async createPostNoteJob(noteId: string, silent: boolean, type: 'create' | 'edit') {
-		return await this.createBackgroundTask(
-			'post-note',
-			{
-				type: 'post-note',
-				noteId,
-				silent,
-				edit: type === 'edit',
-			},
-			{
-				id: `post-note:${noteId}:${type}`,
-			},
-		);
+		const edit = type === 'edit';
+		const duplication = `${noteId}:${type}`;
+
+		return await this.createBackgroundTask({ type: 'post-note', noteId, silent, edit }, duplication);
 	}
 
 	@bindThis
 	public async createCheckHibernationJob(userId: string) {
 		return await this.createBackgroundTask(
-			'check-hibernation',
-			{
-				type: 'check-hibernation',
-				userId,
-			},
-			{
-				id: `check-hibernation:${userId}`,
-				ttl: 1000 * 60 * 60 * 24, // This is a very heavy task, so only run once per day per user
-			},
+			{ type: 'check-hibernation', userId },
+
+			// This is a very heavy task, so only run once per day per user
+			{ id: `check-hibernation:${userId}`, ttl: 1000 * 60 * 60 * 24 },
 		);
 	}
 
 	@bindThis
 	public async createUpdateUserTagsJob(userId: string) {
-		return await this.createBackgroundTask(
-			'update-user-tags',
-			{
-				type: 'update-user-tags',
-				userId,
-			},
-			{
-				id: `update-user-tags:${userId}`,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'update-user-tags', userId }, userId);
 	}
 
 	@bindThis
 	public async createUpdateNoteTagsJob(noteId: string) {
-		return await this.createBackgroundTask(
-			'update-note-tags',
-			{
-				type: 'update-note-tags',
-				noteId,
-			},
-			{
-				id: `update-note-tags:${noteId}`,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'update-note-tags', noteId }, noteId);
 	}
 
 	@bindThis
 	public async createDeleteFileJob(fileId: string, isExpired?: boolean, deleterId?: string) {
-		return await this.createBackgroundTask(
-			'delete-file',
-			{
-				type: 'delete-file',
-				fileId,
-				isExpired,
-				deleterId,
-			},
-			{
-				id: `delete-file:${fileId}`,
-			},
-		);
+		return await this.createBackgroundTask({ type: 'delete-file', fileId, isExpired, deleterId }, fileId);
 	}
 
-	private async createBackgroundTask(name: string, data: BackgroundTaskJobData, duplication?: { id: string, ttl?: number }) {
+	@bindThis
+	public async createUpdateLatestNoteJob(note: MinimalNote) {
+		// Compact the note to avoid storing the entire thing in Redis, when all we need is minimal data for categorization
+		const packedNote: MinimalNote = {
+			id: note.id,
+			visibility: note.visibility,
+			userId: note.userId,
+			replyId: note.replyId,
+			renoteId: note.renoteId,
+			hasPoll: note.hasPoll,
+			text: note.text ? '1' : null,
+			cw: note.text ? '1' : null,
+			fileIds: note.fileIds.length > 0 ? ['1'] : [],
+		};
+
+		return await this.createBackgroundTask({ type: 'update-latest-note', note: packedNote }, note.id);
+	}
+
+	@bindThis
+	public async createPostSuspendJob(userId: string) {
+		return await this.createBackgroundTask({ type: 'post-suspend', userId }, userId);
+	}
+
+	@bindThis
+	public async createPostUnsuspendJob(userId: string) {
+		return await this.createBackgroundTask({ type: 'post-unsuspend', userId }, userId);
+	}
+
+	private async createBackgroundTask<T extends BackgroundTaskJobData>(data: T, duplication?: string | { id: string, ttl?: number }) {
 		return await this.backgroundTaskQueue.add(
-			name,
+			data.type,
 			data,
 			{
 				removeOnComplete: {
@@ -1006,7 +952,9 @@ export class QueueService implements OnModuleInit {
 				},
 
 				// https://docs.bullmq.io/guide/jobs/deduplication
-				deduplication: duplication,
+				deduplication: typeof(duplication) === 'string'
+					? { id: `${data.type}:${duplication}` }
+					: duplication,
 			},
 		);
 	};
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index 4e42c24383..395657434c 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -17,16 +17,10 @@ import { RelationshipJobData } from '@/queue/types.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { isSystemAccount } from '@/misc/is-system-account.js';
 import { CacheService } from '@/core/CacheService.js';
-import { LoggerService } from '@/core/LoggerService.js';
-import type Logger from '@/logger.js';
-import { renderInlineError } from '@/misc/render-inline-error.js';
-import { trackPromise } from '@/misc/promise-tracker.js';
 import { InternalEventService } from '@/global/InternalEventService.js';
 
 @Injectable()
 export class UserSuspendService {
-	private readonly logger: Logger;
-
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
@@ -47,11 +41,7 @@ export class UserSuspendService {
 		private moderationLogService: ModerationLogService,
 		private readonly cacheService: CacheService,
 		private readonly internalEventService: InternalEventService,
-
-		loggerService: LoggerService,
-	) {
-		this.logger = loggerService.getLogger('user-suspend');
-	}
+	) {}
 
 	@bindThis
 	public async suspend(user: MiUser, moderator: MiUser): Promise<void> {
@@ -69,10 +59,7 @@ export class UserSuspendService {
 			userHost: user.host,
 		});
 
-		trackPromise((async () => {
-			await this.postSuspend(user);
-			await this.freezeAll(user);
-		})().catch(e => this.logger.error(`Error suspending user ${user.id}: ${renderInlineError(e)}`)));
+		await this.queueService.createPostSuspendJob(user.id);
 	}
 
 	@bindThis
@@ -89,14 +76,11 @@ export class UserSuspendService {
 			userHost: user.host,
 		});
 
-		trackPromise((async () => {
-			await this.postUnsuspend(user);
-			await this.unFreezeAll(user);
-		})().catch(e => this.logger.error(`Error un-suspending for user ${user.id}: ${renderInlineError(e)}`)));
+		await this.queueService.createPostUnsuspendJob(user.id);
 	}
 
 	@bindThis
-	private async postSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
+	public async postSuspend(user: MiUser): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
 		/*
@@ -132,10 +116,12 @@ export class UserSuspendService {
 
 			await this.queueService.deliverMany(user, content, queue);
 		}
+
+		await this.freezeAll(user);
 	}
 
 	@bindThis
-	private async postUnsuspend(user: MiUser): Promise<void> {
+	public async postUnsuspend(user: MiUser): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
 
 		if (this.userEntityService.isLocalUser(user)) {
@@ -162,6 +148,8 @@ export class UserSuspendService {
 
 			await this.queueService.deliverMany(user, content, queue);
 		}
+
+		await this.unFreezeAll(user);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/misc/is-renote.ts b/packages/backend/src/misc/is-renote.ts
index fcaafaf95a..cb88b64b8c 100644
--- a/packages/backend/src/misc/is-renote.ts
+++ b/packages/backend/src/misc/is-renote.ts
@@ -5,42 +5,51 @@
 
 import type { MiNote } from '@/models/Note.js';
 import type { Packed } from '@/misc/json-schema.js';
+import type { NoteEdit } from '@/models/NoteEdit.js';
 
 // NoteEntityService.isPureRenote とよしなにリンク
 
-type Renote =
+export type Renote =
 	MiNote & {
 		renoteId: NonNullable<MiNote['renoteId']>
 	};
 
-type Quote =
+export type Quote =
 	Renote & ({
 		text: NonNullable<MiNote['text']>
 	} | {
 		cw: NonNullable<MiNote['cw']>
 	} | {
 		replyId: NonNullable<MiNote['replyId']>
-		reply: NonNullable<MiNote['reply']>
+		reply: NonNullable<MiNote['reply']> // TODO this is wrong
 	} | {
 		hasPoll: true
+	} | {
+		fileIds: [string, ...string[]]
 	});
 
-type PureRenote =
+export type PureRenote =
 	Renote & {
 		text: null,
 		cw: null,
 		replyId: null,
 		hasPoll: false,
-		fileIds: {
-			length: 0,
-		},
+		fileIds: [],
 	};
 
-export function isRenote(note: MiNote): note is Renote {
+export function isRenote(note: MiNote): note is Renote;
+export function isRenote(note: NoteEdit): note is RenoteEdit;
+export function isRenote(note: MinimalNote): note is MinimalRenote;
+export function isRenote(note: MiNote | NoteEdit | MinimalNote): note is Renote | RenoteEdit | MinimalRenote;
+export function isRenote(note: MiNote | NoteEdit | MinimalNote): note is Renote | RenoteEdit | MinimalRenote {
 	return note.renoteId != null;
 }
 
-export function isQuote(note: Renote): note is Quote {
+export function isQuote(note: Renote): note is Quote;
+export function isQuote(note: RenoteEdit): note is QuoteEdit;
+export function isQuote(note: MinimalNote): note is MinimalQuote;
+export function isQuote(note: Renote | RenoteEdit | MinimalNote): note is Quote | QuoteEdit | MinimalQuote;
+export function isQuote(note: Renote | RenoteEdit | MinimalNote): note is Quote | QuoteEdit | MinimalQuote {
 	// NOTE: SYNC WITH NoteCreateService.isQuote
 	return note.text != null ||
 		note.cw != null ||
@@ -49,7 +58,11 @@ export function isQuote(note: Renote): note is Quote {
 		note.fileIds.length > 0;
 }
 
-export function isPureRenote(note: MiNote): note is PureRenote {
+export function isPureRenote(note: MiNote): note is PureRenote;
+export function isPureRenote(note: NoteEdit): note is PureRenoteEdit;
+export function isPureRenote(note: MinimalNote): note is MinimalPureRenote;
+export function isPureRenote(note: MiNote | NoteEdit | MinimalNote): note is PureRenote | PureRenoteEdit | MinimalPureRenote;
+export function isPureRenote(note: MiNote | NoteEdit | MinimalNote): note is PureRenote | PureRenoteEdit | MinimalPureRenote {
 	return isRenote(note) && !isQuote(note);
 }
 
@@ -68,15 +81,16 @@ type PackedQuote =
 	} | {
 		poll: NonNullable<Packed<'Note'>['poll']>
 	} | {
-		fileIds: NonNullable<Packed<'Note'>['fileIds']>
+		fileIds: [string, ...string[]]
 	});
 
 type PackedPureRenote = PackedRenote & {
-	text: NonNullable<Packed<'Note'>['text']>;
-	cw: NonNullable<Packed<'Note'>['cw']>;
-	replyId: NonNullable<Packed<'Note'>['replyId']>;
-	poll: NonNullable<Packed<'Note'>['poll']>;
-	fileIds: NonNullable<Packed<'Note'>['fileIds']>;
+	text: null;
+	cw: null;
+	replyId: null;
+	reply: null;
+	poll: null;
+	fileIds: [];
 };
 
 export function isRenotePacked(note: Packed<'Note'>): note is PackedRenote {
@@ -94,3 +108,58 @@ export function isQuotePacked(note: PackedRenote): note is PackedQuote {
 export function isPackedPureRenote(note: Packed<'Note'>): note is PackedPureRenote {
 	return isRenotePacked(note) && !isQuotePacked(note);
 }
+
+export type RenoteEdit =
+	NoteEdit & {
+		renoteId: NonNullable<NoteEdit['renoteId']>
+	};
+
+export type QuoteEdit =
+	RenoteEdit & ({
+		text: NonNullable<NoteEdit['text']>
+	} | {
+		cw: NonNullable<NoteEdit['cw']>
+	} | {
+		replyId: NonNullable<NoteEdit['replyId']>
+	} | {
+		hasPoll: true
+	} | {
+		fileIds: [string, ...string[]],
+	});
+
+export type PureRenoteEdit =
+	RenoteEdit & {
+		text: null,
+		cw: null,
+		replyId: null,
+		reply: null,
+		hasPoll: false,
+		fileIds: [],
+	};
+
+export type MinimalNote = Pick<MiNote, 'id' | 'visibility' | 'userId' | 'replyId' | 'renoteId' | 'text' | 'cw' | 'hasPoll' | 'fileIds'>;
+
+export type MinimalRenote = MinimalNote & {
+	renoteId: string;
+};
+
+export type MinimalQuote = MinimalRenote & ({
+	text: NonNullable<MinimalNote['text']>
+} | {
+	cw: NonNullable<MinimalNote['cw']>
+} | {
+	replyId: NonNullable<MinimalNote['replyId']>
+} | {
+	hasPoll: true
+} | {
+	fileIds: [string, ...string[]],
+});
+
+export type MinimalPureRenote = MinimalRenote & {
+	text: null,
+	cw: null,
+	replyId: null,
+	reply: null,
+	hasPoll: false,
+	fileIds: [],
+};
diff --git a/packages/backend/src/models/LatestNote.ts b/packages/backend/src/models/LatestNote.ts
index 37efb0d4b6..f33c84cc27 100644
--- a/packages/backend/src/models/LatestNote.ts
+++ b/packages/backend/src/models/LatestNote.ts
@@ -6,7 +6,7 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { MiUser } from '@/models/User.js';
 import { MiNote } from '@/models/Note.js';
-import { isQuote, isRenote } from '@/misc/is-renote.js';
+import { isQuote, isRenote, MinimalNote } from '@/misc/is-renote.js';
 
 /**
  * Maps a user to the most recent post by that user.
@@ -76,7 +76,7 @@ export class SkLatestNote {
 	/**
 	 * Generates a compound key matching a provided note.
 	 */
-	static keyFor(note: MiNote) {
+	static keyFor(note: MinimalNote) {
 		return {
 			userId: note.userId,
 			isPublic: note.visibility === 'public',
@@ -88,7 +88,7 @@ export class SkLatestNote {
 	/**
 	 * Checks if two notes would produce equivalent compound keys.
 	 */
-	static areEquivalent(first: MiNote, second: MiNote): boolean {
+	static areEquivalent(first: MinimalNote, second: MinimalNote): boolean {
 		const firstKey = SkLatestNote.keyFor(first);
 		const secondKey = SkLatestNote.keyFor(second);
 
diff --git a/packages/backend/src/models/NoteEdit.ts b/packages/backend/src/models/NoteEdit.ts
index 449c974d52..9e2b516754 100644
--- a/packages/backend/src/models/NoteEdit.ts
+++ b/packages/backend/src/models/NoteEdit.ts
@@ -7,6 +7,8 @@ import { Entity, JoinColumn, Column, ManyToOne, PrimaryColumn, Index } from 'typ
 import { id } from './util/id.js';
 import { MiNote } from './Note.js';
 import type { MiDriveFile } from './DriveFile.js';
+import { MiUser } from '@/models/User.js';
+import { noteVisibilities } from '@/types.js';
 
 @Entity()
 export class NoteEdit {
@@ -26,17 +28,64 @@ export class NoteEdit {
 	@JoinColumn()
 	public note: MiNote | null;
 
+	// TODO data migration
+	@Column({
+		...id(),
+		comment: 'The ID of author.',
+	})
+	public userId: MiUser['id'];
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user: MiUser | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+		comment: 'The ID of renote target. Will always be null for older edits',
+	})
+	public renoteId: MiNote['id'] | null;
+
+	@ManyToOne(() => MiNote, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public renote: MiNote | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+		comment: 'The ID of reply target. Will always be null for older edits',
+	})
+	public replyId: MiNote['id'] | null;
+
+	@ManyToOne(() => MiNote, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public reply: MiNote | null;
+
+	@Column('enum', { enum: noteVisibilities })
+	public visibility: typeof noteVisibilities[number];
+
 	@Column('text', {
 		nullable: true,
 	})
 	public newText: string | null;
 
-	@Column('varchar', {
-		length: 512,
+	@Column('text', {
 		nullable: true,
+		comment: 'Will always be null for older edits',
 	})
 	public cw: string | null;
 
+	@Column('text', {
+		nullable: true,
+	})
+	public newCw: string | null;
+
 	@Column({
 		...id(),
 		array: true,
@@ -49,14 +98,21 @@ export class NoteEdit {
 	})
 	public updatedAt: Date;
 
+	// TODO rename migration
 	@Column('text', {
 		nullable: true,
 	})
-	public oldText: string | null;
+	public text: string | null;
 
 	@Column('timestamp with time zone', {
 		comment: 'The old date from before the edit',
 		nullable: true,
 	})
 	public oldDate: Date | null;
+
+	@Column('boolean', {
+		default: false,
+		comment: 'Whether this revision had a poll. Will always be false for older edits',
+	})
+	public hasPoll: boolean;
 }
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 721e28a73d..3d8339fa3b 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Bull from 'bullmq';
-import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask } from '@/queue/types.js';
+import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask } from '@/queue/types.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import Logger from '@/logger.js';
@@ -19,11 +19,14 @@ import ApRequestChart from '@/core/chart/charts/ap-request.js';
 import FederationChart from '@/core/chart/charts/federation.js';
 import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
-import type { DriveFilesRepository, NotesRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NoteEditsRepository, NotesRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
 import { NoteEditService } from '@/core/NoteEditService.js';
 import { HashtagService } from '@/core/HashtagService.js';
 import { DriveService } from '@/core/DriveService.js';
+import { LatestNoteService } from '@/core/LatestNoteService.js';
+import { trackTask } from '@/misc/promise-tracker.js';
+import { UserSuspendService } from '@/core/UserSuspendService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -39,6 +42,9 @@ export class BackgroundTaskProcessorService {
 		@Inject(DI.driveFilesRepository)
 		private readonly driveFilesRepository: DriveFilesRepository,
 
+		@Inject(DI.noteEditsRepository)
+		private readonly noteEditsRepository: NoteEditsRepository,
+
 		private readonly apPersonService: ApPersonService,
 		private readonly cacheService: CacheService,
 		private readonly federatedInstanceService: FederatedInstanceService,
@@ -51,6 +57,8 @@ export class BackgroundTaskProcessorService {
 		private readonly noteEditService: NoteEditService,
 		private readonly hashtagService: HashtagService,
 		private readonly driveService: DriveService,
+		private readonly latestNoteService: LatestNoteService,
+		private readonly userSuspendService: UserSuspendService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -76,9 +84,15 @@ export class BackgroundTaskProcessorService {
 			return await this.processPostNote(job.data);
 		} else if (job.data.type === 'check-hibernation') {
 			return await this.processCheckHibernation(job.data);
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (job.data.type === 'delete-file') {
 			return await this.processDeleteFile(job.data);
+		} else if (job.data.type === 'update-latest-note') {
+			return await this.processUpdateLatestNote(job.data);
+		} else if (job.data.type === 'post-suspend') {
+			return await this.processPostSuspend(job.data);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'post-unsuspend') {
+			return await this.processPostUnsuspend(job.data);
 		} else {
 			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
 			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
@@ -201,12 +215,13 @@ export class BackgroundTaskProcessorService {
 		const instance = await this.federatedInstanceService.fetchOrRegister(task.host);
 		if (instance.isBlocked) return `Skipping post-inbox task: instance ${task.host} is blocked`;
 
+		// TODO move chart stuff out of background?
 		// Update charts
 		if (this.meta.enableChartsForFederatedInstances) {
-			await this.instanceChart.requestReceived(task.host);
+			this.instanceChart.requestReceived(task.host);
 		}
-		await this.apRequestChart.inbox();
-		await this.federationChart.inbox(task.host);
+		this.apRequestChart.inbox();
+		this.federationChart.inbox(task.host);
 
 		// Update instance metadata (deferred)
 		await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(instance);
@@ -229,9 +244,9 @@ export class BackgroundTaskProcessorService {
 		const mentionedUsers = await this.cacheService.getUsers(note.mentions);
 
 		if (task.edit) {
-			await this.noteEditService.postNoteEdited(note, user, note, task.silent, note.tags, Array.from(mentionedUsers.values()));
+			await this.noteEditService.postNoteEdited(note, user, note, task.silent, Array.from(mentionedUsers.values()));
 		} else {
-			await this.noteCreateService.postNoteCreated(note, user, note, task.silent, note.tags, Array.from(mentionedUsers.values()));
+			await this.noteCreateService.postNoteCreated(note, user, note, task.silent, Array.from(mentionedUsers.values()));
 		}
 
 		return 'ok';
@@ -260,4 +275,50 @@ export class BackgroundTaskProcessorService {
 		await this.driveService.deleteFileSync(file, task.isExpired, deleter);
 		return 'ok';
 	}
+
+	private async processUpdateLatestNote(task: UpdateLatestNoteBackgroundTask): Promise<string> {
+		const note = await this.notesRepository.findOneBy({ id: task.note.id });
+
+		if (note) {
+			const lastEdit = await this.noteEditsRepository.findOne({
+				where: { noteId: task.note.id },
+				order: { id: 'desc' },
+			});
+
+			if (lastEdit) {
+				// Update
+				await this.latestNoteService.handleUpdatedNote(lastEdit, note);
+			} else {
+				// Create
+				await this.latestNoteService.handleDeletedNote(note);
+			}
+		} else {
+			// Delete
+			await this.latestNoteService.handleDeletedNote(task.note);
+		}
+
+		return 'ok';
+	}
+
+	private async processPostSuspend(task: PostSuspendBackgroundTask): Promise<string> {
+		const user = await this.cacheService.findOptionalUserById(task.userId);
+		if (!user || user.isDeleted) return `Skipping post-suspend task: user ${task.userId} has been deleted`;
+
+		await trackTask(async () => {
+			await this.userSuspendService.postSuspend(user);
+		});
+
+		return 'ok';
+	}
+
+	private async processPostUnsuspend(task: PostUnsuspendBackgroundTask): Promise<string> {
+		const user = await this.cacheService.findOptionalUserById(task.userId);
+		if (!user || user.isDeleted) return `Skipping post-unsuspend task: user ${task.userId} has been deleted`;
+
+		await trackTask(async () => {
+			await this.userSuspendService.postUnsuspend(user);
+		});
+
+		return 'ok';
+	}
 }
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 7f7f1b8a74..ed9bbdbadf 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -12,6 +12,7 @@ import type { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { SystemWebhookPayload } from '@/core/SystemWebhookService.js';
 import type { UserWebhookPayload } from '@/core/UserWebhookService.js';
+import type { MinimalNote } from '@/misc/is-renote.js';
 import type httpSignature from '@peertube/http-signature';
 
 export type DeliverJobData = {
@@ -179,7 +180,10 @@ export type BackgroundTaskJobData =
 	PostInboxBackgroundTask |
 	PostNoteBackgroundTask |
 	CheckHibernationBackgroundTask |
-	DeleteFileBackgroundTask;
+	DeleteFileBackgroundTask |
+	UpdateLatestNoteBackgroundTask |
+	PostSuspendBackgroundTask |
+	PostUnsuspendBackgroundTask;
 
 export type UpdateUserBackgroundTask = {
 	type: 'update-user';
@@ -235,3 +239,18 @@ export type DeleteFileBackgroundTask = {
 	isExpired?: boolean;
 	deleterId?: string;
 };
+
+export type UpdateLatestNoteBackgroundTask = {
+	type: 'update-latest-note';
+	note: MinimalNote;
+};
+
+export type PostSuspendBackgroundTask = {
+	type: 'post-suspend';
+	userId: string;
+};
+
+export type PostUnsuspendBackgroundTask = {
+	type: 'post-unsuspend';
+	userId: string;
+};

From c9f2554b2f0dd6c9656c44ad0ffd862c9faaa027 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:40:56 -0400
Subject: [PATCH 011/107] track federation-related promises to avoid data loss
 during restart

---
 .../backend/src/core/NotePiningService.ts     |  5 ++--
 .../backend/src/core/UserFollowingService.ts  | 28 +++++++++----------
 .../src/core/activitypub/ApResolverService.ts |  5 ++--
 .../core/activitypub/models/ApNoteService.ts  |  4 +--
 .../queue/processors/InboxProcessorService.ts |  5 ++--
 .../src/server/api/endpoints/i/update.ts      |  3 +-
 .../server/api/endpoints/notes/polls/vote.ts  |  3 +-
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/packages/backend/src/core/NotePiningService.ts b/packages/backend/src/core/NotePiningService.ts
index 836db52e48..a510676ef9 100644
--- a/packages/backend/src/core/NotePiningService.ts
+++ b/packages/backend/src/core/NotePiningService.ts
@@ -18,6 +18,7 @@ import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerServ
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 import type { DataSource } from 'typeorm';
 
 @Injectable()
@@ -84,7 +85,7 @@ export class NotePiningService {
 
 		// Deliver to remote followers
 		if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
-			await this.deliverPinnedChange(user, note.id, true);
+			trackPromise(this.deliverPinnedChange(user, note.id, true));
 		}
 	}
 
@@ -112,7 +113,7 @@ export class NotePiningService {
 
 		// Deliver to remote followers
 		if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
-			await this.deliverPinnedChange(user, noteId, false);
+			trackPromise(this.deliverPinnedChange(user, noteId, false));
 		}
 	}
 
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 833ea97193..1d3eada189 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -31,6 +31,7 @@ import type { ThinUser } from '@/queue/types.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { InternalEventService } from '@/global/InternalEventService.js';
 import type Logger from '../logger.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 
 type Local = MiLocalUser | {
 	id: MiLocalUser['id'];
@@ -102,7 +103,7 @@ export class UserFollowingService implements OnModuleInit {
 	@bindThis
 	public async deliverAccept(follower: MiRemoteUser, followee: MiPartialLocalUser, requestId?: string) {
 		const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee));
-		this.queueService.deliver(followee, content, follower.inbox, false);
+		await this.queueService.deliver(followee, content, follower.inbox, false);
 	}
 
 	@bindThis
@@ -152,7 +153,7 @@ export class UserFollowingService implements OnModuleInit {
 			// すでにフォロー関係が存在している場合
 			if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 				// リモート → ローカル: acceptを送り返しておしまい
-				this.deliverAccept(follower, followee, requestId);
+				trackPromise(this.deliverAccept(follower, followee, requestId));
 				return;
 			}
 			if (this.userEntityService.isLocalUser(follower)) {
@@ -206,7 +207,7 @@ export class UserFollowingService implements OnModuleInit {
 		await this.insertFollowingDoc(followee, follower, silent, withReplies);
 
 		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-			this.deliverAccept(follower, followee, requestId);
+			trackPromise(this.deliverAccept(follower, followee, requestId));
 		}
 	}
 
@@ -581,7 +582,7 @@ export class UserFollowingService implements OnModuleInit {
 		await this.insertFollowingDoc(followee, follower, false, request.withReplies);
 
 		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-			this.deliverAccept(follower, followee as MiPartialLocalUser, request.requestId ?? undefined);
+			trackPromise(this.deliverAccept(follower, followee as MiPartialLocalUser, request.requestId ?? undefined));
 		}
 
 		this.userEntityService.pack(followee.id, followee, {
@@ -595,14 +596,13 @@ export class UserFollowingService implements OnModuleInit {
 			id: MiUser['id']; host: MiUser['host']; uri: MiUser['host']; inbox: MiUser['inbox']; sharedInbox: MiUser['sharedInbox'];
 		},
 	): Promise<void> {
-		const requests = await this.followRequestsRepository.findBy({
+		const requests = await this.followRequestsRepository.find({ where: {
 			followeeId: user.id,
-		});
+		}, relations: {
+			follower: true,
+		} });
 
-		for (const request of requests) {
-			const follower = await this.usersRepository.findOneByOrFail({ id: request.followerId });
-			this.acceptFollowRequest(user, follower);
-		}
+		await Promise.all(requests.map(request => this.acceptFollowRequest(user, request.follower as MiUser)));
 	}
 
 	/**
@@ -611,7 +611,7 @@ export class UserFollowingService implements OnModuleInit {
 	@bindThis
 	public async rejectFollowRequest(user: Local, follower: Both): Promise<void> {
 		if (this.userEntityService.isRemoteUser(follower)) {
-			this.deliverReject(user, follower);
+			trackPromise(this.deliverReject(user, follower));
 		}
 
 		await this.removeFollowRequest(user, follower);
@@ -627,7 +627,7 @@ export class UserFollowingService implements OnModuleInit {
 	@bindThis
 	public async rejectFollow(user: Local, follower: Both): Promise<void> {
 		if (this.userEntityService.isRemoteUser(follower)) {
-			this.deliverReject(user, follower);
+			trackPromise(this.deliverReject(user, follower));
 		}
 
 		await this.removeFollow(user, follower);
@@ -696,7 +696,7 @@ export class UserFollowingService implements OnModuleInit {
 		});
 
 		const content = this.apRendererService.addContext(this.apRendererService.renderReject(this.apRendererService.renderFollow(follower, followee, request?.requestId ?? undefined), followee));
-		this.queueService.deliver(followee, content, follower.inbox, false);
+		await this.queueService.deliver(followee, content, follower.inbox, false);
 	}
 
 	/**
@@ -720,7 +720,7 @@ export class UserFollowingService implements OnModuleInit {
 
 	@bindThis
 	public async isFollowing(followerId: MiUser['id'], followeeId: MiUser['id']) {
-		return this.cacheService.isFollowing(followerId, followeeId);
+		return await this.cacheService.isFollowing(followerId, followeeId);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index f6178ace1a..506686cb46 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -23,6 +23,7 @@ import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { toArray } from '@/misc/prelude/array.js';
 import { isPureRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 import { AnyCollection, getApId, getNullableApId, IObjectWithId, isCollection, isCollectionOrOrderedCollection, isCollectionPage, isOrderedCollection, isOrderedCollectionPage } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
@@ -269,8 +270,8 @@ export class Resolver {
 			log.duration = calculateDurationSince(startTime);
 
 			// Save or finalize asynchronously
-			this.apLogService.saveFetchLog(log)
-				.catch(err => this.logger.error('Failed to record AP object fetch:', err));
+			trackPromise(this.apLogService.saveFetchLog(log)
+				.catch(err => this.logger.error('Failed to record AP object fetch:', err)));
 		}
 	}
 
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 0eaf26de54..9b717af32d 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -277,7 +277,7 @@ export class ApNoteService implements OnModuleInit {
 
 					return x;
 				})
-				.catch(async err => {
+				.catch(err => {
 					this.logger.warn(`error ${renderInlineError(err)} fetching inReplyTo ${note.inReplyTo} for note ${entryUri}`);
 					throw new IdentifiableError('1ebf0a96-2769-4973-a6c2-3dcbad409dff', `failed to create note ${entryUri}: could not fetch inReplyTo ${note.inReplyTo}`, true, err);
 				})
@@ -456,7 +456,7 @@ export class ApNoteService implements OnModuleInit {
 
 					return x;
 				})
-				.catch(async err => {
+				.catch(err => {
 					this.logger.warn(`error ${renderInlineError(err)} fetching inReplyTo ${note.inReplyTo} for note ${entryUri}`);
 					throw new IdentifiableError('1ebf0a96-2769-4973-a6c2-3dcbad409dff', `failed to update note ${entryUri}: could not fetch inReplyTo ${note.inReplyTo}`, true, err);
 				})
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 1c7765fddf..1a2389dac4 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -34,6 +34,7 @@ import { TimeService } from '@/global/TimeService.js';
 import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { QueueService } from '@/core/QueueService.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type { InboxJobData } from '../types.js';
 
@@ -103,8 +104,8 @@ export class InboxProcessorService implements OnApplicationShutdown {
 			log.duration = calculateDurationSince(startTime);
 
 			// Save or finalize asynchronously
-			this.apLogService.saveInboxLog(log)
-				.catch(err => this.logger.error('Failed to record AP activity:', err));
+			trackPromise(this.apLogService.saveInboxLog(log)
+				.catch(err => this.logger.error('Failed to record AP activity:', err)));
 		}
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index fe3f180aca..90b83443e4 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -39,6 +39,7 @@ import { trackPromise } from '@/misc/promise-tracker.js';
 import { QueueService } from '@/core/QueueService.js';
 import { ApiLoggerService } from '../../ApiLoggerService.js';
 import { ApiError } from '../../error.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 
 export const meta = {
 	tags: ['account'],
@@ -643,7 +644,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
 			if (user.isLocked && ps.isLocked === false) {
-				await this.userFollowingService.acceptAllFollowRequests(user);
+				trackPromise(this.userFollowingService.acceptAllFollowRequests(user));
 			}
 
 			// フォロワーにUpdateを配信
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
index f7a5db8739..5bc104aad3 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
@@ -16,6 +16,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { DI } from '@/di-symbols.js';
 import { UserBlockingService } from '@/core/UserBlockingService.js';
 import { TimeService } from '@/global/TimeService.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
@@ -176,7 +177,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			// リモートフォロワーにUpdate配信
-			await this.pollService.deliverQuestionUpdate(note);
+			trackPromise(this.pollService.deliverQuestionUpdate(note));
 		});
 	}
 }

From 41d62e45347d67cf795e4c496b9f271d1b3f548c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:41:14 -0400
Subject: [PATCH 012/107] fix notes/versions endpoint

---
 packages/backend/src/server/api/endpoints/notes/versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/versions.ts b/packages/backend/src/server/api/endpoints/notes/versions.ts
index 1c6f9838f5..92a1f14dce 100644
--- a/packages/backend/src/server/api/endpoints/notes/versions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/versions.ts
@@ -108,7 +108,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				editArray.push({
 					oldDate: (edit.oldDate ?? edit.updatedAt).toISOString(),
 					updatedAt: edit.updatedAt.toISOString(),
-					text: edit.oldText ?? edit.newText ?? null,
+					text: edit.text ?? null,
 				});
 			}
 

From 05f9d5d446e8c6c0841a64f65bb3167e063af430 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:51:32 -0400
Subject: [PATCH 013/107] await more promises to improve stack traces

---
 .../backend/src/core/AnnouncementService.ts   |  4 +--
 packages/backend/src/core/AntennaService.ts   |  2 +-
 .../src/core/AvatarDecorationService.ts       |  2 +-
 packages/backend/src/core/ChatService.ts      |  4 +--
 .../src/core/ImageProcessingService.ts        |  6 ++---
 .../backend/src/core/NotificationService.ts   |  4 +--
 packages/backend/src/core/RoleService.ts      |  2 +-
 packages/backend/src/core/S3Service.ts        |  2 +-
 packages/backend/src/core/SearchService.ts    |  4 +--
 packages/backend/src/core/SponsorsService.ts  |  4 +--
 .../backend/src/core/UserSearchService.ts     |  2 +-
 packages/backend/src/core/UserService.ts      |  2 +-
 .../backend/src/core/UserWebhookService.ts    |  2 +-
 .../src/core/activitypub/JsonLdService.ts     |  4 +--
 .../activitypub/models/ApPersonService.ts     |  5 ++--
 .../core/entities/BlockingEntityService.ts    |  3 ++-
 .../src/core/entities/ChatEntityService.ts    | 12 ++++-----
 .../src/core/entities/ClipEntityService.ts    |  3 ++-
 .../core/entities/DriveFileEntityService.ts   |  2 ++
 .../src/core/entities/EmojiEntityService.ts   |  2 +-
 .../src/core/entities/FlashEntityService.ts   |  2 +-
 .../entities/FollowRequestEntityService.ts    |  2 +-
 .../core/entities/FollowingEntityService.ts   |  3 ++-
 .../core/entities/GalleryPostEntityService.ts |  3 ++-
 .../core/entities/InviteCodeEntityService.ts  |  2 +-
 .../entities/ModerationLogEntityService.ts    |  3 ++-
 .../src/core/entities/MutingEntityService.ts  |  3 ++-
 .../src/core/entities/NoteEntityService.ts    |  1 +
 .../entities/NoteReactionEntityService.ts     |  2 +-
 .../src/core/entities/PageEntityService.ts    |  5 ++--
 .../entities/RenoteMutingEntityService.ts     |  3 ++-
 .../src/core/entities/UserEntityService.ts    |  9 ++++---
 .../core/entities/UserListEntityService.ts    |  2 +-
 .../processors/ImportNotesProcessorService.ts |  4 +--
 .../backend/src/server/api/ApiCallService.ts  | 25 +++++++++++--------
 .../src/server/api/ApiServerService.ts        |  2 +-
 .../src/server/api/SigninApiService.ts        |  4 +--
 .../notification-recipient/create.ts          |  2 +-
 .../notification-recipient/list.ts            |  2 +-
 .../notification-recipient/show.ts            |  2 +-
 .../notification-recipient/update.ts          |  2 +-
 .../api/endpoints/admin/captcha/current.ts    |  2 +-
 .../admin/delete-all-files-of-a-user.ts       |  2 +-
 .../api/endpoints/admin/drive/cleanup.ts      |  2 +-
 .../server/api/endpoints/admin/emoji/add.ts   |  2 +-
 .../server/api/endpoints/admin/emoji/copy.ts  |  2 +-
 .../api/endpoints/admin/emoji/list-remote.ts  |  2 +-
 .../server/api/endpoints/admin/emoji/list.ts  |  2 +-
 .../admin/federation/delete-all-files.ts      |  2 +-
 .../refresh-remote-instance-metadata.ts       |  2 +-
 .../admin/federation/remove-all-following.ts  |  2 +-
 .../server/api/endpoints/admin/queue/clear.ts |  4 +--
 .../server/api/endpoints/admin/queue/jobs.ts  |  2 +-
 .../api/endpoints/admin/queue/promote-jobs.ts |  4 +--
 .../api/endpoints/admin/queue/queue-stats.ts  |  2 +-
 .../api/endpoints/admin/queue/queues.ts       |  2 +-
 .../api/endpoints/admin/queue/remove-job.ts   |  2 +-
 .../api/endpoints/admin/queue/retry-job.ts    |  2 +-
 .../api/endpoints/admin/queue/show-job.ts     |  2 +-
 .../endpoints/admin/system-webhook/create.ts  |  2 +-
 .../endpoints/admin/system-webhook/list.ts    |  2 +-
 .../endpoints/admin/system-webhook/show.ts    |  2 +-
 .../endpoints/admin/system-webhook/update.ts  |  2 +-
 .../src/server/api/endpoints/announcements.ts |  2 +-
 .../api/endpoints/auth/session/userkey.ts     |  2 +-
 .../api/endpoints/chat/messages/show.ts       |  2 +-
 .../endpoints/chat/rooms/invitations/inbox.ts |  2 +-
 .../chat/rooms/invitations/outbox.ts          |  2 +-
 .../api/endpoints/chat/rooms/joining.ts       |  2 +-
 .../api/endpoints/chat/rooms/members.ts       |  2 +-
 .../server/api/endpoints/chat/rooms/owned.ts  |  2 +-
 .../server/api/endpoints/chat/rooms/show.ts   |  2 +-
 .../server/api/endpoints/chat/rooms/update.ts |  2 +-
 .../api/endpoints/clips/my-favorites.ts       |  2 +-
 .../api/endpoints/drive/folders/update.ts     |  2 +-
 .../backend/src/server/api/endpoints/emoji.ts |  2 +-
 .../api/endpoints/export-custom-emojis.ts     |  2 +-
 .../api/endpoints/federation/followers.ts     |  2 +-
 .../api/endpoints/federation/following.ts     |  2 +-
 .../server/api/endpoints/flash/my-likes.ts    |  2 +-
 .../src/server/api/endpoints/hashtags/list.ts |  2 +-
 .../server/api/endpoints/i/export-antennas.ts |  2 +-
 .../server/api/endpoints/i/export-blocking.ts |  2 +-
 .../server/api/endpoints/i/export-clips.ts    |  2 +-
 .../src/server/api/endpoints/i/export-data.ts |  2 +-
 .../api/endpoints/i/export-favorites.ts       |  2 +-
 .../api/endpoints/i/export-following.ts       |  2 +-
 .../src/server/api/endpoints/i/export-mute.ts |  2 +-
 .../server/api/endpoints/i/export-notes.ts    |  2 +-
 .../api/endpoints/i/export-user-lists.ts      |  2 +-
 .../src/server/api/endpoints/i/page-likes.ts  |  2 +-
 .../api/endpoints/notes/schedule/list.ts      |  2 +-
 .../api/endpoints/notifications/flush.ts      |  2 +-
 .../notifications/mark-all-as-read.ts         |  2 +-
 .../server/api/endpoints/reset-password.ts    |  2 +-
 .../endpoints/users/lists/get-memberships.ts  |  2 +-
 .../server/api/mastodon/MastodonConverters.ts |  2 +-
 97 files changed, 143 insertions(+), 127 deletions(-)

diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts
index 54496f9922..48c012da0f 100644
--- a/packages/backend/src/core/AnnouncementService.ts
+++ b/packages/backend/src/core/AnnouncementService.ts
@@ -218,9 +218,9 @@ export class AnnouncementService {
 				announcementId: announcement.id,
 				userId: me.id,
 			});
-			return this.announcementEntityService.pack({ ...announcement, isRead: read !== null }, me);
+			return await this.announcementEntityService.pack({ ...announcement, isRead: read !== null }, me);
 		} else {
-			return this.announcementEntityService.pack(announcement, null);
+			return await this.announcementEntityService.pack(announcement, null);
 		}
 	}
 
diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index 660c97dd6a..cc4b7dd719 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -107,7 +107,7 @@ export class AntennaService implements OnApplicationShutdown {
 			this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 		}
 
-		redisPipeline.exec();
+		await redisPipeline.exec();
 	}
 
 	// NOTE: フォローしているユーザーのノート、リストのユーザーのノート、グループのユーザーのノート指定はパフォーマンス上の理由で無効になっている
diff --git a/packages/backend/src/core/AvatarDecorationService.ts b/packages/backend/src/core/AvatarDecorationService.ts
index aedb1d6a80..0a586789f1 100644
--- a/packages/backend/src/core/AvatarDecorationService.ts
+++ b/packages/backend/src/core/AvatarDecorationService.ts
@@ -109,7 +109,7 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 		if (noCache) {
 			this.cache.delete();
 		}
-		return this.cache.fetch(() => this.avatarDecorationsRepository.find());
+		return await this.cache.fetch(() => this.avatarDecorationsRepository.find());
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/ChatService.ts b/packages/backend/src/core/ChatService.ts
index cdecd41726..9132c166f9 100644
--- a/packages/backend/src/core/ChatService.ts
+++ b/packages/backend/src/core/ChatService.ts
@@ -605,12 +605,12 @@ export class ChatService {
 
 	@bindThis
 	public async findMyRoomById(ownerId: MiUser['id'], roomId: MiChatRoom['id']) {
-		return this.chatRoomsRepository.findOneBy({ id: roomId, ownerId: ownerId });
+		return await this.chatRoomsRepository.findOneBy({ id: roomId, ownerId: ownerId });
 	}
 
 	@bindThis
 	public async findRoomById(roomId: MiChatRoom['id']) {
-		return this.chatRoomsRepository.findOne({ where: { id: roomId }, relations: ['owner'] });
+		return await this.chatRoomsRepository.findOne({ where: { id: roomId }, relations: ['owner'] });
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/ImageProcessingService.ts b/packages/backend/src/core/ImageProcessingService.ts
index 6f60475442..d042cf1f30 100644
--- a/packages/backend/src/core/ImageProcessingService.ts
+++ b/packages/backend/src/core/ImageProcessingService.ts
@@ -58,7 +58,7 @@ export class ImageProcessingService {
 	 */
 	@bindThis
 	public async convertToWebp(path: string, width: number, height: number, options: sharp.WebpOptions = webpDefault): Promise<IImage> {
-		return this.convertSharpToWebp(sharp(path), width, height, options);
+		return await this.convertSharpToWebp(sharp(path), width, height, options);
 	}
 
 	@bindThis
@@ -100,7 +100,7 @@ export class ImageProcessingService {
 	 */
 	@bindThis
 	public async convertToAvif(path: string, width: number, height: number, options: sharp.AvifOptions = avifDefault): Promise<IImage> {
-		return this.convertSharpToAvif(sharp(path), width, height, options);
+		return await this.convertSharpToAvif(sharp(path), width, height, options);
 	}
 
 	@bindThis
@@ -142,7 +142,7 @@ export class ImageProcessingService {
 	 */
 	@bindThis
 	public async convertToPng(path: string, width: number, height: number): Promise<IImage> {
-		return this.convertSharpToPng(sharp(path), width, height);
+		return await this.convertSharpToPng(sharp(path), width, height);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts
index 9180dfa418..63d2011441 100644
--- a/packages/backend/src/core/NotificationService.ts
+++ b/packages/backend/src/core/NotificationService.ts
@@ -72,9 +72,9 @@ export class NotificationService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private postReadAllNotifications(userId: MiUser['id']) {
+	private async postReadAllNotifications(userId: MiUser['id']) {
 		this.globalEventService.publishMainStream(userId, 'readAllNotifications');
-		this.pushNotificationService.pushNotification(userId, 'readAllNotifications', undefined);
+		await this.pushNotificationService.pushNotification(userId, 'readAllNotifications', undefined);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 6dd768c3c6..0b760560ca 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -751,7 +751,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			this.globalEventService.publishRoleTimelineStream(role.id, 'note', note);
 		}
 
-		redisPipeline.exec();
+		await redisPipeline.exec();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index 955d778015..30de5289f4 100644
--- a/packages/backend/src/core/S3Service.ts
+++ b/packages/backend/src/core/S3Service.ts
@@ -91,7 +91,7 @@ export class S3Service implements OnApplicationShutdown {
 	@bindThis
 	public async upload(input: PutObjectCommandInput) {
 		const client = this.getS3Client();
-		return new Upload({
+		return await new Upload({
 			client,
 			params: input,
 			partSize: (client.config.endpoint && (await client.config.endpoint()).hostname === 'storage.googleapis.com')
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 6e4dd9adca..04026865fb 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -256,10 +256,10 @@ export class SearchService {
 			case 'sqlTsvector': {
 				// ほとんど内容に差がないのでsqlLikeとsqlPgroongaを同じ処理にしている.
 				// 今後の拡張で差が出る用であれば関数を分ける.
-				return this.searchNoteByLike(q, me, opts, pagination);
+				return await this.searchNoteByLike(q, me, opts, pagination);
 			}
 			case 'meilisearch': {
-				return this.searchNoteByMeiliSearch(q, me, opts, pagination);
+				return await this.searchNoteByMeiliSearch(q, me, opts, pagination);
 			}
 			default: {
 				// eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/backend/src/core/SponsorsService.ts b/packages/backend/src/core/SponsorsService.ts
index 23994b5761..454df4442e 100644
--- a/packages/backend/src/core/SponsorsService.ts
+++ b/packages/backend/src/core/SponsorsService.ts
@@ -94,12 +94,12 @@ export class SponsorsService {
 	@bindThis
 	public async instanceSponsors(forceUpdate: boolean) {
 		if (forceUpdate) await this.cache.refresh('instance');
-		return this.cache.fetch('instance');
+		return await this.cache.fetch('instance');
 	}
 
 	@bindThis
 	public async sharkeySponsors(forceUpdate: boolean) {
 		if (forceUpdate) await this.cache.refresh('sharkey');
-		return this.cache.fetch('sharkey');
+		return await this.cache.fetch('sharkey');
 	}
 }
diff --git a/packages/backend/src/core/UserSearchService.ts b/packages/backend/src/core/UserSearchService.ts
index 6c6d3a5280..9e2b5dfc64 100644
--- a/packages/backend/src/core/UserSearchService.ts
+++ b/packages/backend/src/core/UserSearchService.ts
@@ -99,7 +99,7 @@ export class UserSearchService {
 			}
 		}
 
-		return this.userEntityService.packMany<'UserLite' | 'UserDetailed'>(
+		return await this.userEntityService.packMany<'UserLite' | 'UserDetailed'>(
 			[...resultSet].slice(0, limit),
 			me,
 			{ schema: opts?.detail ? 'UserDetailed' : 'UserLite' },
diff --git a/packages/backend/src/core/UserService.ts b/packages/backend/src/core/UserService.ts
index 34c343712c..69efb3a230 100644
--- a/packages/backend/src/core/UserService.ts
+++ b/packages/backend/src/core/UserService.ts
@@ -70,6 +70,6 @@ export class UserService {
 	@bindThis
 	public async notifySystemWebhook(user: MiUser, type: 'userCreated') {
 		const packedUser = await this.userEntityService.pack(user, null, { schema: 'UserLite' });
-		return this.systemWebhookService.enqueueSystemWebhook(type, packedUser);
+		return await this.systemWebhookService.enqueueSystemWebhook(type, packedUser);
 	}
 }
diff --git a/packages/backend/src/core/UserWebhookService.ts b/packages/backend/src/core/UserWebhookService.ts
index 24a519bc5c..097482d6a5 100644
--- a/packages/backend/src/core/UserWebhookService.ts
+++ b/packages/backend/src/core/UserWebhookService.ts
@@ -94,7 +94,7 @@ export class UserWebhookService implements OnApplicationShutdown {
 	) {
 		const webhooks = await this.getActiveWebhooks()
 			.then(webhooks => webhooks.filter(webhook => webhook.userId === userId && webhook.on.includes(type)));
-		return Promise.all(
+		return await Promise.all(
 			webhooks.map(webhook => {
 				return this.queueService.userWebhookDeliver(webhook, type, content);
 			}),
diff --git a/packages/backend/src/core/activitypub/JsonLdService.ts b/packages/backend/src/core/activitypub/JsonLdService.ts
index 8e14e0909f..194af63f5a 100644
--- a/packages/backend/src/core/activitypub/JsonLdService.ts
+++ b/packages/backend/src/core/activitypub/JsonLdService.ts
@@ -134,7 +134,7 @@ export class JsonLdService {
 		const customLoader = this.getLoader();
 		// XXX: Importing jsonld dynamically since Jest frequently fails to import it statically
 		// https://github.com/misskey-dev/misskey/pull/9894#discussion_r1103753595
-		return (await import('jsonld')).default.compact(data, context, {
+		return await (await import('jsonld')).default.compact(data, context, {
 			documentLoader: customLoader,
 		});
 	}
@@ -142,7 +142,7 @@ export class JsonLdService {
 	@bindThis
 	public async normalize(data: Document): Promise<string> {
 		const customLoader = this.getLoader();
-		return (await import('jsonld')).default.normalize(data, {
+		return await (await import('jsonld')).default.normalize(data, {
 			documentLoader: customLoader,
 		});
 	}
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index f153d51c9d..a8cfdfe682 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -329,8 +329,9 @@ export class ApPersonService implements OnModuleInit {
 		return user;
 	}
 
+	// TODO fix these "any" types
 	private async resolveAvatarAndBanner(user: MiRemoteUser, icon: any, image: any, bgimg: any): Promise<Partial<Pick<MiRemoteUser, 'avatarId' | 'bannerId' | 'backgroundId' | 'avatarUrl' | 'bannerUrl' | 'backgroundUrl' | 'avatarBlurhash' | 'bannerBlurhash' | 'backgroundBlurhash'>>> {
-		const [avatar, banner, background] = await Promise.all([icon, image, bgimg].map(img => {
+		const [avatar, banner, background] = await Promise.all([icon, image, bgimg].map(async img => {
 			// icon and image may be arrays
 			// see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-icon
 			if (Array.isArray(img)) {
@@ -343,7 +344,7 @@ export class ApPersonService implements OnModuleInit {
 				return { id: null, url: null, blurhash: null };
 			}
 
-			return this.apImageService.resolveImage(user, img).catch(() => null);
+			return await this.apImageService.resolveImage(user, img).catch(() => null);
 		}));
 
 		if (((avatar != null && avatar.id != null) || (banner != null && banner.id != null))
diff --git a/packages/backend/src/core/entities/BlockingEntityService.ts b/packages/backend/src/core/entities/BlockingEntityService.ts
index 1e699032e2..0ba7a0f2dd 100644
--- a/packages/backend/src/core/entities/BlockingEntityService.ts
+++ b/packages/backend/src/core/entities/BlockingEntityService.ts
@@ -35,6 +35,7 @@ export class BlockingEntityService {
 	): Promise<Packed<'Blocking'>> {
 		const blocking = typeof src === 'object' ? src : await this.blockingsRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: blocking.id,
 			createdAt: this.idService.parse(blocking.id).date.toISOString(),
@@ -53,6 +54,6 @@ export class BlockingEntityService {
 		const _blockees = blockings.map(({ blockee, blockeeId }) => blockee ?? blockeeId);
 		const _userMap = await this.userEntityService.packMany(_blockees, me, { schema: 'UserDetailedNotMe' })
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(blockings.map(blocking => this.pack(blocking, me, { blockee: _userMap.get(blocking.blockeeId) })));
+		return await Promise.all(blockings.map(blocking => this.pack(blocking, me, { blockee: _userMap.get(blocking.blockeeId) })));
 	}
 }
diff --git a/packages/backend/src/core/entities/ChatEntityService.ts b/packages/backend/src/core/entities/ChatEntityService.ts
index da112d5444..171a49ebcc 100644
--- a/packages/backend/src/core/entities/ChatEntityService.ts
+++ b/packages/backend/src/core/entities/ChatEntityService.ts
@@ -117,7 +117,7 @@ export class ChatEntityService {
 				.then(rooms => new Map(rooms.map(r => [r.id, r]))),
 		]);
 
-		return Promise.all(messages.map(message => this.packMessageDetailed(message, me, { _hint_: { packedUsers, packedFiles, packedRooms } })));
+		return await Promise.all(messages.map(message => this.packMessageDetailed(message, me, { _hint_: { packedUsers, packedFiles, packedRooms } })));
 	}
 
 	@bindThis
@@ -165,7 +165,7 @@ export class ChatEntityService {
 				.then(files => new Map(files.map(f => [f.id, f]))),
 		]);
 
-		return Promise.all(messages.map(message => this.packMessageLiteFor1on1(message, { _hint_: { packedFiles } })));
+		return await Promise.all(messages.map(message => this.packMessageLiteFor1on1(message, { _hint_: { packedFiles } })));
 	}
 
 	@bindThis
@@ -228,7 +228,7 @@ export class ChatEntityService {
 				.then(files => new Map(files.map(f => [f.id, f]))),
 		]);
 
-		return Promise.all(messages.map(message => this.packMessageLiteForRoom(message, { _hint_: { packedFiles, packedUsers } })));
+		return await Promise.all(messages.map(message => this.packMessageLiteForRoom(message, { _hint_: { packedFiles, packedUsers } })));
 	}
 
 	@bindThis
@@ -289,7 +289,7 @@ export class ChatEntityService {
 			}).then(memberships => new Map(_rooms.map(r => [r.id, memberships.find(m => m.roomId === r.id)]))),
 		]);
 
-		return Promise.all(_rooms.map(room => this.packRoom(room, me, { _hint_: { packedOwners, memberships } })));
+		return await Promise.all(_rooms.map(room => this.packRoom(room, me, { _hint_: { packedOwners, memberships } })));
 	}
 
 	@bindThis
@@ -322,7 +322,7 @@ export class ChatEntityService {
 	) {
 		if (invitations.length === 0) return [];
 
-		return Promise.all(invitations.map(invitation => this.packRoomInvitation(invitation, me)));
+		return await Promise.all(invitations.map(invitation => this.packRoomInvitation(invitation, me)));
 	}
 
 	@bindThis
@@ -371,6 +371,6 @@ export class ChatEntityService {
 				.then(rooms => new Map(rooms.map(r => [r.id, r]))),
 		]);
 
-		return Promise.all(memberships.map(membership => this.packRoomMembership(membership, me, { ...options, _hint_: { packedUsers, packedRooms } })));
+		return await Promise.all(memberships.map(membership => this.packRoomMembership(membership, me, { ...options, _hint_: { packedUsers, packedRooms } })));
 	}
 }
diff --git a/packages/backend/src/core/entities/ClipEntityService.ts b/packages/backend/src/core/entities/ClipEntityService.ts
index b700fe2efb..fba085767f 100644
--- a/packages/backend/src/core/entities/ClipEntityService.ts
+++ b/packages/backend/src/core/entities/ClipEntityService.ts
@@ -42,6 +42,7 @@ export class ClipEntityService {
 		const meId = me ? me.id : null;
 		const clip = typeof src === 'object' ? src : await this.clipsRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: clip.id,
 			createdAt: this.idService.parse(clip.id).date.toISOString(),
@@ -65,7 +66,7 @@ export class ClipEntityService {
 		const _users = clips.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users, me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(clips.map(clip => this.pack(clip, me, { packedUser: _userMap.get(clip.userId) })));
+		return await Promise.all(clips.map(clip => this.pack(clip, me, { packedUser: _userMap.get(clip.userId) })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts
index a172f81eed..06197ff839 100644
--- a/packages/backend/src/core/entities/DriveFileEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFileEntityService.ts
@@ -201,6 +201,7 @@ export class DriveFileEntityService implements OnModuleInit {
 
 		const file = typeof src === 'object' ? src : await this.driveFilesRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll<Packed<'DriveFile'>>({
 			id: file.id,
 			createdAt: this.idService.parse(file.id).date.toISOString(),
@@ -239,6 +240,7 @@ export class DriveFileEntityService implements OnModuleInit {
 		const file = typeof src === 'object' ? src : await this.driveFilesRepository.findOneBy({ id: src });
 		if (file == null) return null;
 
+		// noinspection ES6MissingAwait
 		return await awaitAll<Packed<'DriveFile'>>({
 			id: file.id,
 			createdAt: this.idService.parse(file.id).date.toISOString(),
diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts
index 5f03df554c..9c3f0adfff 100644
--- a/packages/backend/src/core/entities/EmojiEntityService.ts
+++ b/packages/backend/src/core/entities/EmojiEntityService.ts
@@ -179,7 +179,7 @@ export class EmojiEntityService implements OnModuleInit {
 			hintRoles = new Map(roles.map(x => [x.id, x]));
 		}
 
-		return Promise.all(emojis.map(x => this.packDetailedAdmin(x, { roles: hintRoles })));
+		return await Promise.all(emojis.map(x => this.packDetailedAdmin(x, { roles: hintRoles })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/FlashEntityService.ts b/packages/backend/src/core/entities/FlashEntityService.ts
index c2575e69aa..47617c5be7 100644
--- a/packages/backend/src/core/entities/FlashEntityService.ts
+++ b/packages/backend/src/core/entities/FlashEntityService.ts
@@ -77,7 +77,7 @@ export class FlashEntityService {
 				.getRawMany<{ flashLike_flashId: string }>()
 				.then(likes => [...new Set(likes.map(like => like.flashLike_flashId))])
 			: [];
-		return Promise.all(
+		return await Promise.all(
 			flashes.map(flash => this.pack(flash, me, {
 				packedUser: _userMap.get(flash.userId),
 				likedFlashIds: _likedFlashIds,
diff --git a/packages/backend/src/core/entities/FollowRequestEntityService.ts b/packages/backend/src/core/entities/FollowRequestEntityService.ts
index 0101ec8aa7..05c69b4d56 100644
--- a/packages/backend/src/core/entities/FollowRequestEntityService.ts
+++ b/packages/backend/src/core/entities/FollowRequestEntityService.ts
@@ -50,7 +50,7 @@ export class FollowRequestEntityService {
 		const _followees = requests.map(({ followee, followeeId }) => followee ?? followeeId);
 		const _userMap = await this.userEntityService.packMany([..._followers, ..._followees], me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(
+		return await Promise.all(
 			requests.map(req => {
 				const packedFollower = _userMap.get(req.followerId);
 				const packedFollowee = _userMap.get(req.followeeId);
diff --git a/packages/backend/src/core/entities/FollowingEntityService.ts b/packages/backend/src/core/entities/FollowingEntityService.ts
index d54c954bf2..5645217ebc 100644
--- a/packages/backend/src/core/entities/FollowingEntityService.ts
+++ b/packages/backend/src/core/entities/FollowingEntityService.ts
@@ -139,6 +139,7 @@ export class FollowingEntityService {
 
 		if (opts == null) opts = {};
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: following.id,
 			createdAt: this.idService.parse(following.id).date.toISOString(),
@@ -166,7 +167,7 @@ export class FollowingEntityService {
 		const _followers = opts?.populateFollower ? followings.map(({ follower, followerId }) => follower ?? followerId) : [];
 		const _userMap = await this.userEntityService.packMany([..._followees, ..._followers], me, { schema: 'UserDetailedNotMe' })
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(
+		return await Promise.all(
 			followings.map(following => {
 				const packedFollowee = opts?.populateFollowee ? _userMap.get(following.followeeId) : undefined;
 				const packedFollower = opts?.populateFollower ? _userMap.get(following.followerId) : undefined;
diff --git a/packages/backend/src/core/entities/GalleryPostEntityService.ts b/packages/backend/src/core/entities/GalleryPostEntityService.ts
index 9746a4c1af..a276f1508c 100644
--- a/packages/backend/src/core/entities/GalleryPostEntityService.ts
+++ b/packages/backend/src/core/entities/GalleryPostEntityService.ts
@@ -42,6 +42,7 @@ export class GalleryPostEntityService {
 		const meId = me ? me.id : null;
 		const post = typeof src === 'object' ? src : await this.galleryPostsRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: post.id,
 			createdAt: this.idService.parse(post.id).date.toISOString(),
@@ -68,7 +69,7 @@ export class GalleryPostEntityService {
 		const _users = posts.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users, me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(posts.map(post => this.pack(post, me, { packedUser: _userMap.get(post.userId) })));
+		return await Promise.all(posts.map(post => this.pack(post, me, { packedUser: _userMap.get(post.userId) })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/InviteCodeEntityService.ts b/packages/backend/src/core/entities/InviteCodeEntityService.ts
index 5d3e823a2a..ceb666ac90 100644
--- a/packages/backend/src/core/entities/InviteCodeEntityService.ts
+++ b/packages/backend/src/core/entities/InviteCodeEntityService.ts
@@ -62,7 +62,7 @@ export class InviteCodeEntityService {
 		const _usedBys = tickets.map(({ usedBy, usedById }) => usedBy ?? usedById).filter(x => x != null);
 		const _userMap = await this.userEntityService.packMany([..._createdBys, ..._usedBys], me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(
+		return await Promise.all(
 			tickets.map(ticket => {
 				const packedCreatedBy = ticket.createdById != null ? _userMap.get(ticket.createdById) : undefined;
 				const packedUsedBy = ticket.usedById != null ? _userMap.get(ticket.usedById) : undefined;
diff --git a/packages/backend/src/core/entities/ModerationLogEntityService.ts b/packages/backend/src/core/entities/ModerationLogEntityService.ts
index bf1b2a002c..2d1de5cd46 100644
--- a/packages/backend/src/core/entities/ModerationLogEntityService.ts
+++ b/packages/backend/src/core/entities/ModerationLogEntityService.ts
@@ -34,6 +34,7 @@ export class ModerationLogEntityService {
 	) {
 		const log = typeof src === 'object' ? src : await this.moderationLogsRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: log.id,
 			createdAt: this.idService.parse(log.id).date.toISOString(),
@@ -53,7 +54,7 @@ export class ModerationLogEntityService {
 		const _users = reports.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users, null, { schema: 'UserDetailedNotMe' })
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(reports.map(report => this.pack(report, { packedUser: _userMap.get(report.userId) })));
+		return await Promise.all(reports.map(report => this.pack(report, { packedUser: _userMap.get(report.userId) })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/MutingEntityService.ts b/packages/backend/src/core/entities/MutingEntityService.ts
index d361a20271..7d8c3dcde2 100644
--- a/packages/backend/src/core/entities/MutingEntityService.ts
+++ b/packages/backend/src/core/entities/MutingEntityService.ts
@@ -36,6 +36,7 @@ export class MutingEntityService {
 	): Promise<Packed<'Muting'>> {
 		const muting = typeof src === 'object' ? src : await this.mutingsRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: muting.id,
 			createdAt: this.idService.parse(muting.id).date.toISOString(),
@@ -55,7 +56,7 @@ export class MutingEntityService {
 		const _mutees = mutings.map(({ mutee, muteeId }) => mutee ?? muteeId);
 		const _userMap = await this.userEntityService.packMany(_mutees, me, { schema: 'UserDetailedNotMe' })
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(mutings.map(muting => this.pack(muting, me, { packedMutee: _userMap.get(muting.muteeId) })));
+		return await Promise.all(mutings.map(muting => this.pack(muting, me, { packedMutee: _userMap.get(muting.muteeId) })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 373f05332f..310e361736 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -592,6 +592,7 @@ export class NoteEntityService implements OnModuleInit {
 
 		const bypassSilence = opts.bypassSilence || note.userId === meId;
 
+		// noinspection ES6MissingAwait
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
 			threadId,
diff --git a/packages/backend/src/core/entities/NoteReactionEntityService.ts b/packages/backend/src/core/entities/NoteReactionEntityService.ts
index 2b0d69b261..1f6d52d20c 100644
--- a/packages/backend/src/core/entities/NoteReactionEntityService.ts
+++ b/packages/backend/src/core/entities/NoteReactionEntityService.ts
@@ -88,6 +88,6 @@ export class NoteReactionEntityService implements OnModuleInit {
 		const _users = reactions.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users, me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(reactions.map(reaction => this.pack(reaction, me, opts, { packedUser: _userMap.get(reaction.userId) })));
+		return await Promise.all(reactions.map(reaction => this.pack(reaction, me, opts, { packedUser: _userMap.get(reaction.userId) })));
 	}
 }
diff --git a/packages/backend/src/core/entities/PageEntityService.ts b/packages/backend/src/core/entities/PageEntityService.ts
index 46bf51bb6d..3106001676 100644
--- a/packages/backend/src/core/entities/PageEntityService.ts
+++ b/packages/backend/src/core/entities/PageEntityService.ts
@@ -83,11 +83,12 @@ export class PageEntityService {
 		};
 		migrate(page.content);
 		if (migrated) {
-			this.pagesRepository.update(page.id, {
+			await this.pagesRepository.update(page.id, {
 				content: page.content,
 			});
 		}
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: page.id,
 			createdAt: this.idService.parse(page.id).date.toISOString(),
@@ -119,7 +120,7 @@ export class PageEntityService {
 		const _users = pages.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users, me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(pages.map(page => this.pack(page, me, { packedUser: _userMap.get(page.userId) })));
+		return await Promise.all(pages.map(page => this.pack(page, me, { packedUser: _userMap.get(page.userId) })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/RenoteMutingEntityService.ts b/packages/backend/src/core/entities/RenoteMutingEntityService.ts
index e4e154109a..199fc2366e 100644
--- a/packages/backend/src/core/entities/RenoteMutingEntityService.ts
+++ b/packages/backend/src/core/entities/RenoteMutingEntityService.ts
@@ -36,6 +36,7 @@ export class RenoteMutingEntityService {
 	): Promise<Packed<'RenoteMuting'>> {
 		const muting = typeof src === 'object' ? src : await this.renoteMutingsRepository.findOneByOrFail({ id: src });
 
+		// noinspection ES6MissingAwait
 		return await awaitAll({
 			id: muting.id,
 			createdAt: this.idService.parse(muting.id).date.toISOString(),
@@ -54,7 +55,7 @@ export class RenoteMutingEntityService {
 		const _users = mutings.map(({ mutee, muteeId }) => mutee ?? muteeId);
 		const _userMap = await this.userEntityService.packMany(_users, me, { schema: 'UserDetailedNotMe' })
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(mutings.map(muting => this.pack(muting, me, { packedMutee: _userMap.get(muting.muteeId) })));
+		return await Promise.all(mutings.map(muting => this.pack(muting, me, { packedMutee: _userMap.get(muting.muteeId) })));
 	}
 }
 
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 6e7f15610f..bacc3c3fde 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -485,7 +485,7 @@ export class UserEntityService implements OnModuleInit {
 		if (user.avatarId != null && user.avatarUrl === null) {
 			const avatar = await this.driveFilesRepository.findOneByOrFail({ id: user.avatarId });
 			user.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar');
-			this.usersRepository.update(user.id, {
+			await this.usersRepository.update(user.id, {
 				avatarUrl: user.avatarUrl,
 				avatarBlurhash: avatar.blurhash,
 			});
@@ -493,7 +493,7 @@ export class UserEntityService implements OnModuleInit {
 		if (user.bannerId != null && user.bannerUrl === null) {
 			const banner = await this.driveFilesRepository.findOneByOrFail({ id: user.bannerId });
 			user.bannerUrl = this.driveFileEntityService.getPublicUrl(banner);
-			this.usersRepository.update(user.id, {
+			await this.usersRepository.update(user.id, {
 				bannerUrl: user.bannerUrl,
 				bannerBlurhash: banner.blurhash,
 			});
@@ -501,7 +501,7 @@ export class UserEntityService implements OnModuleInit {
 		if (user.backgroundId != null && user.backgroundUrl === null) {
 			const background = await this.driveFilesRepository.findOneByOrFail({ id: user.backgroundId });
 			user.backgroundUrl = this.driveFileEntityService.getPublicUrl(background);
-			this.usersRepository.update(user.id, {
+			await this.usersRepository.update(user.id, {
 				backgroundUrl: user.backgroundUrl,
 				backgroundBlurhash: background.blurhash,
 			});
@@ -581,6 +581,7 @@ export class UserEntityService implements OnModuleInit {
 
 		const bypassSilence = isMe || (myFollowings ? myFollowings.has(user.id) : false);
 
+		// noinspection ES6MissingAwait
 		const packed = {
 			id: user.id,
 			name: user.name,
@@ -894,7 +895,7 @@ export class UserEntityService implements OnModuleInit {
 			myFollowingsPromise,
 		]);
 
-		return Promise.all(
+		return await Promise.all(
 			_users.map(u => this.pack(
 				u,
 				me,
diff --git a/packages/backend/src/core/entities/UserListEntityService.ts b/packages/backend/src/core/entities/UserListEntityService.ts
index 2722d52195..55a15dd07b 100644
--- a/packages/backend/src/core/entities/UserListEntityService.ts
+++ b/packages/backend/src/core/entities/UserListEntityService.ts
@@ -67,7 +67,7 @@ export class UserListEntityService {
 		const _users = memberships.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(memberships.map(async x => ({
+		return await Promise.all(memberships.map(async x => ({
 			id: x.id,
 			createdAt: this.idService.parse(x.id).date.toISOString(),
 			userId: x.userId,
diff --git a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts
index 6f5e929673..a9d179d90e 100644
--- a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts
@@ -417,7 +417,7 @@ export class ImportNotesProcessorService {
 		const hashtags = extractApHashtagObjects(toot.object.tag).map((x) => x.name).filter((x): x is string => x != null);
 
 		try {
-			text = await this.mfmService.fromHtml(toot.object.content, hashtags);
+			text = this.mfmService.fromHtml(toot.object.content, hashtags);
 		} catch (error) {
 			text = undefined;
 		}
@@ -487,7 +487,7 @@ export class ImportNotesProcessorService {
 		const hashtags = extractApHashtagObjects(post.object.tag).map((x) => x.name).filter((x): x is string => x != null);
 
 		try {
-			text = await this.mfmService.fromHtml(post.object.content, hashtags);
+			text = this.mfmService.fromHtml(post.object.content, hashtags);
 		} catch (error) {
 			text = undefined;
 		}
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts
index 6605783ff1..be78a63ebb 100644
--- a/packages/backend/src/server/api/ApiCallService.ts
+++ b/packages/backend/src/server/api/ApiCallService.ts
@@ -145,11 +145,11 @@ export class ApiCallService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public handleRequest(
+	public async handleRequest(
 		endpoint: IEndpoint & { exec: any },
 		request: FastifyRequest<{ Body: Record<string, unknown> | undefined, Querystring: Record<string, unknown> }>,
 		reply: FastifyReply,
-	): void {
+	): Promise<void> {
 		// Tell crawlers not to index API endpoints.
 		// https://developers.google.com/search/docs/crawling-indexing/block-indexing
 		reply.header('X-Robots-Tag', 'noindex');
@@ -166,8 +166,8 @@ export class ApiCallService implements OnApplicationShutdown {
 			reply.code(400);
 			return;
 		}
-		this.authenticateService.authenticate(token).then(([user, app]) => {
-			this.call(endpoint, user, app, body, null, request, reply).then((res) => {
+		await this.authenticateService.authenticate(token).then(async ([user, app]) => {
+			await this.call(endpoint, user, app, body, null, request, reply).then((res) => {
 				if (request.method === 'GET' && endpoint.meta.cacheSec && !token && !user) {
 					reply.header('Cache-Control', `public, max-age=${endpoint.meta.cacheSec}`);
 				}
@@ -177,7 +177,8 @@ export class ApiCallService implements OnApplicationShutdown {
 			});
 
 			if (user) {
-				this.logIp(request, user);
+				// logIp records errors directly
+				this.logIp(request, user).catch(() => null);
 			}
 		}).catch(err => {
 			this.#sendAuthenticationError(reply, err);
@@ -225,8 +226,8 @@ export class ApiCallService implements OnApplicationShutdown {
 			reply.code(400);
 			return;
 		}
-		this.authenticateService.authenticate(token).then(([user, app]) => {
-			this.call(endpoint, user, app, fields, {
+		await this.authenticateService.authenticate(token).then(async ([user, app]) => {
+			await this.call(endpoint, user, app, fields, {
 				name: multipartData.filename,
 				path: path,
 			}, request, reply).then((res) => {
@@ -237,7 +238,8 @@ export class ApiCallService implements OnApplicationShutdown {
 			});
 
 			if (user) {
-				this.logIp(request, user);
+				// logIp records errors directly
+				this.logIp(request, user).catch(() => null);
 			}
 		}).catch(err => {
 			cleanup();
@@ -268,7 +270,7 @@ export class ApiCallService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private logIp(request: FastifyRequest, user: MiLocalUser) {
+	private async logIp(request: FastifyRequest, user: MiLocalUser) {
 		if (!this.meta.enableIpLogging) return;
 		const ip = request.ip;
 		if (!ip) {
@@ -285,12 +287,13 @@ export class ApiCallService implements OnApplicationShutdown {
 			}
 
 			try {
-				this.userIpsRepository.createQueryBuilder().insert().values({
+				await this.userIpsRepository.createQueryBuilder().insert().values({
 					createdAt: this.timeService.date,
 					userId: user.id,
 					ip: ip,
 				}).orIgnore(true).execute();
-			} catch {
+			} catch (err) {
+				this.logger.warn(`Failed to save IP address ${ip} for user ${user.id}: ${renderInlineError(err)}`);
 			}
 		}
 	}
diff --git a/packages/backend/src/server/api/ApiServerService.ts b/packages/backend/src/server/api/ApiServerService.ts
index 6ed139ad77..8900048de0 100644
--- a/packages/backend/src/server/api/ApiServerService.ts
+++ b/packages/backend/src/server/api/ApiServerService.ts
@@ -194,7 +194,7 @@ export class ApiServerService {
 			});
 
 			if (token && token.session != null && !token.fetched) {
-				this.accessTokensRepository.update(token.id, {
+				await this.accessTokensRepository.update(token.id, {
 					fetched: true,
 				});
 
diff --git a/packages/backend/src/server/api/SigninApiService.ts b/packages/backend/src/server/api/SigninApiService.ts
index a53fec88d0..6ff5ea13f1 100644
--- a/packages/backend/src/server/api/SigninApiService.ts
+++ b/packages/backend/src/server/api/SigninApiService.ts
@@ -243,7 +243,7 @@ export class SigninApiService {
 			if (same) {
 				if (profile.password!.startsWith('$2')) {
 					const newHash = await argon2.hash(password);
-					this.userProfilesRepository.update(user.id, {
+					await this.userProfilesRepository.update(user.id, {
 						password: newHash,
 					});
 				}
@@ -267,7 +267,7 @@ export class SigninApiService {
 			try {
 				if (profile.password!.startsWith('$2')) {
 					const newHash = await argon2.hash(password);
-					this.userProfilesRepository.update(user.id, {
+					await this.userProfilesRepository.update(user.id, {
 						password: newHash,
 					});
 				}
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts
index bdfbcba518..35c1eb225a 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts
@@ -116,7 +116,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 			);
 
-			return this.abuseReportNotificationRecipientEntityService.pack(result);
+			return await this.abuseReportNotificationRecipientEntityService.pack(result);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts
index dad9161a8a..f36d356205 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts
@@ -49,7 +49,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	) {
 		super(meta, paramDef, async (ps) => {
 			const recipients = await this.abuseReportNotificationService.fetchRecipients({ method: ps.method });
-			return this.abuseReportNotificationRecipientEntityService.packMany(recipients);
+			return await this.abuseReportNotificationRecipientEntityService.packMany(recipients);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts
index 557798f946..b2e5e197e3 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts
@@ -58,7 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.noSuchRecipient);
 			}
 
-			return this.abuseReportNotificationRecipientEntityService.pack(recipients[0]);
+			return await this.abuseReportNotificationRecipientEntityService.pack(recipients[0]);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts
index bd4b485217..c3d88412b3 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts
@@ -122,7 +122,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 			);
 
-			return this.abuseReportNotificationRecipientEntityService.pack(result);
+			return await this.abuseReportNotificationRecipientEntityService.pack(result);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/captcha/current.ts b/packages/backend/src/server/api/endpoints/admin/captcha/current.ts
index 7cc1bc675a..d620f937b1 100644
--- a/packages/backend/src/server/api/endpoints/admin/captcha/current.ts
+++ b/packages/backend/src/server/api/endpoints/admin/captcha/current.ts
@@ -75,7 +75,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private captchaService: CaptchaService,
 	) {
 		super(meta, paramDef, async () => {
-			return this.captchaService.get();
+			return await this.captchaService.get();
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
index 2ace85062a..f2c8ac7d42 100644
--- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
@@ -50,7 +50,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			for (const file of files) {
-				this.driveService.deleteFile(file);
+				await this.driveService.deleteFile(file);
 			}
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
index f5d20366cf..3ca2c348a4 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
@@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			for (const file of files) {
-				this.driveService.deleteFile(file);
+				await this.driveService.deleteFile(file);
 			}
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index 5ef8307df0..130d2dd2cc 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -106,7 +106,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				roleIdsThatCanBeUsedThisEmojiAsReaction: ps.roleIdsThatCanBeUsedThisEmojiAsReaction ?? [],
 			}, me);
 
-			return this.emojiEntityService.packDetailed(emoji);
+			return await this.emojiEntityService.packDetailed(emoji);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
index a7d88954d9..7765a762d9 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
@@ -100,7 +100,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				roleIdsThatCanBeUsedThisEmojiAsReaction: emoji.roleIdsThatCanBeUsedThisEmojiAsReaction,
 			}, me);
 
-			return this.emojiEntityService.packDetailed(addedEmoji);
+			return await this.emojiEntityService.packDetailed(addedEmoji);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
index 7f4ba083cf..0af5295ecb 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -108,7 +108,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit)
 				.getMany();
 
-			return this.emojiEntityService.packDetailedMany(emojis);
+			return await this.emojiEntityService.packDetailedMany(emojis);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
index b1b8e63d2f..9a5826d13d 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -111,7 +111,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				emojis = await q.take(ps.limit).skip(ps.offset ?? 0).getMany();
 			}
 
-			return this.emojiEntityService.packDetailedMany(emojis);
+			return await this.emojiEntityService.packDetailedMany(emojis);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
index 89fd4be99c..b98d0a7163 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
@@ -45,7 +45,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			for (const file of files) {
-				this.driveService.deleteFile(file);
+				await this.driveService.deleteFile(file);
 			}
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
index 556e291025..d6f38601ea 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
@@ -42,7 +42,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('instance not found');
 			}
 
-			this.fetchInstanceMetadataService.fetchInstanceMetadata(instance, true);
+			await this.fetchInstanceMetadataService.fetchInstanceMetadata(instance, true);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
index e5d85e1d57..8a66e004d7 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
@@ -57,7 +57,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				host: ps.host,
 			});
 
-			this.queueService.createUnfollowJob(pairs.map(p => ({ from: p[0], to: p[1], silent: true })));
+			await this.queueService.createUnfollowJob(pairs.map(p => ({ from: p[0], to: p[1], silent: true })));
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
index 81cb4b8119..c10e200f86 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
@@ -32,9 +32,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.queueClear(ps.queue, ps.state);
+			await this.queueService.queueClear(ps.queue, ps.state);
 
-			this.moderationLogService.log(me, 'clearQueue');
+			await this.moderationLogService.log(me, 'clearQueue');
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
index aba68376ad..45b8f4ffb2 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return this.queueService.queueGetJobs(ps.queue, ps.state, ps.search);
+			return await this.queueService.queueGetJobs(ps.queue, ps.state, ps.search);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote-jobs.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote-jobs.ts
index d22385e261..6ea49bdb7b 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/promote-jobs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/promote-jobs.ts
@@ -31,9 +31,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.queuePromoteJobs(ps.queue);
+			await this.queueService.queuePromoteJobs(ps.queue);
 
-			this.moderationLogService.log(me, 'promoteQueue');
+			await this.moderationLogService.log(me, 'promoteQueue');
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/queue-stats.ts b/packages/backend/src/server/api/endpoints/admin/queue/queue-stats.ts
index 10ce48332a..eafc1998db 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/queue-stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/queue-stats.ts
@@ -30,7 +30,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return this.queueService.queueGetQueue(ps.queue);
+			return await this.queueService.queueGetQueue(ps.queue);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/queues.ts b/packages/backend/src/server/api/endpoints/admin/queue/queues.ts
index 3a38275f60..83def8bf27 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/queues.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/queues.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return this.queueService.queueGetQueues();
+			return await this.queueService.queueGetQueues();
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/remove-job.ts b/packages/backend/src/server/api/endpoints/admin/queue/remove-job.ts
index 2c73f689d0..e2ca37c75d 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/remove-job.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/remove-job.ts
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.queueRemoveJob(ps.queue, ps.jobId);
+			await this.queueService.queueRemoveJob(ps.queue, ps.jobId);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/retry-job.ts b/packages/backend/src/server/api/endpoints/admin/queue/retry-job.ts
index b2603128f8..517f99e67f 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/retry-job.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/retry-job.ts
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.queueRetryJob(ps.queue, ps.jobId);
+			await this.queueService.queueRetryJob(ps.queue, ps.jobId);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/show-job.ts b/packages/backend/src/server/api/endpoints/admin/queue/show-job.ts
index 63747b5540..c931d57cb2 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/show-job.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/show-job.ts
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return this.queueService.queueGetJob(ps.queue, ps.jobId);
+			return await this.queueService.queueGetJob(ps.queue, ps.jobId);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts
index 28071e7a33..7dc5f1fd39 100644
--- a/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts
@@ -79,7 +79,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 			);
 
-			return this.systemWebhookEntityService.pack(result);
+			return await this.systemWebhookEntityService.pack(result);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts
index 7a440a774e..c776459c5e 100644
--- a/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts
@@ -54,7 +54,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				isActive: ps.isActive,
 				on: ps.on,
 			});
-			return this.systemWebhookEntityService.packMany(webhooks);
+			return await this.systemWebhookEntityService.packMany(webhooks);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts
index 75862c96a7..024c00e59e 100644
--- a/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts
+++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts
@@ -56,7 +56,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.noSuchSystemWebhook);
 			}
 
-			return this.systemWebhookEntityService.pack(webhooks[0]);
+			return await this.systemWebhookEntityService.pack(webhooks[0]);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts
index 8d68bb8f87..72f7df2ad0 100644
--- a/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts
@@ -85,7 +85,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 			);
 
-			return this.systemWebhookEntityService.pack(result);
+			return await this.systemWebhookEntityService.pack(result);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 08528ce826..c21d358ead 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -70,7 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const announcements = await query.limit(ps.limit).getMany();
 
-			return this.announcementEntityService.packMany(announcements, me);
+			return await this.announcementEntityService.packMany(announcements, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
index 1027eeb4d4..a80a0705d3 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
@@ -113,7 +113,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Delete session
-			this.authSessionsRepository.delete(session.id);
+			await this.authSessionsRepository.delete(session.id);
 
 			return {
 				accessToken: accessToken.token,
diff --git a/packages/backend/src/server/api/endpoints/chat/messages/show.ts b/packages/backend/src/server/api/endpoints/chat/messages/show.ts
index 9a2bbb8742..950666deb9 100644
--- a/packages/backend/src/server/api/endpoints/chat/messages/show.ts
+++ b/packages/backend/src/server/api/endpoints/chat/messages/show.ts
@@ -59,7 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (message.fromUserId !== me.id && message.toUserId !== me.id && !(await this.roleService.isModerator(me))) {
 				throw new ApiError(meta.errors.noSuchMessage);
 			}
-			return this.chatEntityService.packMessageDetailed(message, me);
+			return await this.chatEntityService.packMessageDetailed(message, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/invitations/inbox.ts b/packages/backend/src/server/api/endpoints/chat/rooms/invitations/inbox.ts
index 8a02d1c704..40688b026d 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/invitations/inbox.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/invitations/inbox.ts
@@ -50,7 +50,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			await this.chatService.checkChatAvailability(me.id, 'read');
 
 			const invitations = await this.chatService.getReceivedRoomInvitationsWithPagination(me.id, ps.limit, ps.sinceId, ps.untilId);
-			return this.chatEntityService.packRoomInvitations(invitations, me);
+			return await this.chatEntityService.packRoomInvitations(invitations, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/invitations/outbox.ts b/packages/backend/src/server/api/endpoints/chat/rooms/invitations/outbox.ts
index 0702ba086c..61e6402cab 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/invitations/outbox.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/invitations/outbox.ts
@@ -63,7 +63,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			const invitations = await this.chatService.getSentRoomInvitationsWithPagination(ps.roomId, ps.limit, ps.sinceId, ps.untilId);
-			return this.chatEntityService.packRoomInvitations(invitations, me);
+			return await this.chatEntityService.packRoomInvitations(invitations, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/joining.ts b/packages/backend/src/server/api/endpoints/chat/rooms/joining.ts
index ba9242c762..c9a5288527 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/joining.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/joining.ts
@@ -51,7 +51,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const memberships = await this.chatService.getMyMemberships(me.id, ps.limit, ps.sinceId, ps.untilId);
 
-			return this.chatEntityService.packRoomMemberships(memberships, me, {
+			return await this.chatEntityService.packRoomMemberships(memberships, me, {
 				populateUser: false,
 				populateRoom: true,
 			});
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/members.ts b/packages/backend/src/server/api/endpoints/chat/rooms/members.ts
index f5ffa21d32..388513e939 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/members.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/members.ts
@@ -67,7 +67,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const memberships = await this.chatService.getRoomMembershipsWithPagination(room.id, ps.limit, ps.sinceId, ps.untilId);
 
-			return this.chatEntityService.packRoomMemberships(memberships, me, {
+			return await this.chatEntityService.packRoomMemberships(memberships, me, {
 				populateUser: true,
 				populateRoom: false,
 			});
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/owned.ts b/packages/backend/src/server/api/endpoints/chat/rooms/owned.ts
index accf7e1bee..d9cd60a39e 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/owned.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/owned.ts
@@ -50,7 +50,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			await this.chatService.checkChatAvailability(me.id, 'read');
 
 			const rooms = await this.chatService.getOwnedRoomsWithPagination(me.id, ps.limit, ps.sinceId, ps.untilId);
-			return this.chatEntityService.packRooms(rooms, me);
+			return await this.chatEntityService.packRooms(rooms, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/show.ts b/packages/backend/src/server/api/endpoints/chat/rooms/show.ts
index 50da210d81..e4bc07cc0c 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/show.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/show.ts
@@ -54,7 +54,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.noSuchRoom);
 			}
 
-			return this.chatEntityService.packRoom(room, me);
+			return await this.chatEntityService.packRoom(room, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/update.ts b/packages/backend/src/server/api/endpoints/chat/rooms/update.ts
index 0cd62cb040..423cff1227 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/update.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/update.ts
@@ -61,7 +61,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				description: ps.description,
 			});
 
-			return this.chatEntityService.packRoom(updated, me);
+			return await this.chatEntityService.packRoom(updated, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts
index 1f9b24e6c9..9278e0578d 100644
--- a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts
+++ b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts
@@ -56,7 +56,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const favorites = await query
 				.getMany();
 
-			return this.clipEntityService.packMany(favorites.map(x => x.clip!), me);
+			return await this.clipEntityService.packMany(favorites.map(x => x.clip!), me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
index 8d51d09ea6..06beb82c7a 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
@@ -125,7 +125,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			// Update
-			this.driveFoldersRepository.update(folder.id, {
+			await this.driveFoldersRepository.update(folder.id, {
 				name: folder.name,
 				parentId: folder.parentId,
 			});
diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts
index caef5d1528..7b1be89453 100644
--- a/packages/backend/src/server/api/endpoints/emoji.ts
+++ b/packages/backend/src/server/api/endpoints/emoji.ts
@@ -53,7 +53,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const emoji = await this.customEmojiService.emojisByKeyCache.fetch(ps.name);
 
-			return this.emojiEntityService.packDetailed(emoji);
+			return await this.emojiEntityService.packDetailed(emoji);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
index 5ff099524d..53c157c5cd 100644
--- a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
+++ b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportCustomEmojisJob(me);
+			await this.queueService.createExportCustomEmojisJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts
index 9add00ccde..ddf9cf0cbd 100644
--- a/packages/backend/src/server/api/endpoints/federation/followers.ts
+++ b/packages/backend/src/server/api/endpoints/federation/followers.ts
@@ -50,7 +50,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private followingEntityService: FollowingEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return this.followingEntityService.getFollowers(me, ps);
+			return await this.followingEntityService.getFollowers(me, ps);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts
index 849bb61fb4..2ae3a0d485 100644
--- a/packages/backend/src/server/api/endpoints/federation/following.ts
+++ b/packages/backend/src/server/api/endpoints/federation/following.ts
@@ -50,7 +50,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private followingEntityService: FollowingEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return this.followingEntityService.getFollowing(me, ps);
+			return await this.followingEntityService.getFollowing(me, ps);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/flash/my-likes.ts b/packages/backend/src/server/api/endpoints/flash/my-likes.ts
index 22eae381da..baaf5ba845 100644
--- a/packages/backend/src/server/api/endpoints/flash/my-likes.ts
+++ b/packages/backend/src/server/api/endpoints/flash/my-likes.ts
@@ -72,7 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit)
 				.getMany();
 
-			return this.flashLikeEntityService.packMany(likes, me);
+			return await this.flashLikeEntityService.packMany(likes, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index b49c907432..b59d25b18b 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -91,7 +91,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const tags = await query.limit(ps.limit).getMany();
 
-			return this.hashtagEntityService.packMany(tags);
+			return await this.hashtagEntityService.packMany(tags);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-antennas.ts b/packages/backend/src/server/api/endpoints/i/export-antennas.ts
index 77fb4a895f..c7ea520fb2 100644
--- a/packages/backend/src/server/api/endpoints/i/export-antennas.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-antennas.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportAntennasJob(me);
+			await this.queueService.createExportAntennasJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-blocking.ts b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
index 7573018bec..84ad687cd6 100644
--- a/packages/backend/src/server/api/endpoints/i/export-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportBlockingJob(me);
+			await this.queueService.createExportBlockingJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-clips.ts b/packages/backend/src/server/api/endpoints/i/export-clips.ts
index 10d1fdac73..9611a32a29 100644
--- a/packages/backend/src/server/api/endpoints/i/export-clips.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-clips.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportClipsJob(me);
+			await this.queueService.createExportClipsJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-data.ts b/packages/backend/src/server/api/endpoints/i/export-data.ts
index d9a1e087b9..9465ac30ce 100644
--- a/packages/backend/src/server/api/endpoints/i/export-data.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-data.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportAccountDataJob(me);
+			await this.queueService.createExportAccountDataJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-favorites.ts b/packages/backend/src/server/api/endpoints/i/export-favorites.ts
index 5e03f70170..d482618769 100644
--- a/packages/backend/src/server/api/endpoints/i/export-favorites.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-favorites.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportFavoritesJob(me);
+			await this.queueService.createExportFavoritesJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-following.ts b/packages/backend/src/server/api/endpoints/i/export-following.ts
index 2e5ba14737..774704ba2a 100644
--- a/packages/backend/src/server/api/endpoints/i/export-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-following.ts
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportFollowingJob(me, ps.excludeMuting, ps.excludeInactive);
+			await this.queueService.createExportFollowingJob(me, ps.excludeMuting, ps.excludeInactive);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-mute.ts b/packages/backend/src/server/api/endpoints/i/export-mute.ts
index 0384cf142b..902cea1ac2 100644
--- a/packages/backend/src/server/api/endpoints/i/export-mute.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-mute.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportMuteJob(me);
+			await this.queueService.createExportMuteJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-notes.ts b/packages/backend/src/server/api/endpoints/i/export-notes.ts
index db4e78f667..a3d7d2c0d9 100644
--- a/packages/backend/src/server/api/endpoints/i/export-notes.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-notes.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportNotesJob(me);
+			await this.queueService.createExportNotesJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
index 6cd662102c..72ebb4f16e 100644
--- a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
@@ -29,7 +29,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.createExportUserListsJob(me);
+			await this.queueService.createExportUserListsJob(me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts
index 19baa9726d..53a9b0f3b9 100644
--- a/packages/backend/src/server/api/endpoints/i/page-likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts
@@ -72,7 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit)
 				.getMany();
 
-			return this.pageLikeEntityService.packMany(likes, me);
+			return await this.pageLikeEntityService.packMany(likes, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/schedule/list.ts b/packages/backend/src/server/api/endpoints/notes/schedule/list.ts
index cbf3a961c0..374a4248d1 100644
--- a/packages/backend/src/server/api/endpoints/notes/schedule/list.ts
+++ b/packages/backend/src/server/api/endpoints/notes/schedule/list.ts
@@ -151,7 +151,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const note = await this.notesRepository.findOneBy({ id });
 			if (note) {
 				note.reactionAndUserPairCache ??= [];
-				return this.noteEntityService.pack(note, me);
+				return await this.noteEntityService.pack(note, me);
 			}
 		}
 		return null;
diff --git a/packages/backend/src/server/api/endpoints/notifications/flush.ts b/packages/backend/src/server/api/endpoints/notifications/flush.ts
index ab78435b89..ed619d5dd2 100644
--- a/packages/backend/src/server/api/endpoints/notifications/flush.ts
+++ b/packages/backend/src/server/api/endpoints/notifications/flush.ts
@@ -33,7 +33,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private notificationService: NotificationService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.notificationService.flushAllNotifications(me.id);
+			await this.notificationService.flushAllNotifications(me.id);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts
index bc83f8d794..4dfe0b92b7 100644
--- a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts
+++ b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts
@@ -33,7 +33,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private notificationService: NotificationService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.notificationService.readAllNotification(me.id, true);
+			await this.notificationService.readAllNotification(me.id, true);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts
index 813550bbcd..dd4e387a20 100644
--- a/packages/backend/src/server/api/endpoints/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/reset-password.ts
@@ -67,7 +67,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				password: hash,
 			});
 
-			this.passwordResetRequestsRepository.delete(req.id);
+			await this.passwordResetRequestsRepository.delete(req.id);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts b/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts
index 559f08b654..142176deb2 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts
@@ -108,7 +108,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.limit(ps.limit)
 				.getMany();
 
-			return this.userListEntityService.packMembershipsMany(memberships);
+			return await this.userListEntityService.packMembershipsMany(memberships);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
index 6b0283bf55..69c7817021 100644
--- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
@@ -175,7 +175,7 @@ export class MastodonConverters {
 
 		const bioText = profile?.description && this.mfmService.toMastoApiHtml(mfm.parse(profile.description));
 
-		return awaitAll({
+		return await awaitAll({
 			id: account.id,
 			username: user.username,
 			acct: acct,

From 6d8d91ba8c5b718987b3fdb7e0406b9b58f6ce3d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:51:48 -0400
Subject: [PATCH 014/107] fix type error in DriveService.ts

---
 packages/backend/src/core/DriveService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index 468c63a9cc..28e79d1c1d 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -207,7 +207,7 @@ export class DriveService {
 
 			//#region Uploads
 			this.registerLogger.debug(`uploading original: ${key}`);
-			const uploads = [
+			const uploads: Promise<void>[] = [
 				this.upload(key, fs.createReadStream(path), type, null, name),
 			];
 

From db4cd29b748c5bace1f382929a6e927fc0752954 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:52:06 -0400
Subject: [PATCH 015/107] fix non-Error exceptions thrown from
 FetchInstanceMetadataService.ts

---
 packages/backend/src/core/FetchInstanceMetadataService.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 855ecd7553..8453758c39 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -187,10 +187,7 @@ export class FetchInstanceMetadataService {
 				throw new Error('No nodeinfo link provided');
 			}
 
-			const info = await this.httpRequestService.getJson(link.href)
-				.catch(err => {
-					throw err.statusCode ?? err.message;
-				});
+			const info = await this.httpRequestService.getJson(link.href);
 
 			this.logger.debug(`Successfuly fetched nodeinfo of ${instance.host}`);
 

From a4a8329f691cb03543ba989c90c3ae8bceb49062 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:52:42 -0400
Subject: [PATCH 016/107] optionally use note.user relation in
 PollService.deliverQuestionUpdate

---
 packages/backend/src/core/PollService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/PollService.ts b/packages/backend/src/core/PollService.ts
index e93cc7ba4c..b5544db9d4 100644
--- a/packages/backend/src/core/PollService.ts
+++ b/packages/backend/src/core/PollService.ts
@@ -92,7 +92,7 @@ export class PollService {
 	public async deliverQuestionUpdate(note: MiNote) {
 		if (note.localOnly) return;
 
-		const user = await this.usersRepository.findOneBy({ id: note.userId });
+		const user = note.user ?? await this.usersRepository.findOneBy({ id: note.userId });
 		if (user == null) throw new Error('note not found');
 
 		if (isLocalUser(user)) {

From dad9944e7ee64ef5b28850a331f4436459a5c0a5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:53:00 -0400
Subject: [PATCH 017/107] a few more awaits

---
 packages/backend/src/models/_.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts
index e362230d7e..071945646a 100644
--- a/packages/backend/src/models/_.ts
+++ b/packages/backend/src/models/_.ts
@@ -118,12 +118,12 @@ export const miRepository = {
 		if (opt.replication) {
 			const queryRunner = this.manager.connection.createQueryRunner('master');
 			try {
-				return this.insertOneImpl(entity, findOptions, queryRunner);
+				return await this.insertOneImpl(entity, findOptions, queryRunner);
 			} finally {
 				await queryRunner.release();
 			}
 		} else {
-			return this.insertOneImpl(entity, findOptions);
+			return await this.insertOneImpl(entity, findOptions);
 		}
 	},
 	async insertOneImpl(entity, findOptions?, queryRunner?) {

From a45e264574e042f415943842356e11b7be0bdc87 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 13:53:33 -0400
Subject: [PATCH 018/107] rename noteEditRepository to noteEditsRepository,
 matching other repository names

---
 packages/backend/src/di-symbols.ts                        | 2 +-
 packages/backend/src/models/RepositoryModule.ts           | 2 +-
 packages/backend/src/models/_.ts                          | 2 +-
 .../src/queue/processors/DeleteAccountProcessorService.ts | 8 ++++----
 packages/backend/src/server/api/GetterService.ts          | 8 ++++----
 .../backend/src/server/api/endpoints/notes/unrenote.ts    | 7 ++++---
 .../backend/src/server/api/mastodon/MastodonConverters.ts | 8 ++++----
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts
index e2c73562c8..d34431cdea 100644
--- a/packages/backend/src/di-symbols.ts
+++ b/packages/backend/src/di-symbols.ts
@@ -93,7 +93,7 @@ export const DI = {
 	chatRoomsRepository: Symbol('chatRoomsRepository'),
 	chatRoomMembershipsRepository: Symbol('chatRoomMembershipsRepository'),
 	chatRoomInvitationsRepository: Symbol('chatRoomInvitationsRepository'),
-	noteEditRepository: Symbol('noteEditRepository'),
+	noteEditsRepository: Symbol('noteEditsRepository'),
 	bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
 	reversiGamesRepository: Symbol('reversiGamesRepository'),
 	noteScheduleRepository: Symbol('noteScheduleRepository'),
diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts
index 5e0154fe50..476765cc37 100644
--- a/packages/backend/src/models/RepositoryModule.ts
+++ b/packages/backend/src/models/RepositoryModule.ts
@@ -519,7 +519,7 @@ const $userMemosRepository: Provider = {
 };
 
 const $noteEditRepository: Provider = {
-	provide: DI.noteEditRepository,
+	provide: DI.noteEditsRepository,
 	useFactory: (db: DataSource) => db.getRepository(NoteEdit),
 	inject: [DI.db],
 };
diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts
index 071945646a..1e742b0bf8 100644
--- a/packages/backend/src/models/_.ts
+++ b/packages/backend/src/models/_.ts
@@ -326,5 +326,5 @@ export type ChatRoomInvitationsRepository = Repository<MiChatRoomInvitation> & M
 export type ChatApprovalsRepository = Repository<MiChatApproval> & MiRepository<MiChatApproval>;
 export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord> & MiRepository<MiBubbleGameRecord>;
 export type ReversiGamesRepository = Repository<MiReversiGame> & MiRepository<MiReversiGame>;
-export type NoteEditRepository = Repository<NoteEdit> & MiRepository<NoteEdit>;
+export type NoteEditsRepository = Repository<NoteEdit> & MiRepository<NoteEdit>;
 export type NoteScheduleRepository = Repository<MiNoteSchedule> & MiRepository<MiNoteSchedule>;
diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
index 06a4b7ab7f..d4a32f6249 100644
--- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
@@ -6,7 +6,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { In, MoreThan } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, ClipsRepository, ClipNotesRepository, LatestNotesRepository, NoteEditRepository, NoteFavoritesRepository, PollVotesRepository, PollsRepository, SigninsRepository, UserIpsRepository, RegistryItemsRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, ClipsRepository, ClipNotesRepository, LatestNotesRepository, NoteEditsRepository, NoteFavoritesRepository, PollVotesRepository, PollsRepository, SigninsRepository, UserIpsRepository, RegistryItemsRepository } from '@/models/_.js';
 import type Logger from '@/logger.js';
 import { DriveService } from '@/core/DriveService.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
@@ -69,8 +69,8 @@ export class DeleteAccountProcessorService {
 		@Inject(DI.latestNotesRepository)
 		private readonly latestNotesRepository: LatestNotesRepository,
 
-		@Inject(DI.noteEditRepository)
-		private readonly noteEditRepository: NoteEditRepository,
+		@Inject(DI.noteEditsRepository)
+		private readonly noteEditsRepository: NoteEditsRepository,
 
 		@Inject(DI.noteFavoritesRepository)
 		private readonly noteFavoritesRepository: NoteFavoritesRepository,
@@ -318,7 +318,7 @@ export class DeleteAccountProcessorService {
 
 				const ids = notes.map(note => note.id);
 
-				await this.noteEditRepository.delete({
+				await this.noteEditsRepository.delete({
 					noteId: In(ids),
 				});
 				await this.notesRepository.delete({
diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts
index edf70c0185..47b4e2f1bc 100644
--- a/packages/backend/src/server/api/GetterService.ts
+++ b/packages/backend/src/server/api/GetterService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { NotesRepository, UsersRepository, NoteEditRepository } from '@/models/_.js';
+import type { NotesRepository, UsersRepository, NoteEditsRepository } from '@/models/_.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
 import { isRemoteUser, isLocalUser } from '@/models/User.js';
@@ -22,8 +22,8 @@ export class GetterService {
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
-		@Inject(DI.noteEditRepository)
-		private noteEditRepository: NoteEditRepository,
+		@Inject(DI.noteEditsRepository)
+		private noteEditsRepository: NoteEditsRepository,
 
 		private readonly cacheService: CacheService,
 	) {
@@ -59,7 +59,7 @@ export class GetterService {
 	 */
 	@bindThis
 	public async getEdits(noteId: MiNote['id']) {
-		const edits = await this.noteEditRepository.findBy({ noteId: noteId }).catch(() => {
+		const edits = await this.noteEditsRepository.findBy({ noteId: noteId }).catch(() => {
 			throw new IdentifiableError('9725d0ce-ba28-4dde-95a7-2cbb2c15de24', `Note ${noteId} does not exist`);
 		});
 
diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
index 4a3ca8b656..5c5bd740dc 100644
--- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
@@ -10,6 +10,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { NoteDeleteService } from '@/core/NoteDeleteService.js';
 import { DI } from '@/di-symbols.js';
 import { GetterService } from '@/server/api/GetterService.js';
+import { isQuote, Renote } from '@/misc/is-renote.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -64,14 +65,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const renotes = await this.notesRepository.findBy({
 				userId: me.id,
 				renoteId: note.id,
-			});
+			}) as Renote[];
 
 			// TODO inline this into the above query
 			for (const note of renotes) {
 				if (ps.quote) {
-					if (note.text) this.noteDeleteService.delete(me, note, false);
+					if (isQuote(note)) await this.noteDeleteService.delete(me, note, false);
 				} else {
-					if (!note.text) this.noteDeleteService.delete(me, note, false);
+					if (!isQuote(note)) await this.noteDeleteService.delete(me, note, false);
 				}
 			}
 		});
diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
index 69c7817021..963bde3726 100644
--- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
@@ -13,7 +13,7 @@ import { MfmService } from '@/core/MfmService.js';
 import type { Config } from '@/config.js';
 import { IMentionedRemoteUsers, MiNote } from '@/models/Note.js';
 import type { MiLocalUser, MiUser } from '@/models/User.js';
-import type { NoteEditRepository, UserProfilesRepository } from '@/models/_.js';
+import type { NoteEditsRepository, UserProfilesRepository } from '@/models/_.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
@@ -60,8 +60,8 @@ export class MastodonConverters {
 		@Inject(DI.userProfilesRepository)
 		private readonly userProfilesRepository: UserProfilesRepository,
 
-		@Inject(DI.noteEditRepository)
-		private readonly noteEditRepository: NoteEditRepository,
+		@Inject(DI.noteEditsRepository)
+		private readonly noteEditsRepository: NoteEditsRepository,
 
 		private readonly mfmService: MfmService,
 		private readonly getterService: GetterService,
@@ -214,7 +214,7 @@ export class MastodonConverters {
 		const noteUser = await this.getUser(note.userId);
 		const noteInstance = noteUser.instance ?? (noteUser.host ? await this.federatedInstanceService.fetch(noteUser.host) : null);
 		const account = await this.convertAccount(noteUser);
-		const edits = await this.noteEditRepository.find({ where: { noteId: note.id }, order: { id: 'ASC' } });
+		const edits = await this.noteEditsRepository.find({ where: { noteId: note.id }, order: { id: 'ASC' } });
 		const history: StatusEdit[] = [];
 
 		const mentionedRemoteUsers = JSON.parse(note.mentionedRemoteUsers);

From ec6ae4c939a100d0e4ce94d259a879ac90237ba1 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 16:13:16 -0400
Subject: [PATCH 019/107] fix typo and correctly call handleCreatedNote in
 BackgroundTaskProcessorService.ts

---
 .../src/queue/processors/BackgroundTaskProcessorService.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 3d8339fa3b..8e655fc08f 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -290,7 +290,7 @@ export class BackgroundTaskProcessorService {
 				await this.latestNoteService.handleUpdatedNote(lastEdit, note);
 			} else {
 				// Create
-				await this.latestNoteService.handleDeletedNote(note);
+				await this.latestNoteService.handleCreatedNote(note);
 			}
 		} else {
 			// Delete

From 4501ecb293c390b918c58c5409ab7d04de8c7023 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 17:12:06 -0400
Subject: [PATCH 020/107] implement DeleteApLogsBackgroundTask

---
 packages/backend/src/core/ApLogService.ts     | 17 ++++++++--
 .../backend/src/core/NoteDeleteService.ts     |  5 ++-
 packages/backend/src/core/QueueService.ts     |  5 +++
 .../BackgroundTaskProcessorService.ts         | 31 ++++++++++++++-----
 .../DeleteAccountProcessorService.ts          |  9 ++----
 packages/backend/src/queue/types.ts           |  9 +++++-
 6 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/packages/backend/src/core/ApLogService.ts b/packages/backend/src/core/ApLogService.ts
index 89837a60d2..391d90b95a 100644
--- a/packages/backend/src/core/ApLogService.ts
+++ b/packages/backend/src/core/ApLogService.ts
@@ -14,7 +14,9 @@ import { JsonValue } from '@/misc/json-value.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { IdService } from '@/core/IdService.js';
-import { IActivity, IObject } from './activitypub/type.js';
+import { IActivity, IObject } from '@/core/activitypub/type.js';
+import { bindThis } from '@/decorators.js';
+import { QueueService } from '@/core/QueueService.js';
 
 @Injectable()
 export class ApLogService {
@@ -23,7 +25,7 @@ export class ApLogService {
 		private readonly config: Config,
 
 		@Inject(DI.apContextsRepository)
-		private apContextsRepository: ApContextsRepository,
+		private readonly apContextsRepository: ApContextsRepository,
 
 		@Inject(DI.apInboxLogsRepository)
 		private readonly apInboxLogsRepository: ApInboxLogsRepository,
@@ -34,6 +36,7 @@ export class ApLogService {
 		private readonly utilityService: UtilityService,
 		private readonly idService: IdService,
 		private readonly timeService: TimeService,
+		private readonly queueService: QueueService,
 	) {}
 
 	/**
@@ -123,6 +126,16 @@ export class ApLogService {
 			.execute();
 	}
 
+	@bindThis
+	public async deleteObjectLogsDeferred(objectUris: string | string[]): Promise<void> {
+		await this.queueService.createDeleteApLogsJob('object', objectUris);
+	}
+
+	@bindThis
+	public async deleteInboxLogsDeferred(userIds: string | string[]): Promise<void> {
+		await this.queueService.createDeleteApLogsJob('inbox', userIds);
+	}
+
 	/**
 	 * Deletes all logged copies of an object or objects
 	 * @param objectUris URIs / AP IDs of the objects to delete
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index e9cf9bebef..d780e5167d 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -161,7 +161,7 @@ export class NoteDeleteService {
 		// Update the Latest Note index / following feed
 		this.latestNoteService.handleDeletedNoteDeferred(note);
 		for (const cascadingNote of cascadingNotes) {
-			this.latestNoteService.handleDeletedNote(cascadingNote);
+			this.latestNoteService.handleDeletedNoteDeferred(cascadingNote);
 		}
 
 		if (deleter && (note.userId !== deleter.id)) {
@@ -178,8 +178,7 @@ export class NoteDeleteService {
 			.map(n => n.uri)
 			.filter((u): u is string => u != null);
 		if (deletedUris.length > 0) {
-			trackPromise(this.apLogService.deleteObjectLogs(deletedUris)
-				.catch(err => this.logger.error(err, `Failed to delete AP logs for note '${note.uri}'`)));
+			await this.apLogService.deleteObjectLogsDeferred(deletedUris);
 		}
 	}
 
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 95cc46c8cf..99911f38a7 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -930,6 +930,11 @@ export class QueueService implements OnModuleInit {
 		return await this.createBackgroundTask({ type: 'post-unsuspend', userId }, userId);
 	}
 
+	@bindThis
+	public async createDeleteApLogsJob(dataType: 'inbox' | 'object', data: string | string[]) {
+		return await this.createBackgroundTask({ type: 'delete-ap-logs', dataType, data });
+	}
+
 	private async createBackgroundTask<T extends BackgroundTaskJobData>(data: T, duplication?: string | { id: string, ttl?: number }) {
 		return await this.backgroundTaskQueue.add(
 			data.type,
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 8e655fc08f..826b2af193 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Bull from 'bullmq';
-import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask } from '@/queue/types.js';
+import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask, DeleteApLogsBackgroundTask } from '@/queue/types.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import Logger from '@/logger.js';
@@ -27,6 +27,7 @@ import { DriveService } from '@/core/DriveService.js';
 import { LatestNoteService } from '@/core/LatestNoteService.js';
 import { trackTask } from '@/misc/promise-tracker.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
+import { ApLogService } from '@/core/ApLogService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -59,6 +60,7 @@ export class BackgroundTaskProcessorService {
 		private readonly driveService: DriveService,
 		private readonly latestNoteService: LatestNoteService,
 		private readonly userSuspendService: UserSuspendService,
+		private readonly apLogService: ApLogService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -90,9 +92,11 @@ export class BackgroundTaskProcessorService {
 			return await this.processUpdateLatestNote(job.data);
 		} else if (job.data.type === 'post-suspend') {
 			return await this.processPostSuspend(job.data);
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (job.data.type === 'post-unsuspend') {
 			return await this.processPostUnsuspend(job.data);
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'delete-ap-logs') {
+			return await this.processDeleteApLogs(job.data);
 		} else {
 			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
 			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
@@ -199,14 +203,14 @@ export class BackgroundTaskProcessorService {
 
 		// Update charts
 		if (this.meta.enableChartsForFederatedInstances) {
-			await this.instanceChart.requestSent(task.host, success);
+			this.instanceChart.requestSent(task.host, success);
 		}
 		if (success) {
-			await this.apRequestChart.deliverSucc();
+			this.apRequestChart.deliverSucc();
 		} else {
-			await this.apRequestChart.deliverFail();
+			this.apRequestChart.deliverFail();
 		}
-		await this.federationChart.deliverd(task.host, success);
+		this.federationChart.deliverd(task.host, success);
 
 		return 'ok';
 	}
@@ -215,7 +219,6 @@ export class BackgroundTaskProcessorService {
 		const instance = await this.federatedInstanceService.fetchOrRegister(task.host);
 		if (instance.isBlocked) return `Skipping post-inbox task: instance ${task.host} is blocked`;
 
-		// TODO move chart stuff out of background?
 		// Update charts
 		if (this.meta.enableChartsForFederatedInstances) {
 			this.instanceChart.requestReceived(task.host);
@@ -321,4 +324,18 @@ export class BackgroundTaskProcessorService {
 
 		return 'ok';
 	}
+
+	private async processDeleteApLogs(task: DeleteApLogsBackgroundTask): Promise<string> {
+		if (task.dataType === 'object') {
+			await this.apLogService.deleteObjectLogs(task.data);
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (task.dataType === 'inbox') {
+			await this.apLogService.deleteInboxLogs(task.data);
+		} else {
+			this.logger.warn(`Can't process unknown data type "${task.dataType}"; this is likely a bug. Full task data:`, task);
+			throw new Error(`Unknown task type ${task.dataType}, see system logs for details`);
+		}
+
+		return 'ok';
+	}
 }
diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
index d4a32f6249..7132b5841b 100644
--- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
@@ -332,8 +332,7 @@ export class DeleteAccountProcessorService {
 				// Delete note AP logs
 				const noteUris = notes.map(n => n.uri).filter(u => !!u) as string[];
 				if (noteUris.length > 0) {
-					await this.apLogService.deleteObjectLogs(noteUris)
-						.catch(err => this.logger.error(err, `Failed to delete AP logs for notes of user '${user.uri ?? user.id}'`));
+					await this.apLogService.deleteObjectLogsDeferred(noteUris);
 				}
 			}
 
@@ -371,12 +370,10 @@ export class DeleteAccountProcessorService {
 
 		{ // Delete actor logs
 			if (user.uri) {
-				await this.apLogService.deleteObjectLogs(user.uri)
-					.catch(err => this.logger.error(err, `Failed to delete AP logs for user '${user.uri}'`));
+				await this.apLogService.deleteObjectLogsDeferred(user.uri);
 			}
 
-			await this.apLogService.deleteInboxLogs(user.id)
-				.catch(err => this.logger.error(err, `Failed to delete AP logs for user '${user.uri}'`));
+			await this.apLogService.deleteInboxLogsDeferred(user.id);
 
 			this.logger.info('All AP logs deleted');
 		}
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index ed9bbdbadf..cb31e5a3e1 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -183,7 +183,8 @@ export type BackgroundTaskJobData =
 	DeleteFileBackgroundTask |
 	UpdateLatestNoteBackgroundTask |
 	PostSuspendBackgroundTask |
-	PostUnsuspendBackgroundTask;
+	PostUnsuspendBackgroundTask |
+	DeleteApLogsBackgroundTask;
 
 export type UpdateUserBackgroundTask = {
 	type: 'update-user';
@@ -254,3 +255,9 @@ export type PostUnsuspendBackgroundTask = {
 	type: 'post-unsuspend';
 	userId: string;
 };
+
+export type DeleteApLogsBackgroundTask = {
+	type: 'delete-ap-logs';
+	dataType: 'inbox' | 'object';
+	data: string | string[];
+};

From e587e376e5242f310c24fb7eaf38719c1fef32ac Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 17:15:13 -0400
Subject: [PATCH 021/107] fix account deletion not triggering background tasks
 for cascaded note deletions

---
 .../DeleteAccountProcessorService.ts          | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
index 7132b5841b..b95b89d6ce 100644
--- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
@@ -4,9 +4,9 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import { In, MoreThan } from 'typeorm';
+import { In, IsNull, MoreThan } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, ClipsRepository, ClipNotesRepository, LatestNotesRepository, NoteEditsRepository, NoteFavoritesRepository, PollVotesRepository, PollsRepository, SigninsRepository, UserIpsRepository, RegistryItemsRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, ClipsRepository, ClipNotesRepository, LatestNotesRepository, NoteEditsRepository, NoteFavoritesRepository, PollVotesRepository, PollsRepository, SigninsRepository, UserIpsRepository, RegistryItemsRepository, MiUser } from '@/models/_.js';
 import type Logger from '@/logger.js';
 import { DriveService } from '@/core/DriveService.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
@@ -19,6 +19,7 @@ import { ApLogService } from '@/core/ApLogService.js';
 import { ReactionService } from '@/core/ReactionService.js';
 import { QueueService } from '@/core/QueueService.js';
 import { CacheService } from '@/core/CacheService.js';
+import { NoteDeleteService } from '@/core/NoteDeleteService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import * as Acct from '@/misc/acct.js';
@@ -99,6 +100,7 @@ export class DeleteAccountProcessorService {
 		private readonly apLogService: ApLogService,
 		private readonly cacheService: CacheService,
 		private readonly apPersonService: ApPersonService,
+		private readonly noteDeleteService: NoteDeleteService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('delete-account');
 	}
@@ -293,11 +295,12 @@ export class DeleteAccountProcessorService {
 				const notes = await this.notesRepository.find({
 					where: {
 						userId: user.id,
+						replyId: IsNull(),
 						...(cursor ? { id: MoreThan(cursor) } : {}),
 					},
 					take: 100,
 					order: {
-						id: 1,
+						id: 'desc',
 					},
 				}) as MiNote[];
 
@@ -318,6 +321,16 @@ export class DeleteAccountProcessorService {
 
 				const ids = notes.map(note => note.id);
 
+				const replies = await this.notesRepository.find({
+					where: { replyId: In(ids) },
+					relations: { user: true },
+				});
+
+				// Delete replies through the usual service to ensure we get all "cascading notes" logic.
+				for (const reply of replies) {
+					await this.noteDeleteService.delete(reply.user as MiUser, reply);
+				}
+
 				await this.noteEditsRepository.delete({
 					noteId: In(ids),
 				});

From 693f8d52eeaa516d0716451dd8c254c356f5365d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 17:24:33 -0400
Subject: [PATCH 022/107] implement MarkUserUpdatedBackgroundTask

---
 .../backend/src/core/NoteCreateService.ts     |  2 +-
 .../backend/src/core/NoteDeleteService.ts     | 13 +++------
 packages/backend/src/core/NoteEditService.ts  |  2 +-
 packages/backend/src/core/QueueService.ts     |  5 ++++
 packages/backend/src/core/ReactionService.ts  |  7 +++--
 .../BackgroundTaskProcessorService.ts         | 28 +++++++++++++++++--
 packages/backend/src/queue/types.ts           |  8 +++++-
 7 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 9b7ef57d9c..e7f55f10ad 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -611,7 +611,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			// Increment notes count (user)
 			await this.incNotesCountOfUser(user);
 		} else {
-			await this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+			await this.queueService.createMarkUserUpdatedJob(user.id);
 		}
 
 		await this.pushToTl(note, user);
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index d780e5167d..82959f0782 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -28,12 +28,10 @@ import { ApLogService } from '@/core/ApLogService.js';
 import type Logger from '@/logger.js';
 import { TimeService } from '@/global/TimeService.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
-import { LoggerService } from '@/core/LoggerService.js';
+import { QueueService } from '@/core/QueueService.js';
 
 @Injectable()
 export class NoteDeleteService {
-	private readonly logger: Logger;
-
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
@@ -63,11 +61,8 @@ export class NoteDeleteService {
 		private latestNoteService: LatestNoteService,
 		private readonly apLogService: ApLogService,
 		private readonly timeService: TimeService,
-
-		loggerService: LoggerService,
-	) {
-		this.logger = loggerService.getLogger('note-delete-service');
-	}
+		private readonly queueService: QueueService,
+	) {}
 
 	/**
 	 * 投稿を削除します。
@@ -131,7 +126,7 @@ export class NoteDeleteService {
 				// Decrement notes count (user)
 				this.decNotesCountOfUser(user);
 			} else {
-				this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+				await this.queueService.createMarkUserUpdatedJob(user.id);
 			}
 
 			if (this.meta.enableStatsForFederatedInstances) {
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 0c595cbf20..11b22c0798 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -633,7 +633,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		await this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+		await this.queueService.createMarkUserUpdatedJob(user.id);
 
 		// ハッシュタグ更新
 		await this.pushToTl(note, user);
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 99911f38a7..9cd9754f21 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -935,6 +935,11 @@ export class QueueService implements OnModuleInit {
 		return await this.createBackgroundTask({ type: 'delete-ap-logs', dataType, data });
 	}
 
+	@bindThis
+	public async createMarkUserUpdatedJob(userId: string) {
+		return await this.createBackgroundTask({ type: 'mark-user-updated', userId }, userId);
+	}
+
 	private async createBackgroundTask<T extends BackgroundTaskJobData>(data: T, duplication?: string | { id: string, ttl?: number }) {
 		return await this.backgroundTaskQueue.add(
 			data.type,
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 27a6d7b514..8f642e014e 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -33,6 +33,7 @@ import { PER_NOTE_REACTION_USER_PAIR_CACHE_MAX } from '@/const.js';
 import { CacheService } from '@/core/CacheService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { TimeService } from '@/global/TimeService.js';
+import { QueueService } from '@/core/QueueService.js';
 import type { DataSource } from 'typeorm';
 
 const FALLBACK = '\u2764';
@@ -110,6 +111,7 @@ export class ReactionService implements OnModuleInit {
 		private readonly cacheService: CacheService,
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly timeService: TimeService,
+		private readonly queueService: QueueService,
 	) {
 	}
 
@@ -224,7 +226,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+		await this.queueService.createMarkUserUpdatedJob(user.id);
 
 		// 30%の確率、セルフではない、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (
@@ -340,8 +342,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		// TODO update caches
-		this.usersRepository.update({ id: user.id }, { updatedAt: this.timeService.date });
+		await this.queueService.createMarkUserUpdatedJob(user.id);
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
 			reaction: this.decodeReaction(exist.reaction).reaction,
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 826b2af193..14c1523c3e 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Bull from 'bullmq';
-import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask, DeleteApLogsBackgroundTask } from '@/queue/types.js';
+import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask, DeleteApLogsBackgroundTask, MarkUserUpdatedBackgroundTask } from '@/queue/types.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import Logger from '@/logger.js';
@@ -19,7 +19,7 @@ import ApRequestChart from '@/core/chart/charts/ap-request.js';
 import FederationChart from '@/core/chart/charts/federation.js';
 import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
-import type { DriveFilesRepository, NoteEditsRepository, NotesRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NoteEditsRepository, NotesRepository, UsersRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
 import { NoteEditService } from '@/core/NoteEditService.js';
 import { HashtagService } from '@/core/HashtagService.js';
@@ -28,6 +28,7 @@ import { LatestNoteService } from '@/core/LatestNoteService.js';
 import { trackTask } from '@/misc/promise-tracker.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { ApLogService } from '@/core/ApLogService.js';
+import { InternalEventService } from '@/core/InternalEventService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -46,6 +47,9 @@ export class BackgroundTaskProcessorService {
 		@Inject(DI.noteEditsRepository)
 		private readonly noteEditsRepository: NoteEditsRepository,
 
+		@Inject(DI.usersRepository)
+		private readonly usersRepository: UsersRepository,
+
 		private readonly apPersonService: ApPersonService,
 		private readonly cacheService: CacheService,
 		private readonly federatedInstanceService: FederatedInstanceService,
@@ -61,6 +65,7 @@ export class BackgroundTaskProcessorService {
 		private readonly latestNoteService: LatestNoteService,
 		private readonly userSuspendService: UserSuspendService,
 		private readonly apLogService: ApLogService,
+		private readonly internalEventService: InternalEventService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -94,9 +99,11 @@ export class BackgroundTaskProcessorService {
 			return await this.processPostSuspend(job.data);
 		} else if (job.data.type === 'post-unsuspend') {
 			return await this.processPostUnsuspend(job.data);
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (job.data.type === 'delete-ap-logs') {
 			return await this.processDeleteApLogs(job.data);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (job.data.type === 'mark-user-updated') {
+			return await this.processMarkUserUpdated(job.data);
 		} else {
 			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
 			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
@@ -338,4 +345,19 @@ export class BackgroundTaskProcessorService {
 
 		return 'ok';
 	}
+
+	private async processMarkUserUpdated(task: MarkUserUpdatedBackgroundTask): Promise<string> {
+		const user = await this.cacheService.findOptionalUserById(task.userId);
+		if (!user || user.isDeleted) return `Skipping post-unsuspend task: user ${task.userId} has been deleted`;
+
+		await this.usersRepository.update({ id: user.id }, { updatedAt: new Date() });
+
+		if (user.host == null) {
+			await this.internalEventService.emit('localUserUpdated', { id: user.id });
+		} else {
+			await this.internalEventService.emit('remoteUserUpdated', { id: user.id });
+		}
+
+		return 'ok';
+	}
 }
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index cb31e5a3e1..671500a275 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -184,7 +184,8 @@ export type BackgroundTaskJobData =
 	UpdateLatestNoteBackgroundTask |
 	PostSuspendBackgroundTask |
 	PostUnsuspendBackgroundTask |
-	DeleteApLogsBackgroundTask;
+	DeleteApLogsBackgroundTask |
+	MarkUserUpdatedBackgroundTask;
 
 export type UpdateUserBackgroundTask = {
 	type: 'update-user';
@@ -261,3 +262,8 @@ export type DeleteApLogsBackgroundTask = {
 	dataType: 'inbox' | 'object';
 	data: string | string[];
 };
+
+export type MarkUserUpdatedBackgroundTask = {
+	type: 'mark-user-updated';
+	userId: string;
+};

From cf138a148d42d48aed1ed18f3e3fb62b84d337f6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 19 Jun 2025 17:43:27 -0400
Subject: [PATCH 023/107] make NoteDeleteService.delete safe to call inside a
 loop

---
 .../backend/src/core/NoteDeleteService.ts     | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 82959f0782..ddee49dcf9 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -22,13 +22,13 @@ import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerServ
 import { bindThis } from '@/decorators.js';
 import { SearchService } from '@/core/SearchService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { isQuote, isRenote } from '@/misc/is-renote.js';
+import { isPureRenote } from '@/misc/is-renote.js';
 import { LatestNoteService } from '@/core/LatestNoteService.js';
 import { ApLogService } from '@/core/ApLogService.js';
-import type Logger from '@/logger.js';
 import { TimeService } from '@/global/TimeService.js';
-import { trackPromise } from '@/misc/promise-tracker.js';
+import { trackTask } from '@/misc/promise-tracker.js';
 import { QueueService } from '@/core/QueueService.js';
+import { CacheService } from '@/core/CacheService.js';
 
 @Injectable()
 export class NoteDeleteService {
@@ -62,6 +62,7 @@ export class NoteDeleteService {
 		private readonly apLogService: ApLogService,
 		private readonly timeService: TimeService,
 		private readonly queueService: QueueService,
+		private readonly cacheService: CacheService,
 	) {}
 
 	/**
@@ -70,41 +71,36 @@ export class NoteDeleteService {
 	 * @param note 投稿
 	 */
 	async delete(user: { id: MiUser['id']; uri: MiUser['uri']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, quiet = false, deleter?: MiUser) {
+		// This kicks off lots of things that can run in parallel, but we should still wait for completion to ensure consistent state and to avoid task flood when calling in a loop.
+		const promises: Promise<unknown>[] = [];
+
 		const deletedAt = this.timeService.date;
 		const cascadingNotes = await this.findCascadingNotes(note);
 
 		if (note.replyId) {
-			await this.notesRepository.decrement({ id: note.replyId }, 'repliesCount', 1);
+			promises.push(this.notesRepository.decrement({ id: note.replyId }, 'repliesCount', 1));
 		}
 
-		if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
-			await this.notesRepository.findOneBy({ id: note.renoteId }).then(async (renote) => {
-				if (!renote) return;
-				if (renote.userId !== user.id) await this.notesRepository.decrement({ id: renote.id }, 'renoteCount', 1);
-			});
+		if (isPureRenote(note)) {
+			promises.push(this.notesRepository.decrement({ id: note.renoteId }, 'renoteCount', 1));
 		}
 
 		if (!quiet) {
-			this.globalEventService.publishNoteStream(note.id, 'deleted', {
+			promises.push(this.globalEventService.publishNoteStream(note.id, 'deleted', {
 				deletedAt: deletedAt,
-			});
+			}));
 
 			//#region ローカルの投稿なら削除アクティビティを配送
 			if (isLocalUser(user) && !note.localOnly) {
-				let renote: MiNote | null = null;
-
-				// if deleted note is renote
-				if (isRenote(note) && !isQuote(note)) {
-					renote = await this.notesRepository.findOneBy({
-						id: note.renoteId,
-					});
-				}
+				const renote = isPureRenote(note)
+					? await this.notesRepository.findOneBy({ id: note.renoteId })
+					: null;
 
 				const content = this.apRendererService.addContext(renote
 					? this.apRendererService.renderUndo(this.apRendererService.renderAnnounce(renote.uri ?? `${this.config.url}/notes/${renote.id}`, note), user)
 					: this.apRendererService.renderDelete(this.apRendererService.renderTombstone(`${this.config.url}/notes/${note.id}`), user));
 
-				trackPromise(this.deliverToConcerned(user, note, content));
+				promises.push(this.deliverToConcerned(user, note, content));
 			}
 
 			// also deliver delete activity to cascaded notes
@@ -113,7 +109,7 @@ export class NoteDeleteService {
 				if (!cascadingNote.user) continue;
 				if (!isLocalUser(cascadingNote.user)) continue;
 				const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.apRendererService.renderTombstone(`${this.config.url}/notes/${cascadingNote.id}`), cascadingNote.user));
-				trackPromise(this.deliverToConcerned(cascadingNote.user, cascadingNote, content));
+				promises.push(this.deliverToConcerned(cascadingNote.user, cascadingNote, content));
 			}
 			//#endregion
 
@@ -122,59 +118,63 @@ export class NoteDeleteService {
 				this.perUserNotesChart.update(user, note, false);
 			}
 
-			if (!isRenote(note) || isQuote(note)) {
+			if (!isPureRenote(note)) {
 				// Decrement notes count (user)
-				this.decNotesCountOfUser(user);
+				promises.push(this.decNotesCountOfUser(user));
 			} else {
-				await this.queueService.createMarkUserUpdatedJob(user.id);
+				promises.push(this.queueService.createMarkUserUpdatedJob(user.id));
 			}
 
 			if (this.meta.enableStatsForFederatedInstances) {
 				if (isRemoteUser(user)) {
-					this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-						if (note.renoteId && note.text || !note.renoteId) {
-							this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
-						}
-						if (this.meta.enableChartsForFederatedInstances) {
-							this.instanceChart.updateNote(i.host, note, false);
-						}
-					});
+					if (!isPureRenote(note)) {
+						const i = await this.federatedInstanceService.fetchOrRegister(user.host);
+						promises.push(this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1));
+					}
+					if (this.meta.enableChartsForFederatedInstances) {
+						this.instanceChart.updateNote(user.host, note, false);
+					}
 				}
 			}
 		}
 
 		for (const cascadingNote of cascadingNotes) {
-			this.searchService.unindexNote(cascadingNote);
+			promises.push(this.searchService.unindexNote(cascadingNote));
 		}
-		this.searchService.unindexNote(note);
+		promises.push(this.searchService.unindexNote(note));
 
+		// Don't put this in the promise array, since it needs to happen before the next section
 		await this.notesRepository.delete({
 			id: note.id,
 			userId: user.id,
 		});
 
-		// Update the Latest Note index / following feed
-		this.latestNoteService.handleDeletedNoteDeferred(note);
+		// Update the Latest Note index / following feed *after* note is deleted
+		promises.push(this.latestNoteService.handleDeletedNoteDeferred(note));
 		for (const cascadingNote of cascadingNotes) {
-			this.latestNoteService.handleDeletedNoteDeferred(cascadingNote);
+			promises.push(this.latestNoteService.handleDeletedNoteDeferred(cascadingNote));
 		}
 
 		if (deleter && (note.userId !== deleter.id)) {
-			const user = await this.usersRepository.findOneByOrFail({ id: note.userId });
-			this.moderationLogService.log(deleter, 'deleteNote', {
+			const user = await this.cacheService.findUserById(note.userId);
+			promises.push(this.moderationLogService.log(deleter, 'deleteNote', {
 				noteId: note.id,
 				noteUserId: note.userId,
 				noteUserUsername: user.username,
 				noteUserHost: user.host,
-			});
+			}));
 		}
 
 		const deletedUris = [note, ...cascadingNotes]
 			.map(n => n.uri)
 			.filter((u): u is string => u != null);
 		if (deletedUris.length > 0) {
-			await this.apLogService.deleteObjectLogsDeferred(deletedUris);
+			promises.push(this.apLogService.deleteObjectLogsDeferred(deletedUris));
 		}
+
+		await trackTask(async () => {
+			await Promise.allSettled(promises);
+		});
 	}
 
 	@bindThis

From 2bca84048db0e046b2935920f11e4a70619fd933 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 24 Jun 2025 11:46:38 -0400
Subject: [PATCH 024/107] fix postNoteCreated and postNoteEdited not working
 properly due to missing Data options

---
 packages/backend/src/core/NoteCreateService.ts    |  8 +-------
 packages/backend/src/core/NoteEditService.ts      |  8 +-------
 .../processors/BackgroundTaskProcessorService.ts  | 15 +++++++++++----
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index e7f55f10ad..0b0babfafd 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -574,13 +574,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async postNoteCreated(note: MiNote, user: MiUser & {
-		id: MiUser['id'];
-		username: MiUser['username'];
-		host: MiUser['host'];
-		isBot: MiUser['isBot'];
-		noindex: MiUser['noindex'];
-	}, data: Option, silent: boolean, mentionedUsers: MinimumUser[]) {
+	public async postNoteCreated(note: MiNote, user: MiUser, data: MiNote & { poll: MiPoll | null }, silent: boolean, mentionedUsers: MinimumUser[]) {
 		this.notesChart.update(note, true);
 		if (note.visibility !== 'specified' && (this.meta.enableChartsForRemoteUser || (user.host == null))) {
 			this.perUserNotesChart.update(user, note, true);
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 11b22c0798..dc2990c64f 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -612,13 +612,7 @@ export class NoteEditService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async postNoteEdited(note: MiNote, user: MiUser & {
-		id: MiUser['id'];
-		username: MiUser['username'];
-		host: MiUser['host'];
-		isBot: MiUser['isBot'];
-		noindex: MiUser['noindex'];
-	}, data: Option, silent: boolean, mentionedUsers: MinimumUser[]) {
+	public async postNoteEdited(note: MiNote, user: MiUser, data: MiNote & { poll: MiPoll | null }, silent: boolean, mentionedUsers: MinimumUser[]) {
 		// Register host
 		if (this.meta.enableStatsForFederatedInstances) {
 			if (isRemoteUser(user)) {
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 14c1523c3e..3d82dfa89b 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -19,7 +19,7 @@ import ApRequestChart from '@/core/chart/charts/ap-request.js';
 import FederationChart from '@/core/chart/charts/federation.js';
 import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
-import type { DriveFilesRepository, NoteEditsRepository, NotesRepository, UsersRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NoteEditsRepository, NotesRepository, PollsRepository, UsersRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
 import { NoteEditService } from '@/core/NoteEditService.js';
 import { HashtagService } from '@/core/HashtagService.js';
@@ -50,6 +50,9 @@ export class BackgroundTaskProcessorService {
 		@Inject(DI.usersRepository)
 		private readonly usersRepository: UsersRepository,
 
+		@Inject(DI.pollsRepository)
+		private readonly pollsRepository: PollsRepository,
+
 		private readonly apPersonService: ApPersonService,
 		private readonly cacheService: CacheService,
 		private readonly federatedInstanceService: FederatedInstanceService,
@@ -246,17 +249,21 @@ export class BackgroundTaskProcessorService {
 	}
 
 	private async processPostNote(task: PostNoteBackgroundTask): Promise<string> {
-		const note = await this.notesRepository.findOneBy({ id: task.noteId });
+		const note = await this.notesRepository.findOne({
+			where: { id: task.noteId },
+			relations: { user: true, renote: true, reply: true, channel: true },
+		});
 		if (!note) return `Skipping post-note task: note ${task.noteId} has been deleted`;
 		const user = await this.cacheService.findUserById(note.userId);
 		if (user.isSuspended) return `Skipping post-note task: note ${task.noteId}'s user ${note.userId} is suspended`;
 
 		const mentionedUsers = await this.cacheService.getUsers(note.mentions);
+		const poll = await this.pollsRepository.findOneBy({ noteId: note.id });
 
 		if (task.edit) {
-			await this.noteEditService.postNoteEdited(note, user, note, task.silent, Array.from(mentionedUsers.values()));
+			await this.noteEditService.postNoteEdited(note, user, { ...note, poll }, task.silent, Array.from(mentionedUsers.values()));
 		} else {
-			await this.noteCreateService.postNoteCreated(note, user, note, task.silent, Array.from(mentionedUsers.values()));
+			await this.noteCreateService.postNoteCreated(note, user, { ...note, poll }, task.silent, Array.from(mentionedUsers.values()));
 		}
 
 		return 'ok';

From d06b2353b5c0a1c948891de1fcd29d19dad829fd Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 24 Jun 2025 11:47:01 -0400
Subject: [PATCH 025/107] make renote count increment and decrement the same
 way

---
 packages/backend/src/core/NoteCreateService.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 0b0babfafd..c4d5c17803 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -644,7 +644,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 		}
 
-		if (this.isRenote(data) && !this.isQuote(data) && data.renote.userId !== user.id && !user.isBot) {
+		if (this.isPureRenote(data) && data.renote.userId !== user.id && !user.isBot) {
 			await this.incRenoteCount(data.renote, user);
 		}
 
@@ -822,12 +822,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 	@bindThis
 	private async incRenoteCount(renote: MiNote, user: MiUser) {
-		await this.notesRepository.createQueryBuilder().update()
-			.set({
-				renoteCount: () => '"renoteCount" + 1',
-			})
-			.where('id = :id', { id: renote.id })
-			.execute();
+		await this.notesRepository.increment({ id: renote.id }, 'renoteCount', 1);
 
 		// 30%の確率、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (user.isExplorable && Math.random() < 0.3 && (this.timeService.now - this.idService.parse(renote.id).date.getTime()) < 1000 * 60 * 60 * 24 * 3) {

From cad059f039f26b185a00bde0ec6b0c8c1fb1e79d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 24 Jun 2025 11:47:21 -0400
Subject: [PATCH 026/107] fix cascaded note deletion and make it more efficient

---
 .../backend/src/core/NoteDeleteService.ts     | 92 +++++++++++++++----
 1 file changed, 74 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index ddee49dcf9..21dce62744 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -79,10 +79,18 @@ export class NoteDeleteService {
 
 		if (note.replyId) {
 			promises.push(this.notesRepository.decrement({ id: note.replyId }, 'repliesCount', 1));
+		} else if (isPureRenote(note)) {
+			promises.push(this.notesRepository.decrement({ id: note.renoteId }, 'renoteCount', 1));
 		}
 
-		if (isPureRenote(note)) {
-			promises.push(this.notesRepository.decrement({ id: note.renoteId }, 'renoteCount', 1));
+		const cascadeReplies = cascadingNotes.filter(cascade => cascade.replyId != null);
+		const cascadeRenotes = cascadingNotes.filter(cascade => cascade.renoteId != null);
+
+		if (cascadeReplies.length > 0) {
+			promises.push(this.notesRepository.decrement({ id: In(cascadeReplies.map(cascade => cascade.replyId)) }, 'repliesCount', 1));
+		}
+		if (cascadeRenotes.length > 0) {
+			promises.push(this.notesRepository.decrement({ id: In(cascadeRenotes.map(cascade => cascade.renoteId)) }, 'renoteCount', 1));
 		}
 
 		if (!quiet) {
@@ -90,6 +98,12 @@ export class NoteDeleteService {
 				deletedAt: deletedAt,
 			}));
 
+			for (const cascade of cascadingNotes) {
+				promises.push(this.globalEventService.publishNoteStream(cascade.id, 'deleted', {
+					deletedAt: deletedAt,
+				}));
+			}
+
 			//#region ローカルの投稿なら削除アクティビティを配送
 			if (isLocalUser(user) && !note.localOnly) {
 				const renote = isPureRenote(note)
@@ -118,6 +132,13 @@ export class NoteDeleteService {
 				this.perUserNotesChart.update(user, note, false);
 			}
 
+			for (const cascade of cascadingNotes) {
+				this.notesChart.update(cascade, false);
+				if (this.meta.enableChartsForRemoteUser || (cascade.user.host == null)) {
+					this.perUserNotesChart.update(cascade.user, cascade, false);
+				}
+			}
+
 			if (!isPureRenote(note)) {
 				// Decrement notes count (user)
 				promises.push(this.decNotesCountOfUser(user));
@@ -125,6 +146,13 @@ export class NoteDeleteService {
 				promises.push(this.queueService.createMarkUserUpdatedJob(user.id));
 			}
 
+			for (const cascade of cascadingNotes) {
+				if (!isPureRenote(cascade)) {
+					promises.push(this.decNotesCountOfUser(cascade.user));
+				}
+				// Don't mark cascaded user as updated (active)
+			}
+
 			if (this.meta.enableStatsForFederatedInstances) {
 				if (isRemoteUser(user)) {
 					if (!isPureRenote(note)) {
@@ -135,6 +163,18 @@ export class NoteDeleteService {
 						this.instanceChart.updateNote(user.host, note, false);
 					}
 				}
+
+				for (const cascade of cascadingNotes) {
+					if (this.userEntityService.isRemoteUser(cascade.user)) {
+						if (!isPureRenote(cascade)) {
+							const i = await this.federatedInstanceService.fetchOrRegister(cascade.user.host);
+							promises.push(this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1));
+						}
+						if (this.meta.enableChartsForFederatedInstances) {
+							this.instanceChart.updateNote(cascade.user.host, cascade, false);
+						}
+					}
+				}
 			}
 		}
 
@@ -189,26 +229,42 @@ export class NoteDeleteService {
 	}
 
 	@bindThis
-	private async findCascadingNotes(note: MiNote): Promise<MiNote[]> {
-		const recursive = async (noteId: string): Promise<MiNote[]> => {
-			const query = this.notesRepository.createQueryBuilder('note')
-				.where('note.replyId = :noteId', { noteId })
-				.orWhere(new Brackets(q => {
-					q.where('note.renoteId = :noteId', { noteId })
-						.andWhere('note.text IS NOT NULL');
-				}))
-				.leftJoinAndSelect('note.user', 'user');
-			const replies = await query.getMany();
+	private async findCascadingNotes(note: MiNote): Promise<(MiNote & { user: MiUser })[]> {
+		const cascadingNotes: MiNote[] = [];
 
-			return [
-				replies,
-				...await Promise.all(replies.map(reply => recursive(reply.id))),
-			].flat();
+		/**
+		 * Finds all replies, quotes, and renotes of the given list of notes.
+		 * These are the notes that will be CASCADE deleted when the origin note is deleted.
+		 *
+		 * This works by operating in "layers" that radiate out from the origin note like a web.
+		 * The process is roughly like this:
+		 *   1. Find all immediate replies and renotes of the origin.
+		 *   2. Find all immediate replies and renotes of the results from step one.
+		 *   3. Repeat until step 2 returns no new results.
+		 *   4. Collect all the step 2 results; those are the set of all cascading notes.
+		 */
+		const cascade = async (layer: MiNote[]): Promise<void> => {
+			const layerIds = layer.map(layer => layer.id);
+			const refs = await this.notesRepository.find({
+				where: [
+					{ replyId: In(layerIds) },
+					{ renoteId: In(layerIds) },
+				],
+				relations: { user: true },
+			});
+
+			// Stop when we reach the end of all threads
+			if (refs.length === 0) return;
+
+			cascadingNotes.push(...refs);
+			await cascade(refs);
 		};
 
-		const cascadingNotes: MiNote[] = await recursive(note.id);
+		// Start with the origin, which should *not* be in the result set!
+		await cascade([note]);
 
-		return cascadingNotes;
+		// Type cast is safe - we load the relation above.
+		return cascadingNotes as (MiNote & { user: MiUser })[];
 	}
 
 	@bindThis

From c3ae0c7e8c2eab162516651427a742364e0aea99 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 11:33:29 -0400
Subject: [PATCH 027/107] fix API schema for admin/queue/jobs endpoint

---
 .../server/api/endpoints/admin/queue/jobs.ts  | 70 +++++++++++++++++++
 packages/misskey-js/src/autogen/endpoint.ts   |  3 +-
 packages/misskey-js/src/autogen/entities.ts   |  1 +
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
index 45b8f4ffb2..be85a50990 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
@@ -14,6 +14,76 @@ export const meta = {
 	requireCredential: true,
 	requireModerator: true,
 	kind: 'read:admin:queue',
+
+	res: {
+		type: 'array',
+		nullable: false, optional: false,
+		items: {
+			type: 'object',
+			nullable: false, optional: false,
+			properties: {
+				id: {
+					type: 'string',
+					nullable: false, optional: true,
+				},
+				name: {
+					type: 'string',
+					nullable: false, optional: false,
+				},
+				data: {
+					type: 'object',
+					nullable: true, optional: true,
+					additionalProperties: true,
+				},
+				opts: {
+					type: 'object',
+					nullable: false, optional: false,
+					additionalProperties: true,
+				},
+				timestamp: {
+					type: 'number',
+					nullable: false, optional: false,
+				},
+				processedOn: {
+					type: 'number',
+					nullable: false, optional: true,
+				},
+				processedBy: {
+					type: 'string',
+					nullable: false, optional: true,
+				},
+				finishedOn: {
+					type: 'number',
+					nullable: false, optional: true,
+				},
+				progress: {},
+				attempts: {
+					type: 'number',
+					nullable: false, optional: false,
+				},
+				delay: {
+					type: 'number',
+					nullable: false, optional: false,
+				},
+				failedReason: {
+					type: 'string',
+					nullable: false, optional: true,
+				},
+				stackTrace: {
+					type: 'array',
+					nullable: false, optional: true,
+					items: {
+						type: 'string',
+					},
+				},
+				returnValue: {},
+				isFailed: {
+					type: 'boolean',
+					nullable: false, optional: true,
+				},
+			},
+		},
+	},
 } as const;
 
 export const paramDef = {
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 831a868792..2a83b219cb 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -87,6 +87,7 @@ import type {
 	AdminQueueDeliverDelayedResponse,
 	AdminQueueInboxDelayedResponse,
 	AdminQueueJobsRequest,
+	AdminQueueJobsResponse,
 	AdminQueuePromoteJobsRequest,
 	AdminQueueQueueStatsRequest,
 	AdminQueueRemoveJobRequest,
@@ -739,7 +740,7 @@ export type Endpoints = {
 	'admin/queue/clear': { req: AdminQueueClearRequest; res: EmptyResponse };
 	'admin/queue/deliver-delayed': { req: EmptyRequest; res: AdminQueueDeliverDelayedResponse };
 	'admin/queue/inbox-delayed': { req: EmptyRequest; res: AdminQueueInboxDelayedResponse };
-	'admin/queue/jobs': { req: AdminQueueJobsRequest; res: EmptyResponse };
+	'admin/queue/jobs': { req: AdminQueueJobsRequest; res: AdminQueueJobsResponse };
 	'admin/queue/promote-jobs': { req: AdminQueuePromoteJobsRequest; res: EmptyResponse };
 	'admin/queue/queue-stats': { req: AdminQueueQueueStatsRequest; res: EmptyResponse };
 	'admin/queue/queues': { req: EmptyRequest; res: EmptyResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index e1cb079a74..91329fddaa 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -90,6 +90,7 @@ export type AdminQueueClearRequest = operations['admin___queue___clear']['reques
 export type AdminQueueDeliverDelayedResponse = operations['admin___queue___deliver-delayed']['responses']['200']['content']['application/json'];
 export type AdminQueueInboxDelayedResponse = operations['admin___queue___inbox-delayed']['responses']['200']['content']['application/json'];
 export type AdminQueueJobsRequest = operations['admin___queue___jobs']['requestBody']['content']['application/json'];
+export type AdminQueueJobsResponse = operations['admin___queue___jobs']['responses']['200']['content']['application/json'];
 export type AdminQueuePromoteJobsRequest = operations['admin___queue___promote-jobs']['requestBody']['content']['application/json'];
 export type AdminQueueQueueStatsRequest = operations['admin___queue___queue-stats']['requestBody']['content']['application/json'];
 export type AdminQueueRemoveJobRequest = operations['admin___queue___remove-job']['requestBody']['content']['application/json'];

From 428c9258a1e2ae6246f67d480d7d63af79e9bcc8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 11:33:45 -0400
Subject: [PATCH 028/107] remove unused API and websocket calls from admin
 dashboard

---
 .../frontend/src/pages/admin/overview.vue     | 102 +-----------------
 1 file changed, 1 insertion(+), 101 deletions(-)

diff --git a/packages/frontend/src/pages/admin/overview.vue b/packages/frontend/src/pages/admin/overview.vue
index caa888b51d..9844391e11 100644
--- a/packages/frontend/src/pages/admin/overview.vue
+++ b/packages/frontend/src/pages/admin/overview.vue
@@ -65,8 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onBeforeUnmount, nextTick, shallowRef, ref, computed, useTemplateRef } from 'vue';
-import * as Misskey from 'misskey-js';
+import { computed } from 'vue';
 import XFederation from './overview.federation.vue';
 import XInstances from './overview.instances.vue';
 import XQueue from './overview.queue.vue';
@@ -77,109 +76,10 @@ import XStats from './overview.stats.vue';
 import XRetention from './overview.retention.vue';
 import XModerators from './overview.moderators.vue';
 import XHeatmap from './overview.heatmap.vue';
-import type { InstanceForPie } from './overview.pie.vue';
-import * as os from '@/os.js';
-import { misskeyApi, misskeyApiGet } from '@/utility/misskey-api.js';
-import { useStream } from '@/stream.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
 
-const rootEl = useTemplateRef('rootEl');
-const serverInfo = ref<Misskey.entities.ServerInfoResponse | null>(null);
-const topSubInstancesForPie = ref<InstanceForPie[] | null>(null);
-const topPubInstancesForPie = ref<InstanceForPie[] | null>(null);
-const federationPubActive = ref<number | null>(null);
-const federationPubActiveDiff = ref<number | null>(null);
-const federationSubActive = ref<number | null>(null);
-const federationSubActiveDiff = ref<number | null>(null);
-const newUsers = ref<Misskey.entities.UserDetailed[] | null>(null);
-const activeInstances = shallowRef<Misskey.entities.FederationInstance | null>(null);
-const queueStatsConnection = markRaw(useStream().useChannel('queueStats'));
-const now = new Date();
-const filesPagination = {
-	endpoint: 'admin/drive/files' as const,
-	limit: 9,
-	noPaging: true,
-};
-
-function onInstanceClick(i) {
-	os.pageWindow(`/instance-info/${i.host}`);
-}
-
-onMounted(async () => {
-	/*
-	const magicGrid = new MagicGrid({
-		container: rootEl,
-		static: true,
-		animate: true,
-	});
-
-	magicGrid.listen();
-	*/
-
-	misskeyApiGet('charts/federation', { limit: 2, span: 'day' }).then(chart => {
-		federationPubActive.value = chart.pubActive[0];
-		federationPubActiveDiff.value = chart.pubActive[0] - chart.pubActive[1];
-		federationSubActive.value = chart.subActive[0];
-		federationSubActiveDiff.value = chart.subActive[0] - chart.subActive[1];
-	});
-
-	misskeyApiGet('federation/stats', { limit: 10 }).then(res => {
-		topSubInstancesForPie.value = [
-			...res.topSubInstances.map(x => ({
-				name: x.host,
-				color: x.themeColor,
-				value: x.followersCount,
-				onClick: () => {
-					os.pageWindow(`/instance-info/${x.host}`);
-				},
-			})),
-			{ name: '(other)', color: '#80808080', value: res.otherFollowersCount },
-		];
-		topPubInstancesForPie.value = [
-			...res.topPubInstances.map(x => ({
-				name: x.host,
-				color: x.themeColor,
-				value: x.followingCount,
-				onClick: () => {
-					os.pageWindow(`/instance-info/${x.host}`);
-				},
-			})),
-			{ name: '(other)', color: '#80808080', value: res.otherFollowingCount },
-		];
-	});
-
-	misskeyApi('admin/server-info').then(serverInfoResponse => {
-		serverInfo.value = serverInfoResponse;
-	});
-
-	misskeyApi('admin/show-users', {
-		limit: 5,
-		sort: '+createdAt',
-	}).then(res => {
-		newUsers.value = res;
-	});
-
-	misskeyApi('federation/instances', {
-		sort: '+latestRequestReceivedAt',
-		limit: 25,
-	}).then(res => {
-		activeInstances.value = res;
-	});
-
-	nextTick(() => {
-		queueStatsConnection.send('requestLog', {
-			id: Math.random().toString().substring(2, 10),
-			length: 100,
-		});
-	});
-});
-
-onBeforeUnmount(() => {
-	queueStatsConnection.dispose();
-});
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);

From 15bb9b38e177a528127e31f8a43fc95366a8d299 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 11:33:56 -0400
Subject: [PATCH 029/107] add background queue to admin dashboard

---
 locales/index.d.ts                            |  4 +++
 .../src/pages/admin/overview.queue.vue        | 27 +++++++++----------
 .../frontend/src/pages/admin/overview.vue     |  5 ++++
 packages/misskey-js/etc/misskey-js.api.md     |  4 +++
 packages/misskey-js/src/entities.ts           |  6 +++++
 sharkey-locales/en-US.yml                     |  2 ++
 6 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 8aa409ca60..9f5a238cc9 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -13669,6 +13669,10 @@ export interface Locale extends ILocale {
      * Are you sure you want to restart this account migration?
      */
     "restartMigrationConfirm": string;
+    /**
+     * Background queue
+     */
+    "backgroundQueue": string;
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/packages/frontend/src/pages/admin/overview.queue.vue b/packages/frontend/src/pages/admin/overview.queue.vue
index cf07cddced..9fafbd4f24 100644
--- a/packages/frontend/src/pages/admin/overview.queue.vue
+++ b/packages/frontend/src/pages/admin/overview.queue.vue
@@ -38,7 +38,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { markRaw, onMounted, onUnmounted, ref, useTemplateRef } from 'vue';
 import * as Misskey from 'misskey-js';
 import XChart from './overview.queue.chart.vue';
-import type { ApQueueDomain } from '@/pages/admin/queue.vue';
 import number from '@/filters/number.js';
 import { useStream } from '@/stream.js';
 
@@ -54,7 +53,7 @@ const chartDelayed = useTemplateRef('chartDelayed');
 const chartWaiting = useTemplateRef('chartWaiting');
 
 const props = defineProps<{
-	domain: ApQueueDomain;
+	domain: 'inbox' | 'deliver' | 'background';
 }>();
 
 function onStats(stats: Misskey.entities.QueueStats) {
@@ -63,17 +62,17 @@ function onStats(stats: Misskey.entities.QueueStats) {
 	delayed.value = stats[props.domain].delayed;
 	waiting.value = stats[props.domain].waiting;
 
-	chartProcess.value.pushData(stats[props.domain].activeSincePrevTick);
-	chartActive.value.pushData(stats[props.domain].active);
-	chartDelayed.value.pushData(stats[props.domain].delayed);
-	chartWaiting.value.pushData(stats[props.domain].waiting);
+	chartProcess.value?.pushData(stats[props.domain].activeSincePrevTick);
+	chartActive.value?.pushData(stats[props.domain].active);
+	chartDelayed.value?.pushData(stats[props.domain].delayed);
+	chartWaiting.value?.pushData(stats[props.domain].waiting);
 }
 
 function onStatsLog(statsLog: Misskey.entities.QueueStatsLog) {
-	const dataProcess: Misskey.entities.QueueStats[ApQueueDomain]['activeSincePrevTick'][] = [];
-	const dataActive: Misskey.entities.QueueStats[ApQueueDomain]['active'][] = [];
-	const dataDelayed: Misskey.entities.QueueStats[ApQueueDomain]['delayed'][] = [];
-	const dataWaiting: Misskey.entities.QueueStats[ApQueueDomain]['waiting'][] = [];
+	const dataProcess: number[] = [];
+	const dataActive: number[] = [];
+	const dataDelayed: number[] = [];
+	const dataWaiting: number[] = [];
 
 	for (const stats of [...statsLog].reverse()) {
 		dataProcess.push(stats[props.domain].activeSincePrevTick);
@@ -82,10 +81,10 @@ function onStatsLog(statsLog: Misskey.entities.QueueStatsLog) {
 		dataWaiting.push(stats[props.domain].waiting);
 	}
 
-	chartProcess.value.setData(dataProcess);
-	chartActive.value.setData(dataActive);
-	chartDelayed.value.setData(dataDelayed);
-	chartWaiting.value.setData(dataWaiting);
+	chartProcess.value?.setData(dataProcess);
+	chartActive.value?.setData(dataActive);
+	chartDelayed.value?.setData(dataDelayed);
+	chartWaiting.value?.setData(dataWaiting);
 }
 
 onMounted(() => {
diff --git a/packages/frontend/src/pages/admin/overview.vue b/packages/frontend/src/pages/admin/overview.vue
index 9844391e11..1c299ea6fb 100644
--- a/packages/frontend/src/pages/admin/overview.vue
+++ b/packages/frontend/src/pages/admin/overview.vue
@@ -60,6 +60,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<template #header>Inbox queue</template>
 			<XQueue domain="inbox"/>
 		</MkFoldableSection>
+
+		<MkFoldableSection class="item">
+			<template #header>{{ i18n.ts.backgroundQueue }}</template>
+			<XQueue domain="background"/>
+		</MkFoldableSection>
 	</div>
 </div>
 </template>
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 3550677287..33f2459b94 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -298,6 +298,9 @@ type AdminQueueInboxDelayedResponse = operations['admin___queue___inbox-delayed'
 // @public (undocumented)
 type AdminQueueJobsRequest = operations['admin___queue___jobs']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type AdminQueueJobsResponse = operations['admin___queue___jobs']['responses']['200']['content']['application/json'];
+
 // @public (undocumented)
 type AdminQueuePromoteJobsRequest = operations['admin___queue___promote-jobs']['requestBody']['content']['application/json'];
 
@@ -1617,6 +1620,7 @@ declare namespace entities {
         AdminQueueDeliverDelayedResponse,
         AdminQueueInboxDelayedResponse,
         AdminQueueJobsRequest,
+        AdminQueueJobsResponse,
         AdminQueuePromoteJobsRequest,
         AdminQueueQueueStatsRequest,
         AdminQueueRemoveJobRequest,
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index abc3f08bb8..4d27aef63b 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -313,6 +313,12 @@ export type QueueStats = {
 		waiting: number;
 		delayed: number;
 	};
+	background: {
+		activeSincePrevTick: number;
+		active: number;
+		waiting: number;
+		delayed: number;
+	};
 };
 
 export type QueueStatsLog = QueueStats[];
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 0a378aa4a1..767d5773b7 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -731,3 +731,5 @@ accountMigrationUri: "Migration URI"
 restartMigration: "Restart account migration"
 restartMigrationDescription: "Account migration was last attempted {date}. If the migration failed or was incomplete, then you may click this button to restart the process."
 restartMigrationConfirm: "Are you sure you want to restart this account migration?"
+
+backgroundQueue: "Background queue"

From 0491ea55cce5c41050b50a40792f8f4d2f3a3f60 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 11:59:00 -0400
Subject: [PATCH 030/107] move UpdateInstanceQueue into CollapsedQueueService

---
 .../backend/src/core/CollapsedQueueService.ts | 73 +++++++++++++++++++
 packages/backend/src/core/CoreModule.ts       | 12 +--
 .../backend/src/core/UpdateInstanceQueue.ts   | 54 --------------
 .../BackgroundTaskProcessorService.ts         |  6 +-
 .../queue/processors/InboxProcessorService.ts |  7 ++
 5 files changed, 89 insertions(+), 63 deletions(-)
 create mode 100644 packages/backend/src/core/CollapsedQueueService.ts
 delete mode 100644 packages/backend/src/core/UpdateInstanceQueue.ts

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
new file mode 100644
index 0000000000..f2b920fb33
--- /dev/null
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -0,0 +1,73 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable, OnApplicationShutdown } from '@nestjs/common';
+import { LoggerService } from '@/core/LoggerService.js';
+import type Logger from '@/logger.js';
+import { CollapsedQueue } from '@/misc/collapsed-queue.js';
+import { renderInlineError } from '@/misc/render-inline-error.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import { EnvService } from '@/core/EnvService.js';
+import { bindThis } from '@/decorators.js';
+import type { MiInstance } from '@/models/Instance.js';
+
+export type UpdateInstanceJob = {
+	latestRequestReceivedAt: Date,
+	shouldUnsuspend: boolean,
+};
+
+@Injectable()
+export class CollapsedQueueService implements OnApplicationShutdown {
+	// Moved from InboxProcessorService to allow access from ApInboxService
+	public readonly updateInstanceQueue: CollapsedQueue<MiInstance['id'], UpdateInstanceJob>;
+
+	private readonly logger: Logger;
+
+	constructor(
+		private readonly federatedInstanceService: FederatedInstanceService,
+		private readonly envService: EnvService,
+
+		loggerService: LoggerService,
+	) {
+		this.logger = loggerService.getLogger('collapsed-queue');
+		this.updateInstanceQueue = new CollapsedQueue(
+			this.envService.env.NODE_ENV !== 'test'
+				? 60 * 1000 * 5
+				: 0,
+			(oldJob, newJob) => this.collapseUpdateInstance(oldJob, newJob),
+			(id, job) => this.performUpdateInstance(id, job),
+		);
+	}
+
+	@bindThis
+	private collapseUpdateInstance(oldJob: UpdateInstanceJob, newJob: UpdateInstanceJob) {
+		const latestRequestReceivedAt = oldJob.latestRequestReceivedAt < newJob.latestRequestReceivedAt
+			? newJob.latestRequestReceivedAt
+			: oldJob.latestRequestReceivedAt;
+		const shouldUnsuspend = oldJob.shouldUnsuspend || newJob.shouldUnsuspend;
+		return {
+			latestRequestReceivedAt,
+			shouldUnsuspend,
+		};
+	}
+
+	@bindThis
+	private async performUpdateInstance(id: string, job: UpdateInstanceJob) {
+		await this.federatedInstanceService.update(id, {
+			latestRequestReceivedAt: new Date(),
+			isNotResponding: false,
+			// もしサーバーが死んでるために配信が止まっていた場合には自動的に復活させてあげる
+			suspensionState: job.shouldUnsuspend ? 'none' : undefined,
+		});
+	}
+
+	async dispose() {
+		await this.updateInstanceQueue.performAllNow().catch(err => this.logger.error(`Shutdown error in updateInstanceQueue: ${renderInlineError(err)}`));
+	}
+
+	async onApplicationShutdown() {
+		await this.dispose();
+	}
+}
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index 11119c52a3..a75c3b3abf 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -17,7 +17,7 @@ import { WebhookTestService } from '@/core/WebhookTestService.js';
 import { FlashService } from '@/core/FlashService.js';
 import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
 import { ApLogService } from '@/core/ApLogService.js';
-import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { InstanceStatsService } from '@/core/InstanceStatsService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { AccountMoveService } from './AccountMoveService.js';
@@ -218,7 +218,7 @@ const $UserRenoteMutingService: Provider = { provide: 'UserRenoteMutingService',
 const $UserSearchService: Provider = { provide: 'UserSearchService', useExisting: UserSearchService };
 const $UserSuspendService: Provider = { provide: 'UserSuspendService', useExisting: UserSuspendService };
 const $UserAuthService: Provider = { provide: 'UserAuthService', useExisting: UserAuthService };
-const $UpdateInstanceQueue: Provider = { provide: 'UpdateInstanceQueue', useExisting: UpdateInstanceQueue };
+const $CollapsedQueueService: Provider = { provide: 'CollapsedQueueService', useExisting: CollapsedQueueService };
 const $VideoProcessingService: Provider = { provide: 'VideoProcessingService', useExisting: VideoProcessingService };
 const $UserWebhookService: Provider = { provide: 'UserWebhookService', useExisting: UserWebhookService };
 const $SystemWebhookService: Provider = { provide: 'SystemWebhookService', useExisting: SystemWebhookService };
@@ -377,7 +377,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
-		UpdateInstanceQueue,
+		CollapsedQueueService,
 		VideoProcessingService,
 		UserWebhookService,
 		SystemWebhookService,
@@ -531,7 +531,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		$UserSearchService,
 		$UserSuspendService,
 		$UserAuthService,
-		$UpdateInstanceQueue,
+		$CollapsedQueueService,
 		$VideoProcessingService,
 		$UserWebhookService,
 		$SystemWebhookService,
@@ -686,7 +686,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
-		UpdateInstanceQueue,
+		CollapsedQueueService,
 		VideoProcessingService,
 		UserWebhookService,
 		SystemWebhookService,
@@ -839,7 +839,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		$UserSearchService,
 		$UserSuspendService,
 		$UserAuthService,
-		$UpdateInstanceQueue,
+		$CollapsedQueueService,
 		$VideoProcessingService,
 		$UserWebhookService,
 		$SystemWebhookService,
diff --git a/packages/backend/src/core/UpdateInstanceQueue.ts b/packages/backend/src/core/UpdateInstanceQueue.ts
deleted file mode 100644
index c136241344..0000000000
--- a/packages/backend/src/core/UpdateInstanceQueue.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Injectable, OnApplicationShutdown } from '@nestjs/common';
-import { CollapsedQueue } from '@/misc/collapsed-queue.js';
-import { bindThis } from '@/decorators.js';
-import { MiNote } from '@/models/Note.js';
-import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import { TimeService } from '@/global/TimeService.js';
-
-type UpdateInstanceJob = {
-	latestRequestReceivedAt: Date,
-	shouldUnsuspend: boolean,
-};
-
-// Moved from InboxProcessorService to allow access from ApInboxService
-@Injectable()
-export class UpdateInstanceQueue extends CollapsedQueue<MiNote['id'], UpdateInstanceJob> implements OnApplicationShutdown {
-	constructor(
-		private readonly federatedInstanceService: FederatedInstanceService,
-		timeService: TimeService,
-	) {
-		super(timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, (id, job) => this.collapseUpdateInstanceJobs(id, job), (id, job) => this.performUpdateInstance(id, job));
-	}
-
-	@bindThis
-	private collapseUpdateInstanceJobs(oldJob: UpdateInstanceJob, newJob: UpdateInstanceJob) {
-		const latestRequestReceivedAt = oldJob.latestRequestReceivedAt < newJob.latestRequestReceivedAt
-			? newJob.latestRequestReceivedAt
-			: oldJob.latestRequestReceivedAt;
-		const shouldUnsuspend = oldJob.shouldUnsuspend || newJob.shouldUnsuspend;
-		return {
-			latestRequestReceivedAt,
-			shouldUnsuspend,
-		};
-	}
-
-	@bindThis
-	private async performUpdateInstance(id: string, job: UpdateInstanceJob) {
-		await this.federatedInstanceService.update(id, {
-			latestRequestReceivedAt: this.timeService.date,
-			isNotResponding: false,
-			// もしサーバーが死んでるために配信が止まっていた場合には自動的に復活させてあげる
-			suspensionState: job.shouldUnsuspend ? 'none' : undefined,
-		});
-	}
-
-	@bindThis
-	async onApplicationShutdown() {
-		await this.performAllNow();
-	}
-}
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 3d82dfa89b..19a2e355c8 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -17,7 +17,6 @@ import { MiMeta } from '@/models/Meta.js';
 import InstanceChart from '@/core/chart/charts/instance.js';
 import ApRequestChart from '@/core/chart/charts/ap-request.js';
 import FederationChart from '@/core/chart/charts/federation.js';
-import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
 import type { DriveFilesRepository, NoteEditsRepository, NotesRepository, PollsRepository, UsersRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
@@ -29,6 +28,7 @@ import { trackTask } from '@/misc/promise-tracker.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { ApLogService } from '@/core/ApLogService.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -60,7 +60,7 @@ export class BackgroundTaskProcessorService {
 		private readonly instanceChart: InstanceChart,
 		private readonly apRequestChart: ApRequestChart,
 		private readonly federationChart: FederationChart,
-		private readonly updateInstanceQueue: UpdateInstanceQueue,
+		private readonly collapsedQueueService: CollapsedQueueService,
 		private readonly noteCreateService: NoteCreateService,
 		private readonly noteEditService: NoteEditService,
 		private readonly hashtagService: HashtagService,
@@ -240,7 +240,7 @@ export class BackgroundTaskProcessorService {
 		await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(instance);
 
 		// Unsuspend instance (deferred)
-		this.updateInstanceQueue.enqueue(instance.id, {
+		this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
 			latestRequestReceivedAt: new Date(),
 			shouldUnsuspend: instance.suspensionState === 'autoSuspendedForNotResponding',
 		});
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 1a2389dac4..0495501567 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -38,14 +38,18 @@ import { trackPromise } from '@/misc/promise-tracker.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type { InboxJobData } from '../types.js';
 
+// Moved to CollapsedQueueService
+/*
 type UpdateInstanceJob = {
 	latestRequestReceivedAt: Date,
 	shouldUnsuspend: boolean,
 };
+ */
 
 @Injectable()
 export class InboxProcessorService implements OnApplicationShutdown {
 	private logger: Logger;
+	// Moved to CollapsedQueueService
 	//private updateInstanceQueue: CollapsedQueue<MiNote['id'], UpdateInstanceJob>;
 
 	constructor(
@@ -295,6 +299,8 @@ export class InboxProcessorService implements OnApplicationShutdown {
 		return 'ok';
 	}
 
+	// Moved to CollapsedQueueService
+	/*
 	@bindThis
 	public collapseUpdateInstanceJobs(oldJob: UpdateInstanceJob, newJob: UpdateInstanceJob) {
 		const latestRequestReceivedAt = oldJob.latestRequestReceivedAt < newJob.latestRequestReceivedAt
@@ -316,6 +322,7 @@ export class InboxProcessorService implements OnApplicationShutdown {
 			suspensionState: job.shouldUnsuspend ? 'none' : undefined,
 		});
 	}
+	*/
 
 	@bindThis
 	public async dispose(): Promise<void> {}

From a3bcc474b7699fa577fede8c320f79aa83d0146f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 12:08:52 -0400
Subject: [PATCH 031/107] return results from CollapsedQueue.performAllNow

---
 packages/backend/src/misc/collapsed-queue.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 168a4d7680..ee3f44af4b 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -42,6 +42,6 @@ export class CollapsedQueue<K, V> {
 		for (const [_key, job] of entries) {
 			this.timeService.stopTimer(job.timer);
 		}
-		await Promise.allSettled(entries.map(([key, job]) => this.perform(key, job.value)));
+		return await Promise.allSettled(entries.map(([key, job]) => this.perform(key, job.value)));
 	}
 }

From 3a2c0fd9dae04d2b3440ad6d34b150148967656c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 12:16:17 -0400
Subject: [PATCH 032/107] add name and error logging to CollapsedQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 38 ++++++++++++++++---
 packages/backend/src/misc/collapsed-queue.ts  | 21 +++++++---
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index f2b920fb33..3f3b304618 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -33,11 +33,11 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	) {
 		this.logger = loggerService.getLogger('collapsed-queue');
 		this.updateInstanceQueue = new CollapsedQueue(
-			this.envService.env.NODE_ENV !== 'test'
-				? 60 * 1000 * 5
-				: 0,
+			'updateInstance',
+			this.envService.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0,
 			(oldJob, newJob) => this.collapseUpdateInstance(oldJob, newJob),
 			(id, job) => this.performUpdateInstance(id, job),
+			this.onQueueError,
 		);
 	}
 
@@ -63,11 +63,37 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		});
 	}
 
-	async dispose() {
-		await this.updateInstanceQueue.performAllNow().catch(err => this.logger.error(`Shutdown error in updateInstanceQueue: ${renderInlineError(err)}`));
+	@bindThis
+	async performAllNow() {
+		this.logger.info('Persisting all collapsed queues...');
+
+		await this.performQueue(this.updateInstanceQueue);
+
+		this.logger.info('Persistence complete.');
+	}
+
+	@bindThis
+	private async performQueue<K, V>(queue: CollapsedQueue<K, V>): Promise<void> {
+		try {
+			const results = await queue.performAllNow();
+
+			const [succeeded, failed] = results.reduce((counts, result) => {
+				counts[result.status === 'fulfilled' ? 0 : 1]++;
+				return counts;
+			}, [0, 0]);
+
+			this.logger.debug(`Persistence completed for ${queue.name}: ${succeeded} succeeded and ${failed} failed`);
+		} catch (err) {
+			this.logger.error(`Persistence failed for ${queue.name}: ${renderInlineError(err)}`);
+		}
+	}
+
+	@bindThis
+	private onQueueError<K, V>(queue: CollapsedQueue<K, V>, error: unknown): void {
+		this.logger.error(`Error persisting ${queue.name}: ${renderInlineError(error)}`);
 	}
 
 	async onApplicationShutdown() {
-		await this.dispose();
+		await this.performAllNow();
 	}
 }
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index ee3f44af4b..af3796f7ed 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -15,10 +15,12 @@ export class CollapsedQueue<K, V> {
 	private jobs: Map<K, Job<V>> = new Map();
 
 	constructor(
+		public readonly name: string,
 		protected readonly timeService: TimeService,
-		private timeout: number,
-		private collapse: (oldValue: V, newValue: V) => V,
-		private perform: (key: K, value: V) => Promise<void>,
+		private readonly timeout: number,
+		private readonly collapse: (oldValue: V, newValue: V) => V,
+		private readonly perform: (key: K, value: V) => Promise<void>,
+		private readonly onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void,
 	) {}
 
 	enqueue(key: K, value: V) {
@@ -30,7 +32,7 @@ export class CollapsedQueue<K, V> {
 			const timer = this.timeService.startTimer(() => {
 				const job = this.jobs.get(key)!;
 				this.jobs.delete(key);
-				this.perform(key, job.value);
+				this._perform(key, job.value);
 			}, this.timeout);
 			this.jobs.set(key, { value, timer });
 		}
@@ -42,6 +44,15 @@ export class CollapsedQueue<K, V> {
 		for (const [_key, job] of entries) {
 			this.timeService.stopTimer(job.timer);
 		}
-		return await Promise.allSettled(entries.map(([key, job]) => this.perform(key, job.value)));
+		return await Promise.allSettled(entries.map(([key, job]) => this._perform(key, job.value)));
+	}
+
+	private async _perform(key: K, value: V) {
+		try {
+			await this.perform(key, value);
+		} catch (err) {
+			this.onError?.(this, err);
+			throw err;
+		}
 	}
 }

From 45df03ab148db0484e1fe8dff2f4fecb075dfa48 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 12:34:40 -0400
Subject: [PATCH 033/107] replace MarkUserUpdatedBackgroundTask with
 updateUserQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 71 ++++++++++++-------
 .../backend/src/core/NoteCreateService.ts     |  6 +-
 .../backend/src/core/NoteDeleteService.ts     |  8 +--
 packages/backend/src/core/NoteEditService.ts  |  4 +-
 packages/backend/src/core/QueueService.ts     |  5 --
 packages/backend/src/core/ReactionService.ts  |  8 +--
 packages/backend/src/misc/collapsed-queue.ts  |  2 +-
 .../BackgroundTaskProcessorService.ts         | 28 +-------
 packages/backend/src/queue/types.ts           |  8 +--
 9 files changed, 67 insertions(+), 73 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 3f3b304618..aa21f7578f 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Injectable, OnApplicationShutdown } from '@nestjs/common';
+import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { CollapsedQueue } from '@/misc/collapsed-queue.js';
@@ -12,55 +12,69 @@ import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { EnvService } from '@/core/EnvService.js';
 import { bindThis } from '@/decorators.js';
 import type { MiInstance } from '@/models/Instance.js';
+import { InternalEventService } from '@/core/InternalEventService.js';
+import { MiUser } from '@/models/User.js';
+import type { UsersRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt: Date,
 	shouldUnsuspend: boolean,
 };
 
+export type UpdateUserJob = {
+	updatedAt: Date,
+};
+
 @Injectable()
 export class CollapsedQueueService implements OnApplicationShutdown {
 	// Moved from InboxProcessorService to allow access from ApInboxService
 	public readonly updateInstanceQueue: CollapsedQueue<MiInstance['id'], UpdateInstanceJob>;
+	public readonly updateUserQueue: CollapsedQueue<MiUser['id'], UpdateUserJob>;
 
 	private readonly logger: Logger;
 
 	constructor(
+		@Inject(DI.usersRepository)
+		public readonly usersRepository: UsersRepository,
+
 		private readonly federatedInstanceService: FederatedInstanceService,
 		private readonly envService: EnvService,
+		private readonly internalEventService: InternalEventService,
 
 		loggerService: LoggerService,
 	) {
 		this.logger = loggerService.getLogger('collapsed-queue');
+
+		const fiveMinuteInterval = this.envService.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0;
+
 		this.updateInstanceQueue = new CollapsedQueue(
 			'updateInstance',
-			this.envService.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0,
-			(oldJob, newJob) => this.collapseUpdateInstance(oldJob, newJob),
-			(id, job) => this.performUpdateInstance(id, job),
+			fiveMinuteInterval,
+			(oldJob, newJob) => ({
+				latestRequestReceivedAt: new Date(Math.max(oldJob.latestRequestReceivedAt.getTime(), newJob.latestRequestReceivedAt.getTime())),
+				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
+			}),
+			(id, job) => this.federatedInstanceService.update(id, {
+				latestRequestReceivedAt: job.latestRequestReceivedAt,
+				isNotResponding: false,
+				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
+			}),
 			this.onQueueError,
 		);
-	}
 
-	@bindThis
-	private collapseUpdateInstance(oldJob: UpdateInstanceJob, newJob: UpdateInstanceJob) {
-		const latestRequestReceivedAt = oldJob.latestRequestReceivedAt < newJob.latestRequestReceivedAt
-			? newJob.latestRequestReceivedAt
-			: oldJob.latestRequestReceivedAt;
-		const shouldUnsuspend = oldJob.shouldUnsuspend || newJob.shouldUnsuspend;
-		return {
-			latestRequestReceivedAt,
-			shouldUnsuspend,
-		};
-	}
+		this.updateUserQueue = new CollapsedQueue(
+			'updateUser',
+			fiveMinuteInterval,
+			(oldJob, newJob) => ({
+				updatedAt: new Date(Math.max(oldJob.updatedAt.getTime(), newJob.updatedAt.getTime())),
+			}),
+			(id, job) => this.usersRepository.update({ id }, { updatedAt: job.updatedAt }),
+			this.onQueueError,
+		);
 
-	@bindThis
-	private async performUpdateInstance(id: string, job: UpdateInstanceJob) {
-		await this.federatedInstanceService.update(id, {
-			latestRequestReceivedAt: new Date(),
-			isNotResponding: false,
-			// もしサーバーが死んでるために配信が止まっていた場合には自動的に復活させてあげる
-			suspensionState: job.shouldUnsuspend ? 'none' : undefined,
-		});
+		this.internalEventService.on('localUserUpdated', this.onUserUpdated);
+		this.internalEventService.on('remoteUserUpdated', this.onUserUpdated);
 	}
 
 	@bindThis
@@ -68,6 +82,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		this.logger.info('Persisting all collapsed queues...');
 
 		await this.performQueue(this.updateInstanceQueue);
+		await this.performQueue(this.updateUserQueue);
 
 		this.logger.info('Persistence complete.');
 	}
@@ -93,7 +108,15 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		this.logger.error(`Error persisting ${queue.name}: ${renderInlineError(error)}`);
 	}
 
+	@bindThis
+	private onUserUpdated(data: { id: string }) {
+		this.updateUserQueue.enqueue(data.id, { updatedAt: new Date() });
+	}
+
 	async onApplicationShutdown() {
+		this.internalEventService.off('localUserUpdated', this.onUserUpdated);
+		this.internalEventService.off('remoteUserUpdated', this.onUserUpdated);
+
 		await this.performAllNow();
 	}
 }
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index c4d5c17803..e4a57880ad 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -59,6 +59,7 @@ import { CollapsedQueue } from '@/misc/collapsed-queue.js';
 import { CacheService } from '@/core/CacheService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -226,6 +227,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private latestNoteService: LatestNoteService,
 		private readonly timeService: TimeService,
 		private readonly noteVisibilityService: NoteVisibilityService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
 		this.updateNotesCountQueue = new CollapsedQueue(this.timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
@@ -604,10 +606,10 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (!this.isRenote(note) || this.isQuote(note)) {
 			// Increment notes count (user)
 			await this.incNotesCountOfUser(user);
-		} else {
-			await this.queueService.createMarkUserUpdatedJob(user.id);
 		}
 
+		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+
 		await this.pushToTl(note, user);
 
 		await this.antennaService.addNoteToAntennas({
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 21dce62744..4384b29a99 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -27,7 +27,7 @@ import { LatestNoteService } from '@/core/LatestNoteService.js';
 import { ApLogService } from '@/core/ApLogService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { trackTask } from '@/misc/promise-tracker.js';
-import { QueueService } from '@/core/QueueService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { CacheService } from '@/core/CacheService.js';
 
 @Injectable()
@@ -61,7 +61,7 @@ export class NoteDeleteService {
 		private latestNoteService: LatestNoteService,
 		private readonly apLogService: ApLogService,
 		private readonly timeService: TimeService,
-		private readonly queueService: QueueService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 		private readonly cacheService: CacheService,
 	) {}
 
@@ -142,10 +142,10 @@ export class NoteDeleteService {
 			if (!isPureRenote(note)) {
 				// Decrement notes count (user)
 				promises.push(this.decNotesCountOfUser(user));
-			} else {
-				promises.push(this.queueService.createMarkUserUpdatedJob(user.id));
 			}
 
+			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+
 			for (const cascade of cascadingNotes) {
 				if (!isPureRenote(cascade)) {
 					promises.push(this.decNotesCountOfUser(cascade.user));
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index dc2990c64f..54d712c042 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -55,6 +55,7 @@ import { NoteCreateService } from '@/core/NoteCreateService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { isPureRenote } from '@/misc/is-renote.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention' | 'edited';
 
@@ -224,6 +225,7 @@ export class NoteEditService implements OnApplicationShutdown {
 		private noteCreateService: NoteCreateService,
 		private readonly timeService: TimeService,
 		private readonly noteVisibilityService: NoteVisibilityService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
 		this.updateNotesCountQueue = new CollapsedQueue(this.timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
@@ -627,7 +629,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		await this.queueService.createMarkUserUpdatedJob(user.id);
+		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		// ハッシュタグ更新
 		await this.pushToTl(note, user);
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 9cd9754f21..99911f38a7 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -935,11 +935,6 @@ export class QueueService implements OnModuleInit {
 		return await this.createBackgroundTask({ type: 'delete-ap-logs', dataType, data });
 	}
 
-	@bindThis
-	public async createMarkUserUpdatedJob(userId: string) {
-		return await this.createBackgroundTask({ type: 'mark-user-updated', userId }, userId);
-	}
-
 	private async createBackgroundTask<T extends BackgroundTaskJobData>(data: T, duplication?: string | { id: string, ttl?: number }) {
 		return await this.backgroundTaskQueue.add(
 			data.type,
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 8f642e014e..1e2e30f219 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -33,7 +33,7 @@ import { PER_NOTE_REACTION_USER_PAIR_CACHE_MAX } from '@/const.js';
 import { CacheService } from '@/core/CacheService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { TimeService } from '@/global/TimeService.js';
-import { QueueService } from '@/core/QueueService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import type { DataSource } from 'typeorm';
 
 const FALLBACK = '\u2764';
@@ -111,7 +111,7 @@ export class ReactionService implements OnModuleInit {
 		private readonly cacheService: CacheService,
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly timeService: TimeService,
-		private readonly queueService: QueueService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
 	}
 
@@ -226,7 +226,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		await this.queueService.createMarkUserUpdatedJob(user.id);
+		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		// 30%の確率、セルフではない、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (
@@ -342,7 +342,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		await this.queueService.createMarkUserUpdatedJob(user.id);
+		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
 			reaction: this.decodeReaction(exist.reaction).reaction,
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index af3796f7ed..8b70bcc505 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -19,7 +19,7 @@ export class CollapsedQueue<K, V> {
 		protected readonly timeService: TimeService,
 		private readonly timeout: number,
 		private readonly collapse: (oldValue: V, newValue: V) => V,
-		private readonly perform: (key: K, value: V) => Promise<void>,
+		private readonly perform: (key: K, value: V) => Promise<void | unknown>,
 		private readonly onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void,
 	) {}
 
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 19a2e355c8..4863b815d7 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Bull from 'bullmq';
-import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask, DeleteApLogsBackgroundTask, MarkUserUpdatedBackgroundTask } from '@/queue/types.js';
+import { BackgroundTaskJobData, CheckHibernationBackgroundTask, PostDeliverBackgroundTask, PostInboxBackgroundTask, PostNoteBackgroundTask, UpdateFeaturedBackgroundTask, UpdateInstanceBackgroundTask, UpdateUserTagsBackgroundTask, UpdateUserBackgroundTask, UpdateNoteTagsBackgroundTask, DeleteFileBackgroundTask, UpdateLatestNoteBackgroundTask, PostSuspendBackgroundTask, PostUnsuspendBackgroundTask, DeleteApLogsBackgroundTask } from '@/queue/types.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
 import Logger from '@/logger.js';
@@ -18,7 +18,7 @@ import InstanceChart from '@/core/chart/charts/instance.js';
 import ApRequestChart from '@/core/chart/charts/ap-request.js';
 import FederationChart from '@/core/chart/charts/federation.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
-import type { DriveFilesRepository, NoteEditsRepository, NotesRepository, PollsRepository, UsersRepository } from '@/models/_.js';
+import type { DriveFilesRepository, NoteEditsRepository, NotesRepository, PollsRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
 import { NoteEditService } from '@/core/NoteEditService.js';
 import { HashtagService } from '@/core/HashtagService.js';
@@ -27,7 +27,6 @@ import { LatestNoteService } from '@/core/LatestNoteService.js';
 import { trackTask } from '@/misc/promise-tracker.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { ApLogService } from '@/core/ApLogService.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 
 @Injectable()
@@ -47,9 +46,6 @@ export class BackgroundTaskProcessorService {
 		@Inject(DI.noteEditsRepository)
 		private readonly noteEditsRepository: NoteEditsRepository,
 
-		@Inject(DI.usersRepository)
-		private readonly usersRepository: UsersRepository,
-
 		@Inject(DI.pollsRepository)
 		private readonly pollsRepository: PollsRepository,
 
@@ -68,7 +64,6 @@ export class BackgroundTaskProcessorService {
 		private readonly latestNoteService: LatestNoteService,
 		private readonly userSuspendService: UserSuspendService,
 		private readonly apLogService: ApLogService,
-		private readonly internalEventService: InternalEventService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -102,11 +97,9 @@ export class BackgroundTaskProcessorService {
 			return await this.processPostSuspend(job.data);
 		} else if (job.data.type === 'post-unsuspend') {
 			return await this.processPostUnsuspend(job.data);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (job.data.type === 'delete-ap-logs') {
 			return await this.processDeleteApLogs(job.data);
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		} else if (job.data.type === 'mark-user-updated') {
-			return await this.processMarkUserUpdated(job.data);
 		} else {
 			this.logger.warn(`Can't process unknown job type "${job.data}"; this is likely a bug. Full job data:`, job.data);
 			throw new Error(`Unknown job type ${job.data}, see system logs for details`);
@@ -352,19 +345,4 @@ export class BackgroundTaskProcessorService {
 
 		return 'ok';
 	}
-
-	private async processMarkUserUpdated(task: MarkUserUpdatedBackgroundTask): Promise<string> {
-		const user = await this.cacheService.findOptionalUserById(task.userId);
-		if (!user || user.isDeleted) return `Skipping post-unsuspend task: user ${task.userId} has been deleted`;
-
-		await this.usersRepository.update({ id: user.id }, { updatedAt: new Date() });
-
-		if (user.host == null) {
-			await this.internalEventService.emit('localUserUpdated', { id: user.id });
-		} else {
-			await this.internalEventService.emit('remoteUserUpdated', { id: user.id });
-		}
-
-		return 'ok';
-	}
 }
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 671500a275..cb31e5a3e1 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -184,8 +184,7 @@ export type BackgroundTaskJobData =
 	UpdateLatestNoteBackgroundTask |
 	PostSuspendBackgroundTask |
 	PostUnsuspendBackgroundTask |
-	DeleteApLogsBackgroundTask |
-	MarkUserUpdatedBackgroundTask;
+	DeleteApLogsBackgroundTask;
 
 export type UpdateUserBackgroundTask = {
 	type: 'update-user';
@@ -262,8 +261,3 @@ export type DeleteApLogsBackgroundTask = {
 	dataType: 'inbox' | 'object';
 	data: string | string[];
 };
-
-export type MarkUserUpdatedBackgroundTask = {
-	type: 'mark-user-updated';
-	userId: string;
-};

From e884e3f6a33353c1860119e0644541e37e298951 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 12:43:13 -0400
Subject: [PATCH 034/107] add concurrency limit to CollapsedQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 10 ++++++--
 packages/backend/src/misc/collapsed-queue.ts  | 25 +++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index aa21f7578f..36c2c6962d 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -60,7 +60,10 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				isNotResponding: false,
 				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
 			}),
-			this.onQueueError,
+			{
+				onError: this.onQueueError,
+				concurrency: 2, // Low concurrency, this table is slow for some reason
+			},
 		);
 
 		this.updateUserQueue = new CollapsedQueue(
@@ -70,7 +73,10 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				updatedAt: new Date(Math.max(oldJob.updatedAt.getTime(), newJob.updatedAt.getTime())),
 			}),
 			(id, job) => this.usersRepository.update({ id }, { updatedAt: job.updatedAt }),
-			this.onQueueError,
+			{
+				onError: this.onQueueError,
+				concurrency: 4,
+			},
 		);
 
 		this.internalEventService.on('localUserUpdated', this.onUserUpdated);
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 8b70bcc505..a2b1166faf 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { TimeService, TimerHandle } from '@/global/TimeService.js';
+import { TimeService, type TimerHandle } from '@/global/TimeService.js';
+import promiseLimit from 'promise-limit';
 
 type Job<V> = {
 	value: V;
@@ -12,6 +13,7 @@ type Job<V> = {
 
 // TODO: redis使えるようにする
 export class CollapsedQueue<K, V> {
+	private readonly limiter?: ReturnType<typeof promiseLimit<void>>;
 	private jobs: Map<K, Job<V>> = new Map();
 
 	constructor(
@@ -20,8 +22,15 @@ export class CollapsedQueue<K, V> {
 		private readonly timeout: number,
 		private readonly collapse: (oldValue: V, newValue: V) => V,
 		private readonly perform: (key: K, value: V) => Promise<void | unknown>,
-		private readonly onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void,
-	) {}
+		private readonly opts?: {
+			onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void,
+			concurrency?: number,
+		},
+	) {
+		if (opts?.concurrency) {
+			this.limiter = promiseLimit<void>(opts.concurrency);
+		}
+	}
 
 	enqueue(key: K, value: V) {
 		if (this.jobs.has(key)) {
@@ -49,9 +58,15 @@ export class CollapsedQueue<K, V> {
 
 	private async _perform(key: K, value: V) {
 		try {
-			await this.perform(key, value);
+			if (this.limiter) {
+				await this.limiter(async () => {
+					await this.perform(key, value);
+				});
+			} else {
+				await this.perform(key, value);
+			}
 		} catch (err) {
-			this.onError?.(this, err);
+			this.opts?.onError?.(this, err);
 			throw err;
 		}
 	}

From 28dff9aff9ce95d3903cd40bb117fd01ab5ae0a8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:19:24 -0400
Subject: [PATCH 035/107] merge NoteCreateService.updateNotesCountQueue and
 NoteEditService.updateNotesCountQueue into
 CollapsedQueueService.updateInstanceQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 34 ++++++++++++++++---
 .../backend/src/core/NoteCreateService.ts     | 11 +++---
 packages/backend/src/core/NoteEditService.ts  | 19 ++---------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 36c2c6962d..fd0ccb0eaf 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -18,8 +18,9 @@ import type { UsersRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 
 export type UpdateInstanceJob = {
-	latestRequestReceivedAt: Date,
-	shouldUnsuspend: boolean,
+	latestRequestReceivedAt?: Date,
+	shouldUnsuspend?: boolean,
+	additionalNotes?: number,
 };
 
 export type UpdateUserJob = {
@@ -52,13 +53,15 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			'updateInstance',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
-				latestRequestReceivedAt: new Date(Math.max(oldJob.latestRequestReceivedAt.getTime(), newJob.latestRequestReceivedAt.getTime())),
+				latestRequestReceivedAt: maxDate(oldJob.latestRequestReceivedAt, newJob.latestRequestReceivedAt),
 				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
+				additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0),
 			}),
 			(id, job) => this.federatedInstanceService.update(id, {
 				latestRequestReceivedAt: job.latestRequestReceivedAt,
-				isNotResponding: false,
+				isNotResponding: job.latestRequestReceivedAt ? false : undefined,
 				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
+				notesCount: job.additionalNotes ? () => `"notesCount" + ${job.additionalNotes}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
@@ -70,7 +73,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			'updateUser',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
-				updatedAt: new Date(Math.max(oldJob.updatedAt.getTime(), newJob.updatedAt.getTime())),
+				updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt),
 			}),
 			(id, job) => this.usersRepository.update({ id }, { updatedAt: job.updatedAt }),
 			{
@@ -126,3 +129,24 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		await this.performAllNow();
 	}
 }
+
+function maxDate(first: Date, second: Date | undefined): Date;
+function maxDate(first: Date | undefined, second: Date): Date;
+function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined;
+// eslint requires a space here -_-
+
+function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined {
+	if (first && second) {
+		if (first.getTime() > second.getTime()) {
+			return first;
+		} else {
+			return second;
+		}
+	} else if (first) {
+		return first;
+	} else if (second) {
+		return second;
+	} else {
+		return undefined;
+	}
+}
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index e4a57880ad..8f515de502 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -155,7 +155,7 @@ export type PureRenoteOption = Option & { renote: MiNote } & ({ text?: null } |
 @Injectable()
 export class NoteCreateService implements OnApplicationShutdown {
 	#shutdownController = new AbortController();
-	private updateNotesCountQueue: CollapsedQueue<MiNote['id'], number>;
+	// private updateNotesCountQueue: CollapsedQueue<MiNote['id'], number>;
 
 	constructor(
 		@Inject(DI.config)
@@ -229,7 +229,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
-		this.updateNotesCountQueue = new CollapsedQueue(this.timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
+		//this.updateNotesCountQueue = new CollapsedQueue(this.timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
 
 	@bindThis
@@ -587,7 +587,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (isRemoteUser(user)) {
 				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
 					if (!this.isRenote(note) || this.isQuote(note)) {
-						this.updateNotesCountQueue.enqueue(i.id, 1);
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { additionalNotes: 1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, true);
@@ -1050,6 +1050,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 		return false;
 	}
 
+	// Moved to CollapsedQueueService
+	/*
 	@bindThis
 	private collapseNotesCount(oldValue: number, newValue: number) {
 		return oldValue + newValue;
@@ -1059,11 +1061,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 	private async performUpdateNotesCount(id: MiNote['id'], incrBy: number) {
 		await this.instancesRepository.increment({ id: id }, 'notesCount', incrBy);
 	}
+	*/
 
 	@bindThis
 	public async dispose(): Promise<void> {
 		this.#shutdownController.abort();
-		await this.updateNotesCountQueue.performAllNow();
+		// await this.updateNotesCountQueue.performAllNow();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 54d712c042..2be3361585 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -50,7 +50,6 @@ import { trackTask } from '@/misc/promise-tracker.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { LatestNoteService } from '@/core/LatestNoteService.js';
-import { CollapsedQueue } from '@/misc/collapsed-queue.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
@@ -151,7 +150,6 @@ export type Option = {
 @Injectable()
 export class NoteEditService implements OnApplicationShutdown {
 	#shutdownController = new AbortController();
-	private updateNotesCountQueue: CollapsedQueue<MiNote['id'], number>;
 
 	constructor(
 		@Inject(DI.config)
@@ -226,9 +224,7 @@ export class NoteEditService implements OnApplicationShutdown {
 		private readonly timeService: TimeService,
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly collapsedQueueService: CollapsedQueueService,
-	) {
-		this.updateNotesCountQueue = new CollapsedQueue(this.timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
-	}
+	) {}
 
 	@bindThis
 	public async edit(user: MiUser, editid: MiNote['id'], data: Option, silent = false): Promise<MiNote> {
@@ -620,7 +616,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			if (isRemoteUser(user)) {
 				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
 					if (note.renote && note.text || !note.renote) {
-						this.updateNotesCountQueue.enqueue(i.id, 1);
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { additionalNotes: 1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, true);
@@ -925,20 +921,9 @@ export class NoteEditService implements OnApplicationShutdown {
 
 	// checkHibernation moved to HibernateUsersProcessorService
 
-	@bindThis
-	private collapseNotesCount(oldValue: number, newValue: number) {
-		return oldValue + newValue;
-	}
-
-	@bindThis
-	private async performUpdateNotesCount(id: MiNote['id'], incrBy: number) {
-		await this.instancesRepository.increment({ id: id }, 'notesCount', incrBy);
-	}
-
 	@bindThis
 	public async dispose(): Promise<void> {
 		this.#shutdownController.abort();
-		await this.updateNotesCountQueue.performAllNow();
 	}
 
 	@bindThis

From 81fd01d5fa9e731db4771e60b2f2d5c2bc2e7018 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:24:03 -0400
Subject: [PATCH 036/107] increment/decrement note counts through
 CollapsedQueueService

---
 .../backend/src/core/CollapsedQueueService.ts     |  9 +++++++--
 packages/backend/src/core/NoteCreateService.ts    | 13 +------------
 packages/backend/src/core/NoteDeleteService.ts    | 15 ++-------------
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index fd0ccb0eaf..226f641a2d 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -24,7 +24,8 @@ export type UpdateInstanceJob = {
 };
 
 export type UpdateUserJob = {
-	updatedAt: Date,
+	updatedAt?: Date,
+	additionalNotes?: number,
 };
 
 @Injectable()
@@ -74,8 +75,12 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
 				updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt),
+				additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0),
+			}),
+			(id, job) => this.usersRepository.update({ id }, {
+				updatedAt: job.updatedAt,
+				notesCount: job.additionalNotes ? () => `"notesCount" + ${job.additionalNotes}` : undefined,
 			}),
-			(id, job) => this.usersRepository.update({ id }, { updatedAt: job.updatedAt }),
 			{
 				onError: this.onQueueError,
 				concurrency: 4,
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 8f515de502..ee1f681a76 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -605,7 +605,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		if (!this.isRenote(note) || this.isQuote(note)) {
 			// Increment notes count (user)
-			await this.incNotesCountOfUser(user);
+			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { additionalNotes: 1 });
 		}
 
 		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
@@ -890,17 +890,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		await this.searchService.indexNote(note);
 	}
 
-	@bindThis
-	private async incNotesCountOfUser(user: { id: MiUser['id']; }) {
-		await this.usersRepository.createQueryBuilder().update()
-			.set({
-				updatedAt: this.timeService.date,
-				notesCount: () => '"notesCount" + 1',
-			})
-			.where('id = :id', { id: user.id })
-			.execute();
-	}
-
 	@bindThis
 	private async extractMentionedUsers(user: { host: MiUser['host']; }, tokens: mfm.MfmNode[]): Promise<MiUser[]> {
 		if (tokens == null) return [];
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 4384b29a99..5bab95862d 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -141,14 +141,14 @@ export class NoteDeleteService {
 
 			if (!isPureRenote(note)) {
 				// Decrement notes count (user)
-				promises.push(this.decNotesCountOfUser(user));
+				this.collapsedQueueService.updateUserQueue.enqueue(user.id, { additionalNotes: -1 });
 			}
 
 			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 			for (const cascade of cascadingNotes) {
 				if (!isPureRenote(cascade)) {
-					promises.push(this.decNotesCountOfUser(cascade.user));
+					this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { additionalNotes: -1 });
 				}
 				// Don't mark cascaded user as updated (active)
 			}
@@ -217,17 +217,6 @@ export class NoteDeleteService {
 		});
 	}
 
-	@bindThis
-	private async decNotesCountOfUser(user: { id: MiUser['id']; }) {
-		await this.usersRepository.createQueryBuilder().update()
-			.set({
-				updatedAt: this.timeService.date,
-				notesCount: () => '"notesCount" - 1',
-			})
-			.where('id = :id', { id: user.id })
-			.execute();
-	}
-
 	@bindThis
 	private async findCascadingNotes(note: MiNote): Promise<(MiNote & { user: MiUser })[]> {
 		const cascadingNotes: MiNote[] = [];

From e7ea4a3ba2c5d8a8d239d8d29a1fbaa107a7e50c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:29:49 -0400
Subject: [PATCH 037/107] reduce updateUserQueue interval

---
 packages/backend/src/core/CollapsedQueueService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 226f641a2d..88b33e9960 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -49,6 +49,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		this.logger = loggerService.getLogger('collapsed-queue');
 
 		const fiveMinuteInterval = this.envService.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0;
+		const oneMinuteInterval = this.envService.env.NODE_ENV !== 'test' ? 60 * 1000 : 0;
 
 		this.updateInstanceQueue = new CollapsedQueue(
 			'updateInstance',
@@ -72,7 +73,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		this.updateUserQueue = new CollapsedQueue(
 			'updateUser',
-			fiveMinuteInterval,
+			oneMinuteInterval,
 			(oldJob, newJob) => ({
 				updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt),
 				additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0),

From 2fd44d68c5977f257d6485da4831aa8d75759a29 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:32:11 -0400
Subject: [PATCH 038/107] rename additionalNotes to notesCountDelta

---
 .../backend/src/core/CollapsedQueueService.ts   | 17 +++++++++--------
 packages/backend/src/core/NoteCreateService.ts  |  4 ++--
 packages/backend/src/core/NoteDeleteService.ts  |  4 ++--
 packages/backend/src/core/NoteEditService.ts    |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 88b33e9960..ddcb0003b2 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -14,24 +14,25 @@ import { bindThis } from '@/decorators.js';
 import type { MiInstance } from '@/models/Instance.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { MiUser } from '@/models/User.js';
-import type { UsersRepository } from '@/models/_.js';
+import type { MiNote, UsersRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
 	shouldUnsuspend?: boolean,
-	additionalNotes?: number,
+	notesCountDelta?: number,
 };
 
 export type UpdateUserJob = {
 	updatedAt?: Date,
-	additionalNotes?: number,
+	notesCountDelta?: number,
 };
 
 @Injectable()
 export class CollapsedQueueService implements OnApplicationShutdown {
-	// Moved from InboxProcessorService to allow access from ApInboxService
+	// Moved from InboxProcessorService
 	public readonly updateInstanceQueue: CollapsedQueue<MiInstance['id'], UpdateInstanceJob>;
+	// Moved from NoteCreateService, NoteEditService, and NoteDeleteService
 	public readonly updateUserQueue: CollapsedQueue<MiUser['id'], UpdateUserJob>;
 
 	private readonly logger: Logger;
@@ -57,13 +58,13 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			(oldJob, newJob) => ({
 				latestRequestReceivedAt: maxDate(oldJob.latestRequestReceivedAt, newJob.latestRequestReceivedAt),
 				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
-				additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0),
+				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
 			}),
 			(id, job) => this.federatedInstanceService.update(id, {
 				latestRequestReceivedAt: job.latestRequestReceivedAt,
 				isNotResponding: job.latestRequestReceivedAt ? false : undefined,
 				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
-				notesCount: job.additionalNotes ? () => `"notesCount" + ${job.additionalNotes}` : undefined,
+				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
@@ -76,11 +77,11 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
 				updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt),
-				additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0),
+				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
 			}),
 			(id, job) => this.usersRepository.update({ id }, {
 				updatedAt: job.updatedAt,
-				notesCount: job.additionalNotes ? () => `"notesCount" + ${job.additionalNotes}` : undefined,
+				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index ee1f681a76..e14bb56685 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -587,7 +587,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (isRemoteUser(user)) {
 				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
 					if (!this.isRenote(note) || this.isQuote(note)) {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { additionalNotes: 1 });
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, true);
@@ -605,7 +605,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		if (!this.isRenote(note) || this.isQuote(note)) {
 			// Increment notes count (user)
-			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { additionalNotes: 1 });
+			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: 1 });
 		}
 
 		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 5bab95862d..5198340c4d 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -141,14 +141,14 @@ export class NoteDeleteService {
 
 			if (!isPureRenote(note)) {
 				// Decrement notes count (user)
-				this.collapsedQueueService.updateUserQueue.enqueue(user.id, { additionalNotes: -1 });
+				this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: -1 });
 			}
 
 			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 			for (const cascade of cascadingNotes) {
 				if (!isPureRenote(cascade)) {
-					this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { additionalNotes: -1 });
+					this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { notesCountDelta: -1 });
 				}
 				// Don't mark cascaded user as updated (active)
 			}
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 2be3361585..adff0cbb5b 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -616,7 +616,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			if (isRemoteUser(user)) {
 				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
 					if (note.renote && note.text || !note.renote) {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { additionalNotes: 1 });
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, true);

From d89b292eeef924c0182bcd543c7f3773c63c61cd Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:46:09 -0400
Subject: [PATCH 039/107] implement updateNoteQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 32 +++++++++++++++++--
 .../backend/src/core/NoteCreateService.ts     | 14 +++-----
 .../backend/src/core/NoteDeleteService.ts     | 18 +++++------
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index ddcb0003b2..d7e7d5347f 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js';
 import type { MiInstance } from '@/models/Instance.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { MiUser } from '@/models/User.js';
-import type { MiNote, UsersRepository } from '@/models/_.js';
+import type { MiNote, UsersRepository, NotesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 
 export type UpdateInstanceJob = {
@@ -28,12 +28,18 @@ export type UpdateUserJob = {
 	notesCountDelta?: number,
 };
 
+export type UpdateNoteJob = {
+	deltaRepliesCount?: number;
+	deltaRenoteCount?: number;
+};
+
 @Injectable()
 export class CollapsedQueueService implements OnApplicationShutdown {
 	// Moved from InboxProcessorService
 	public readonly updateInstanceQueue: CollapsedQueue<MiInstance['id'], UpdateInstanceJob>;
 	// Moved from NoteCreateService, NoteEditService, and NoteDeleteService
 	public readonly updateUserQueue: CollapsedQueue<MiUser['id'], UpdateUserJob>;
+	public readonly updateNoteQueue: CollapsedQueue<MiNote['id'], UpdateNoteJob>;
 
 	private readonly logger: Logger;
 
@@ -41,6 +47,9 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		@Inject(DI.usersRepository)
 		public readonly usersRepository: UsersRepository,
 
+		@Inject(DI.notesRepository)
+		public readonly notesRepository: NotesRepository,
+
 		private readonly federatedInstanceService: FederatedInstanceService,
 		private readonly envService: EnvService,
 		private readonly internalEventService: InternalEventService,
@@ -85,7 +94,24 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			}),
 			{
 				onError: this.onQueueError,
-				concurrency: 4,
+				concurrency: 4, // High concurrency - this queue gets a lot of activity
+			},
+		);
+
+		this.updateNoteQueue = new CollapsedQueue(
+			'updateNote',
+			oneMinuteInterval,
+			(oldJob, newJob) => ({
+				deltaRepliesCount: (oldJob.deltaRepliesCount ?? 0) + (newJob.deltaRepliesCount ?? 0),
+				deltaRenoteCount: (oldJob.deltaRenoteCount ?? 0) + (newJob.deltaRenoteCount ?? 0),
+			}),
+			(id, job) => this.notesRepository.update({ id }, {
+				repliesCount: job.deltaRepliesCount ? () => `"repliesCount" + ${job.deltaRepliesCount}` : undefined,
+				renoteCount: job.deltaRenoteCount ? () => `"renoteCount" + ${job.deltaRenoteCount}` : undefined,
+			}),
+			{
+				onError: this.onQueueError,
+				concurrency: 4, // High concurrency - this queue gets a lot of activity
 			},
 		);
 
@@ -99,6 +125,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		await this.performQueue(this.updateInstanceQueue);
 		await this.performQueue(this.updateUserQueue);
+		await this.performQueue(this.updateNoteQueue);
 
 		this.logger.info('Persistence complete.');
 	}
@@ -130,6 +157,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	}
 
 	async onApplicationShutdown() {
+		// TODO note/user delete events
 		this.internalEventService.off('localUserUpdated', this.onUserUpdated);
 		this.internalEventService.off('remoteUserUpdated', this.onUserUpdated);
 
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index e14bb56685..f5486a9b61 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -618,7 +618,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}, user);
 
 		if (data.reply) {
-			await this.saveReply(data.reply, note);
+			this.collapsedQueueService.updateNoteQueue.enqueue(data.reply.id, { deltaRepliesCount: 1 });
 		}
 
 		if (data.reply == null) {
@@ -646,8 +646,10 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 		}
 
+		// TODO move these checks into incRenoteCount
 		if (this.isPureRenote(data) && data.renote.userId !== user.id && !user.isBot) {
-			await this.incRenoteCount(data.renote, user);
+			this.collapsedQueueService.updateNoteQueue.enqueue(data.renote.id, { deltaRenoteCount: 1 });
+			await this.incRenoteCount(data.renote, user)
 		}
 
 		if (data.poll && data.poll.expiresAt) {
@@ -822,10 +824,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 	 */
 	readonly isQuote = isQuote;
 
+	// Note: does not increment the count! used only for featured rankings.
 	@bindThis
 	private async incRenoteCount(renote: MiNote, user: MiUser) {
-		await this.notesRepository.increment({ id: renote.id }, 'renoteCount', 1);
-
 		// 30%の確率、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (user.isExplorable && Math.random() < 0.3 && (this.timeService.now - this.idService.parse(renote.id).date.getTime()) < 1000 * 60 * 60 * 24 * 3) {
 			const policies = await this.roleService.getUserPolicies(user);
@@ -878,11 +879,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 	}
 
-	@bindThis
-	private async saveReply(reply: MiNote, note: MiNote) {
-		await this.notesRepository.increment({ id: reply.id }, 'repliesCount', 1);
-	}
-
 	@bindThis
 	private async index(note: MiNote) {
 		if (note.text == null && note.cw == null) return;
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 5198340c4d..f340065d55 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -78,19 +78,17 @@ export class NoteDeleteService {
 		const cascadingNotes = await this.findCascadingNotes(note);
 
 		if (note.replyId) {
-			promises.push(this.notesRepository.decrement({ id: note.replyId }, 'repliesCount', 1));
+			this.collapsedQueueService.updateNoteQueue.enqueue(note.replyId, { deltaRepliesCount: -1 });
 		} else if (isPureRenote(note)) {
-			promises.push(this.notesRepository.decrement({ id: note.renoteId }, 'renoteCount', 1));
+			this.collapsedQueueService.updateNoteQueue.enqueue(note.renoteId, { deltaRenoteCount: -1 });
 		}
 
-		const cascadeReplies = cascadingNotes.filter(cascade => cascade.replyId != null);
-		const cascadeRenotes = cascadingNotes.filter(cascade => cascade.renoteId != null);
-
-		if (cascadeReplies.length > 0) {
-			promises.push(this.notesRepository.decrement({ id: In(cascadeReplies.map(cascade => cascade.replyId)) }, 'repliesCount', 1));
-		}
-		if (cascadeRenotes.length > 0) {
-			promises.push(this.notesRepository.decrement({ id: In(cascadeRenotes.map(cascade => cascade.renoteId)) }, 'renoteCount', 1));
+		for (const cascade of cascadingNotes) {
+			if (cascade.replyId) {
+				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.replyId, { deltaRepliesCount: -1 });
+			} else if (isPureRenote(cascade)) {
+				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.renoteId, { deltaRenoteCount: -1 });
+			}
 		}
 
 		if (!quiet) {

From c52f852db1d123be34aa42f5d79ef24a315b9d36 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:47:39 -0400
Subject: [PATCH 040/107] use updateInstanceQueue in NoteDeleteService

---
 packages/backend/src/core/NoteDeleteService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index f340065d55..56ad88a1f5 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -155,7 +155,7 @@ export class NoteDeleteService {
 				if (isRemoteUser(user)) {
 					if (!isPureRenote(note)) {
 						const i = await this.federatedInstanceService.fetchOrRegister(user.host);
-						promises.push(this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1));
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(user.host, note, false);
@@ -166,7 +166,7 @@ export class NoteDeleteService {
 					if (this.userEntityService.isRemoteUser(cascade.user)) {
 						if (!isPureRenote(cascade)) {
 							const i = await this.federatedInstanceService.fetchOrRegister(cascade.user.host);
-							promises.push(this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1));
+							this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
 						}
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateNote(cascade.user.host, cascade, false);

From ad063c86376e8fc2504dec9f636c9b1ec053fcab Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:51:43 -0400
Subject: [PATCH 041/107] rename deltaRepliesCount and deltaRenoteCount to
 match the other deltas

---
 packages/backend/src/core/CollapsedQueueService.ts | 12 ++++++------
 packages/backend/src/core/NoteCreateService.ts     |  4 ++--
 packages/backend/src/core/NoteDeleteService.ts     |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index d7e7d5347f..1c4e47ffce 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -29,8 +29,8 @@ export type UpdateUserJob = {
 };
 
 export type UpdateNoteJob = {
-	deltaRepliesCount?: number;
-	deltaRenoteCount?: number;
+	repliesCountDelta?: number;
+	renoteCountDelta?: number;
 };
 
 @Injectable()
@@ -102,12 +102,12 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			'updateNote',
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
-				deltaRepliesCount: (oldJob.deltaRepliesCount ?? 0) + (newJob.deltaRepliesCount ?? 0),
-				deltaRenoteCount: (oldJob.deltaRenoteCount ?? 0) + (newJob.deltaRenoteCount ?? 0),
+				repliesCountDelta: (oldJob.repliesCountDelta ?? 0) + (newJob.repliesCountDelta ?? 0),
+				renoteCountDelta: (oldJob.renoteCountDelta ?? 0) + (newJob.renoteCountDelta ?? 0),
 			}),
 			(id, job) => this.notesRepository.update({ id }, {
-				repliesCount: job.deltaRepliesCount ? () => `"repliesCount" + ${job.deltaRepliesCount}` : undefined,
-				renoteCount: job.deltaRenoteCount ? () => `"renoteCount" + ${job.deltaRenoteCount}` : undefined,
+				repliesCount: job.repliesCountDelta ? () => `"repliesCount" + ${job.repliesCountDelta}` : undefined,
+				renoteCount: job.renoteCountDelta ? () => `"renoteCount" + ${job.renoteCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index f5486a9b61..3fee54a308 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -618,7 +618,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}, user);
 
 		if (data.reply) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(data.reply.id, { deltaRepliesCount: 1 });
+			this.collapsedQueueService.updateNoteQueue.enqueue(data.reply.id, { repliesCountDelta: 1 });
 		}
 
 		if (data.reply == null) {
@@ -648,7 +648,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		// TODO move these checks into incRenoteCount
 		if (this.isPureRenote(data) && data.renote.userId !== user.id && !user.isBot) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(data.renote.id, { deltaRenoteCount: 1 });
+			this.collapsedQueueService.updateNoteQueue.enqueue(data.renote.id, { renoteCountDelta: 1 });
 			await this.incRenoteCount(data.renote, user)
 		}
 
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 56ad88a1f5..8f8308679e 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -78,16 +78,16 @@ export class NoteDeleteService {
 		const cascadingNotes = await this.findCascadingNotes(note);
 
 		if (note.replyId) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(note.replyId, { deltaRepliesCount: -1 });
+			this.collapsedQueueService.updateNoteQueue.enqueue(note.replyId, { repliesCountDelta: -1 });
 		} else if (isPureRenote(note)) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(note.renoteId, { deltaRenoteCount: -1 });
+			this.collapsedQueueService.updateNoteQueue.enqueue(note.renoteId, { renoteCountDelta: -1 });
 		}
 
 		for (const cascade of cascadingNotes) {
 			if (cascade.replyId) {
-				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.replyId, { deltaRepliesCount: -1 });
+				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.replyId, { repliesCountDelta: -1 });
 			} else if (isPureRenote(cascade)) {
-				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.renoteId, { deltaRenoteCount: -1 });
+				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.renoteId, { renoteCountDelta: -1 });
 			}
 		}
 

From 101f8f6df5b0eb8a762251dd5eb36d4bdec1a4b3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:52:25 -0400
Subject: [PATCH 042/107] implement usersCountDelta in updateInstanceQueue

---
 packages/backend/src/core/CollapsedQueueService.ts            | 3 +++
 .../backend/src/core/activitypub/models/ApPersonService.ts    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 1c4e47ffce..d701788383 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -21,6 +21,7 @@ export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
 	shouldUnsuspend?: boolean,
 	notesCountDelta?: number,
+	usersCountDelta?: number,
 };
 
 export type UpdateUserJob = {
@@ -68,12 +69,14 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				latestRequestReceivedAt: maxDate(oldJob.latestRequestReceivedAt, newJob.latestRequestReceivedAt),
 				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
 				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
+				usersCountDelta: (oldJob.usersCountDelta ?? 0) + (newJob.usersCountDelta ?? 0),
 			}),
 			(id, job) => this.federatedInstanceService.update(id, {
 				latestRequestReceivedAt: job.latestRequestReceivedAt,
 				isNotResponding: job.latestRequestReceivedAt ? false : undefined,
 				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
 				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
+				usersCount: job.usersCountDelta ? () => `"usersCount" + ${job.usersCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index a8cfdfe682..e3442f76d1 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -47,6 +47,7 @@ import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { getApId, getApType, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import { extractApHashtags } from './tag.js';
@@ -123,6 +124,7 @@ export class ApPersonService implements OnModuleInit {
 		private readonly idService: IdService,
 		private readonly timeService: TimeService,
 		private readonly queueService: QueueService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 
 		apLoggerService: ApLoggerService,
 	) {
@@ -576,7 +578,7 @@ export class ApPersonService implements OnModuleInit {
 		// Register host
 		if (this.meta.enableStatsForFederatedInstances) {
 			this.federatedInstanceService.fetchOrRegister(host).then(i => {
-				this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
+				this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { usersCountDelta: 1 });
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.newUser(i.host);
 				}

From dceb6dffc9683439571fce5ae17de8ad5cf83b11 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 13:55:09 -0400
Subject: [PATCH 043/107] implement clippedCountDelta in updateNoteQueue

---
 packages/backend/src/core/ClipService.ts           | 6 ++++--
 packages/backend/src/core/CollapsedQueueService.ts | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/ClipService.ts b/packages/backend/src/core/ClipService.ts
index 35b962cc04..575440abd6 100644
--- a/packages/backend/src/core/ClipService.ts
+++ b/packages/backend/src/core/ClipService.ts
@@ -11,6 +11,7 @@ import { bindThis } from '@/decorators.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
 import { RoleService } from '@/core/RoleService.js';
 import { IdService } from '@/core/IdService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import type { MiLocalUser } from '@/models/User.js';
 import { TimeService } from '@/global/TimeService.js';
 
@@ -35,6 +36,7 @@ export class ClipService {
 		private roleService: RoleService,
 		private idService: IdService,
 		private readonly timeService: TimeService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
 	}
 
@@ -130,7 +132,7 @@ export class ClipService {
 			lastClippedAt: this.timeService.date,
 		});
 
-		this.notesRepository.increment({ id: noteId }, 'clippedCount', 1);
+		this.collapsedQueueService.updateNoteQueue.enqueue(noteId, { clippedCountDelta: 1 });
 	}
 
 	@bindThis
@@ -155,6 +157,6 @@ export class ClipService {
 			clipId: clip.id,
 		});
 
-		this.notesRepository.decrement({ id: noteId }, 'clippedCount', 1);
+		this.collapsedQueueService.updateNoteQueue.enqueue(noteId, { clippedCountDelta: -1 });
 	}
 }
diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index d701788383..0cc4ba6e0c 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -32,6 +32,7 @@ export type UpdateUserJob = {
 export type UpdateNoteJob = {
 	repliesCountDelta?: number;
 	renoteCountDelta?: number;
+	clippedCountDelta?: number;
 };
 
 @Injectable()
@@ -107,10 +108,12 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			(oldJob, newJob) => ({
 				repliesCountDelta: (oldJob.repliesCountDelta ?? 0) + (newJob.repliesCountDelta ?? 0),
 				renoteCountDelta: (oldJob.renoteCountDelta ?? 0) + (newJob.renoteCountDelta ?? 0),
+				clippedCountDelta: (oldJob.clippedCountDelta ?? 0) + (newJob.clippedCountDelta ?? 0),
 			}),
 			(id, job) => this.notesRepository.update({ id }, {
 				repliesCount: job.repliesCountDelta ? () => `"repliesCount" + ${job.repliesCountDelta}` : undefined,
 				renoteCount: job.renoteCountDelta ? () => `"renoteCount" + ${job.renoteCountDelta}` : undefined,
+				clippedCount: job.clippedCountDelta ? () => `"clippedCount" + ${job.clippedCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,

From c2aa46618de3642cdfe0a1a08606817dbe86e7d0 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 14:02:21 -0400
Subject: [PATCH 044/107] implement followingCountDelta and followersCountDelta
 in updateNoteQueue

---
 packages/backend/src/core/CollapsedQueueService.ts |  6 ++++++
 packages/backend/src/core/UserFollowingService.ts  | 12 +++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 0cc4ba6e0c..9af084b55d 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -22,6 +22,8 @@ export type UpdateInstanceJob = {
 	shouldUnsuspend?: boolean,
 	notesCountDelta?: number,
 	usersCountDelta?: number,
+	followingCountDelta?: number,
+	followersCountDelta?: number,
 };
 
 export type UpdateUserJob = {
@@ -71,6 +73,8 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
 				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
 				usersCountDelta: (oldJob.usersCountDelta ?? 0) + (newJob.usersCountDelta ?? 0),
+				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),
+				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
 			(id, job) => this.federatedInstanceService.update(id, {
 				latestRequestReceivedAt: job.latestRequestReceivedAt,
@@ -78,6 +82,8 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
 				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
 				usersCount: job.usersCountDelta ? () => `"usersCount" + ${job.usersCountDelta}` : undefined,
+				followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
+				followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 1d3eada189..49c3539c1f 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -30,8 +30,9 @@ import { UtilityService } from '@/core/UtilityService.js';
 import type { ThinUser } from '@/queue/types.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { InternalEventService } from '@/global/InternalEventService.js';
-import type Logger from '../logger.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
+import type Logger from '../logger.js';
 
 type Local = MiLocalUser | {
 	id: MiLocalUser['id'];
@@ -89,6 +90,7 @@ export class UserFollowingService implements OnModuleInit {
 		private perUserFollowingChart: PerUserFollowingChart,
 		private instanceChart: InstanceChart,
 		private readonly internalEventService: InternalEventService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 
 		loggerService: LoggerService,
 	) {
@@ -296,14 +298,14 @@ export class UserFollowingService implements OnModuleInit {
 			if (this.meta.enableStatsForFederatedInstances) {
 				if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
-						this.instancesRepository.increment({ id: i.id }, 'followingCount', 1);
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followingCountDelta: 1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowing(i.host, true);
 						}
 					});
 				} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
-						this.instancesRepository.increment({ id: i.id }, 'followersCount', 1);
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followersCountDelta: 1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowers(i.host, true);
 						}
@@ -408,14 +410,14 @@ export class UserFollowingService implements OnModuleInit {
 			if (this.meta.enableStatsForFederatedInstances) {
 				if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
-						this.instancesRepository.decrement({ id: i.id }, 'followingCount', 1);
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followingCountDelta: -1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowing(i.host, false);
 						}
 					});
 				} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
-						this.instancesRepository.decrement({ id: i.id }, 'followersCount', 1);
+						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followersCountDelta: -1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowers(i.host, false);
 						}

From 1d44a27505c8852b5ecaeaa13a90a25535b6ce36 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 14:05:40 -0400
Subject: [PATCH 045/107] implement followingCountDelta and followersCountDelta
 in updateUserQueue

---
 packages/backend/src/core/CollapsedQueueService.ts |  7 +++++++
 packages/backend/src/core/UserFollowingService.ts  | 12 ++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 9af084b55d..22a56a2346 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -29,6 +29,8 @@ export type UpdateInstanceJob = {
 export type UpdateUserJob = {
 	updatedAt?: Date,
 	notesCountDelta?: number,
+	followingCountDelta?: number,
+	followersCountDelta?: number,
 };
 
 export type UpdateNoteJob = {
@@ -97,10 +99,14 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			(oldJob, newJob) => ({
 				updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt),
 				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
+				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),
+				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
 			(id, job) => this.usersRepository.update({ id }, {
 				updatedAt: job.updatedAt,
 				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
+				followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
+				followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
 			}),
 			{
 				onError: this.onQueueError,
@@ -170,6 +176,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 	async onApplicationShutdown() {
 		// TODO note/user delete events
+		// TODO remove updated events
 		this.internalEventService.off('localUserUpdated', this.onUserUpdated);
 		this.internalEventService.off('remoteUserUpdated', this.onUserUpdated);
 
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 49c3539c1f..9a58d2d1fe 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -288,10 +288,8 @@ export class UserFollowingService implements OnModuleInit {
 		// Neither followee nor follower has moved.
 		if (!followeeUser.movedToUri && !followerUser.movedToUri) {
 			//#region Increment counts
-			await Promise.all([
-				this.usersRepository.increment({ id: follower.id }, 'followingCount', 1),
-				this.usersRepository.increment({ id: followee.id }, 'followersCount', 1),
-			]);
+			this.collapsedQueueService.updateUserQueue.enqueue(follower.id, { followingCountDelta: 1 });
+			this.collapsedQueueService.updateUserQueue.enqueue(followee.id, { followersCountDelta: 1 });
 			//#endregion
 
 			//#region Update instance stats
@@ -400,10 +398,8 @@ export class UserFollowingService implements OnModuleInit {
 		// Neither followee nor follower has moved.
 		if (!follower.movedToUri && !followee.movedToUri) {
 			//#region Decrement following / followers counts
-			await Promise.all([
-				this.usersRepository.decrement({ id: follower.id }, 'followingCount', 1),
-				this.usersRepository.decrement({ id: followee.id }, 'followersCount', 1),
-			]);
+			this.collapsedQueueService.updateUserQueue.enqueue(follower.id, { followingCountDelta: -1 });
+			this.collapsedQueueService.updateUserQueue.enqueue(followee.id, { followersCountDelta: -1 });
 			//#endregion
 
 			//#region Update instance stats

From f01d51981b97646dd6175268738a6cc0fb30ddf5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 14:06:18 -0400
Subject: [PATCH 046/107] remove onUserUpdated listener from
 CollapsedQueueService

---
 packages/backend/src/core/CollapsedQueueService.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 22a56a2346..9c01f434a2 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -132,9 +132,6 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				concurrency: 4, // High concurrency - this queue gets a lot of activity
 			},
 		);
-
-		this.internalEventService.on('localUserUpdated', this.onUserUpdated);
-		this.internalEventService.on('remoteUserUpdated', this.onUserUpdated);
 	}
 
 	@bindThis
@@ -169,16 +166,8 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		this.logger.error(`Error persisting ${queue.name}: ${renderInlineError(error)}`);
 	}
 
-	@bindThis
-	private onUserUpdated(data: { id: string }) {
-		this.updateUserQueue.enqueue(data.id, { updatedAt: new Date() });
-	}
-
 	async onApplicationShutdown() {
 		// TODO note/user delete events
-		// TODO remove updated events
-		this.internalEventService.off('localUserUpdated', this.onUserUpdated);
-		this.internalEventService.off('remoteUserUpdated', this.onUserUpdated);
 
 		await this.performAllNow();
 	}

From f06bbad94b857332a6f82faaa0587c039583f064 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 14:09:48 -0400
Subject: [PATCH 047/107] implement CollapsedQueue.delete

---
 packages/backend/src/misc/collapsed-queue.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index a2b1166faf..63779100c8 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -47,6 +47,14 @@ export class CollapsedQueue<K, V> {
 		}
 	}
 
+	delete(key: K) {
+		const job = this.jobs.get(key);
+		if (job) {
+			clearTimeout(job.timer);
+			this.jobs.delete(key);
+		}
+	}
+
 	async performAllNow() {
 		const entries = [...this.jobs.entries()];
 		this.jobs.clear();

From 473b3993c45c5bafb8bd10b3df6a681a2c0fb0d7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 14:10:12 -0400
Subject: [PATCH 048/107] remove queued user updated when deleted

---
 .../backend/src/core/CollapsedQueueService.ts    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 9c01f434a2..4b619320e3 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -132,6 +132,8 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				concurrency: 4, // High concurrency - this queue gets a lot of activity
 			},
 		);
+
+		this.internalEventService.on('userChangeDeletedState', this.onUserDeleted);
 	}
 
 	@bindThis
@@ -166,18 +168,20 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		this.logger.error(`Error persisting ${queue.name}: ${renderInlineError(error)}`);
 	}
 
+	@bindThis
+	private onUserDeleted(data: { id: string, isDeleted: boolean }) {
+		if (data.isDeleted) {
+			this.updateUserQueue.delete(data.id);
+		}
+	}
+
 	async onApplicationShutdown() {
-		// TODO note/user delete events
+		this.internalEventService.off('userChangeDeletedState', this.onUserDeleted);
 
 		await this.performAllNow();
 	}
 }
 
-function maxDate(first: Date, second: Date | undefined): Date;
-function maxDate(first: Date | undefined, second: Date): Date;
-function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined;
-// eslint requires a space here -_-
-
 function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined {
 	if (first && second) {
 		if (first.getTime() > second.getTime()) {

From 15e88d31ad985dfa7fc79e9295b5be6c1d318a47 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 16:39:27 -0400
Subject: [PATCH 049/107] fix incorrect counts for self-renotes and renotes by
 bots

---
 packages/backend/src/core/NoteCreateService.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 3fee54a308..2c7c8add66 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -646,10 +646,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 		}
 
-		// TODO move these checks into incRenoteCount
-		if (this.isPureRenote(data) && data.renote.userId !== user.id && !user.isBot) {
+		if (this.isPureRenote(data)) {
 			this.collapsedQueueService.updateNoteQueue.enqueue(data.renote.id, { renoteCountDelta: 1 });
-			await this.incRenoteCount(data.renote, user)
+			await this.incRenoteCount(data.renote, user);
 		}
 
 		if (data.poll && data.poll.expiresAt) {
@@ -827,6 +826,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 	// Note: does not increment the count! used only for featured rankings.
 	@bindThis
 	private async incRenoteCount(renote: MiNote, user: MiUser) {
+		// Moved down from the containing block
+		if (renote.userId === user.id || user.isBot) return;
+
 		// 30%の確率、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (user.isExplorable && Math.random() < 0.3 && (this.timeService.now - this.idService.parse(renote.id).date.getTime()) < 1000 * 60 * 60 * 24 * 3) {
 			const policies = await this.roleService.getUserPolicies(user);

From fceb0d0d503c300f59d08d76bb4fc24c08f6438a Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 18:51:51 -0400
Subject: [PATCH 050/107] use CollapsedQueueService in processPostDeliver

---
 .../backend/src/core/CollapsedQueueService.ts | 53 +++++++++++++++----
 .../BackgroundTaskProcessorService.ts         | 12 ++---
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 4b619320e3..a5781d815a 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -19,7 +19,10 @@ import { DI } from '@/di-symbols.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
+	notRespondingSince?: Date | null,
 	shouldUnsuspend?: boolean,
+	shouldSuspendGone?: boolean,
+	shouldSuspendNotResponding?: boolean,
 	notesCountDelta?: number,
 	usersCountDelta?: number,
 	followingCountDelta?: number,
@@ -72,6 +75,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
 				latestRequestReceivedAt: maxDate(oldJob.latestRequestReceivedAt, newJob.latestRequestReceivedAt),
+				notRespondingSince: maxDate(oldJob.notRespondingSince, newJob.notRespondingSince),
 				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
 				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
 				usersCountDelta: (oldJob.usersCountDelta ?? 0) + (newJob.usersCountDelta ?? 0),
@@ -79,9 +83,31 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
 			(id, job) => this.federatedInstanceService.update(id, {
+				// Direct update if defined
 				latestRequestReceivedAt: job.latestRequestReceivedAt,
-				isNotResponding: job.latestRequestReceivedAt ? false : undefined,
-				suspensionState: job.shouldUnsuspend ? 'none' : undefined,
+
+				// null (responding) > Date (not responding)
+				notRespondingSince: job.latestRequestReceivedAt
+					? null
+					: job.notRespondingSince,
+
+				// false (responding) > true (not responding)
+				isNotResponding: job.latestRequestReceivedAt
+					? false
+					: job.notRespondingSince
+						? true
+						: undefined,
+
+				// gone > none > auto
+				suspensionState: job.shouldSuspendGone
+					? 'goneSuspended'
+					: job.shouldUnsuspend
+						? 'none'
+						: job.shouldSuspendNotResponding
+							? 'autoSuspendedForNotResponding'
+							: undefined,
+
+				// Increment if defined
 				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
 				usersCount: job.usersCountDelta ? () => `"usersCount" + ${job.usersCountDelta}` : undefined,
 				followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
@@ -182,18 +208,27 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	}
 }
 
-function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined {
-	if (first && second) {
-		if (first.getTime() > second.getTime()) {
-			return first;
+function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined;
+function maxDate(first: Date | null | undefined, second: Date | null | undefined): Date | null | undefined;
+
+function maxDate(first: Date | null | undefined, second: Date | null | undefined): Date | null | undefined {
+	if (first !== undefined && second !== undefined) {
+		if (first != null && second != null) {
+			if (first.getTime() > second.getTime()) {
+				return first;
+			} else {
+				return second;
+			}
 		} else {
-			return second;
+			// Null is considered infinitely in the future, and is therefore newer than any date.
+			return null;
 		}
-	} else if (first) {
+	} else if (first !== undefined) {
 		return first;
-	} else if (second) {
+	} else if (second !== undefined) {
 		return second;
 	} else {
+		// Undefined in considered infinitely in the past, and is therefore older than any date.
 		return undefined;
 	}
 }
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 4863b815d7..bacfed3473 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -169,7 +169,7 @@ export class BackgroundTaskProcessorService {
 	}
 
 	private async processPostDeliver(task: PostDeliverBackgroundTask): Promise<string> {
-		let instance = await this.federatedInstanceService.fetchOrRegister(task.host);
+		const instance = await this.federatedInstanceService.fetchOrRegister(task.host);
 		if (instance.isBlocked) return `Skipping post-deliver task: instance ${task.host} is blocked`;
 
 		const success = task.result === 'success';
@@ -188,14 +188,10 @@ export class BackgroundTaskProcessorService {
 
 		// This is messy, but we need to minimize updates to space in Postgres blocks.
 		if (updateNotResponding || updateGoneSuspended || updateAutoSuspended) {
-			instance = await this.federatedInstanceService.update(instance.id, {
-				isNotResponding: updateNotResponding ? !success : undefined,
+			this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
 				notRespondingSince: updateNotResponding ? (success ? null : new Date()) : undefined,
-				suspensionState: updateGoneSuspended
-					? 'goneSuspended'
-					: updateAutoSuspended
-						? 'autoSuspendedForNotResponding'
-						: undefined,
+				shouldSuspendGone: updateGoneSuspended || undefined,
+				shouldSuspendNotResponding: updateAutoSuspended || undefined,
 			});
 		}
 

From e52ff9208eaa197bc0e5cd686ae8058470223505 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 19:06:06 -0400
Subject: [PATCH 051/107] add onPerform callback to collapsedQueue

---
 packages/backend/src/misc/collapsed-queue.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 63779100c8..af1657cc63 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -23,7 +23,8 @@ export class CollapsedQueue<K, V> {
 		private readonly collapse: (oldValue: V, newValue: V) => V,
 		private readonly perform: (key: K, value: V) => Promise<void | unknown>,
 		private readonly opts?: {
-			onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void,
+			onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void | Promise<void>,
+			onPerform?: (queue: CollapsedQueue<K, V>, key: K, value: V) => void | Promise<void>,
 			concurrency?: number,
 		},
 	) {
@@ -73,8 +74,9 @@ export class CollapsedQueue<K, V> {
 			} else {
 				await this.perform(key, value);
 			}
+			await this.opts?.onPerform?.(this, key, value);
 		} catch (err) {
-			this.opts?.onError?.(this, err);
+			await this.opts?.onError?.(this, err);
 			throw err;
 		}
 	}

From f9e5b05408b96b1ecf94f7e1412d892723830f00 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 19:06:31 -0400
Subject: [PATCH 052/107] synchronize caches after performing updateUserQueue

---
 packages/backend/src/core/CollapsedQueueService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index a5781d815a..1cbc4102e0 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -136,6 +136,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			}),
 			{
 				onError: this.onQueueError,
+				onPerform: (_, id) => this.internalEventService.emit('userUpdated', { id }),
 				concurrency: 4, // High concurrency - this queue gets a lot of activity
 			},
 		);

From be2baf739ed72f1b2ea7663a56dfb7a1b8389ba1 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 19:31:54 -0400
Subject: [PATCH 053/107] implement updateAccessTokenQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 28 ++++++++++++++++++-
 .../src/server/api/AuthenticateService.ts     |  4 ++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 1cbc4102e0..0082c55d0d 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js';
 import type { MiInstance } from '@/models/Instance.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { MiUser } from '@/models/User.js';
-import type { MiNote, UsersRepository, NotesRepository } from '@/models/_.js';
+import type { MiNote, UsersRepository, NotesRepository, MiAccessToken, AccessTokensRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 
 export type UpdateInstanceJob = {
@@ -42,6 +42,10 @@ export type UpdateNoteJob = {
 	clippedCountDelta?: number;
 };
 
+export type UpdateAccessTokenJob = {
+	lastUsedAt: Date;
+};
+
 @Injectable()
 export class CollapsedQueueService implements OnApplicationShutdown {
 	// Moved from InboxProcessorService
@@ -49,6 +53,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	// Moved from NoteCreateService, NoteEditService, and NoteDeleteService
 	public readonly updateUserQueue: CollapsedQueue<MiUser['id'], UpdateUserJob>;
 	public readonly updateNoteQueue: CollapsedQueue<MiNote['id'], UpdateNoteJob>;
+	public readonly updateAccessTokenQueue: CollapsedQueue<MiAccessToken['id'], UpdateAccessTokenJob>;
 
 	private readonly logger: Logger;
 
@@ -59,6 +64,9 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		@Inject(DI.notesRepository)
 		public readonly notesRepository: NotesRepository,
 
+		@Inject(DI.accessTokensRepository)
+		public readonly accessTokensRepository: AccessTokensRepository,
+
 		private readonly federatedInstanceService: FederatedInstanceService,
 		private readonly envService: EnvService,
 		private readonly internalEventService: InternalEventService,
@@ -160,6 +168,21 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			},
 		);
 
+		this.updateAccessTokenQueue = new CollapsedQueue(
+			'updateAccessToken',
+			fiveMinuteInterval,
+			(oldJob, newJob) => ({
+				lastUsedAt: maxDate(oldJob.lastUsedAt, newJob.lastUsedAt),
+			}),
+			(id, job) => this.accessTokensRepository.update({ id }, {
+				lastUsedAt: job.lastUsedAt,
+			}),
+			{
+				onError: this.onQueueError,
+				concurrency: 2,
+			},
+		);
+
 		this.internalEventService.on('userChangeDeletedState', this.onUserDeleted);
 	}
 
@@ -170,6 +193,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		await this.performQueue(this.updateInstanceQueue);
 		await this.performQueue(this.updateUserQueue);
 		await this.performQueue(this.updateNoteQueue);
+		await this.performQueue(this.updateAccessTokenQueue);
 
 		this.logger.info('Persistence complete.');
 	}
@@ -209,6 +233,8 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	}
 }
 
+function maxDate(first: Date | undefined, second: Date): Date;
+function maxDate(first: Date, second: Date | undefined): Date;
 function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined;
 function maxDate(first: Date | null | undefined, second: Date | null | undefined): Date | null | undefined;
 
diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts
index 2c5615c084..3f95c4b6c1 100644
--- a/packages/backend/src/server/api/AuthenticateService.ts
+++ b/packages/backend/src/server/api/AuthenticateService.ts
@@ -16,6 +16,7 @@ import { bindThis } from '@/decorators.js';
 import { attachCallerId } from '@/misc/attach-caller-id.js';
 import { CacheManagementService, type ManagedMemoryKVCache } from '@/global/CacheManagementService.js';
 import { TimeService } from '@/global/TimeService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 
 export class AuthenticationError extends Error {
 	// Fix the error name in stack traces - https://stackoverflow.com/a/71573071
@@ -43,6 +44,7 @@ export class AuthenticateService {
 
 		private cacheService: CacheService,
 		private readonly timeService: TimeService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 
 		cacheManagementService: CacheManagementService,
 	) {
@@ -79,7 +81,7 @@ export class AuthenticateService {
 				throw new AuthenticationError('invalid signature');
 			}
 
-			this.accessTokensRepository.update(accessToken.id, {
+			this.collapsedQueueService.updateAccessTokenQueue.enqueue(accessToken.id, {
 				lastUsedAt: this.timeService.date,
 			});
 

From 1cb21b0911ab54c1d553901f15d0e6f5f3824e21 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 20:15:48 -0400
Subject: [PATCH 054/107] implement updateAntennaQueue

---
 packages/backend/src/core/AntennaService.ts   | 51 +++++++-------
 .../backend/src/core/CollapsedQueueService.ts | 66 ++++++++++++++++---
 packages/backend/src/misc/collapsed-queue.ts  |  2 -
 .../queue/processors/CleanProcessorService.ts |  3 +
 .../server/api/endpoints/antennas/notes.ts    |  9 ++-
 5 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index cc4b7dd719..8404da2a08 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -18,13 +18,15 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
 import type { MiAntenna } from '@/models/Antenna.js';
 import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
+import { InternalEventService } from '@/core/InternalEventService.js';
 import { CacheService } from './CacheService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
 export class AntennaService implements OnApplicationShutdown {
+	// TODO implement QuantumSingleCache then replace this
 	private antennasFetched: boolean;
-	private antennas: MiAntenna[];
+	private antennas: Map<string, MiAntenna>;
 
 	constructor(
 		@Inject(DI.redisForTimelines)
@@ -43,9 +45,10 @@ export class AntennaService implements OnApplicationShutdown {
 		private utilityService: UtilityService,
 		private globalEventService: GlobalEventService,
 		private fanoutTimelineService: FanoutTimelineService,
+		private readonly internalEventService: InternalEventService,
 	) {
 		this.antennasFetched = false;
-		this.antennas = [];
+		this.antennas = new Map();
 
 		this.redisForSub.on('message', this.onRedisMessage);
 	}
@@ -58,35 +61,16 @@ export class AntennaService implements OnApplicationShutdown {
 			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
 			switch (type) {
 				case 'antennaCreated':
-					this.antennas.push({ // TODO: このあたりのデシリアライズ処理は各modelファイル内に関数としてexportしたい
+				case 'antennaUpdated':
+					this.antennas.set(body.id, { // TODO: このあたりのデシリアライズ処理は各modelファイル内に関数としてexportしたい
 						...body,
 						lastUsedAt: new Date(body.lastUsedAt),
 						user: null, // joinなカラムは通常取ってこないので
 						userList: null, // joinなカラムは通常取ってこないので
 					});
 					break;
-				case 'antennaUpdated': {
-					const idx = this.antennas.findIndex(a => a.id === body.id);
-					if (idx >= 0) {
-						this.antennas[idx] = { // TODO: このあたりのデシリアライズ処理は各modelファイル内に関数としてexportしたい
-							...body,
-							lastUsedAt: new Date(body.lastUsedAt),
-							user: null, // joinなカラムは通常取ってこないので
-							userList: null, // joinなカラムは通常取ってこないので
-						};
-					} else {
-						// サーバ起動時にactiveじゃなかった場合、リストに持っていないので追加する必要あり
-						this.antennas.push({ // TODO: このあたりのデシリアライズ処理は各modelファイル内に関数としてexportしたい
-							...body,
-							lastUsedAt: new Date(body.lastUsedAt),
-							user: null, // joinなカラムは通常取ってこないので
-							userList: null, // joinなカラムは通常取ってこないので
-						});
-					}
-				}
-					break;
 				case 'antennaDeleted':
-					this.antennas = this.antennas.filter(a => a.id !== body.id);
+					this.antennas.delete(body.id);
 					break;
 				default:
 					break;
@@ -94,6 +78,20 @@ export class AntennaService implements OnApplicationShutdown {
 		}
 	}
 
+	@bindThis
+	public async updateAntenna(id: string, data: Partial<MiAntenna>) {
+		await this.antennasRepository.update({ id }, data);
+
+		const antenna = this.antennas.get(id) ?? await this.antennasRepository.findOneBy({ id });
+		if (antenna) {
+			// This will be handled above to save result
+			await this.internalEventService.emit('antennaUpdated', {
+				...antenna,
+				...data,
+			});
+		}
+	}
+
 	@bindThis
 	public async addNoteToAntennas(note: MiNote, noteUser: { id: MiUser['id']; username: string; host: string | null; isBot: boolean; }): Promise<void> {
 		const antennas = await this.getAntennas();
@@ -212,13 +210,14 @@ export class AntennaService implements OnApplicationShutdown {
 	@bindThis
 	public async getAntennas() {
 		if (!this.antennasFetched) {
-			this.antennas = await this.antennasRepository.findBy({
+			const allAntennas = await this.antennasRepository.findBy({
 				isActive: true,
 			});
+			this.antennas = new Map(allAntennas.map(a => [a.id, a]));
 			this.antennasFetched = true;
 		}
 
-		return this.antennas;
+		return Array.from(this.antennas.values());
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 0082c55d0d..1a1def3291 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -14,8 +14,9 @@ import { bindThis } from '@/decorators.js';
 import type { MiInstance } from '@/models/Instance.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { MiUser } from '@/models/User.js';
-import type { MiNote, UsersRepository, NotesRepository, MiAccessToken, AccessTokensRepository } from '@/models/_.js';
+import type { MiNote, UsersRepository, NotesRepository, MiAccessToken, AccessTokensRepository, MiAntenna, AntennasRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
+import { AntennaService } from '@/core/AntennaService.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
@@ -46,14 +47,30 @@ export type UpdateAccessTokenJob = {
 	lastUsedAt: Date;
 };
 
+export type UpdateAntennaJob = {
+	isActive: boolean,
+	lastUsedAt?: Date,
+};
+
+// TODO sync cross-process:
+//  1. Emit internal events when scheduling timer, performing queue, and enqueuing data
+//  2. On schedule, mark ID as deferred.
+//  3. On perform, clear mark.
+//  4. On performAll, skip deferred IDs.
+//  5. On enqueue when ID is deferred, send data as event instead.
+//  6. On delete when ID is deferred, clear mark
+
 @Injectable()
 export class CollapsedQueueService implements OnApplicationShutdown {
 	// Moved from InboxProcessorService
 	public readonly updateInstanceQueue: CollapsedQueue<MiInstance['id'], UpdateInstanceJob>;
+
 	// Moved from NoteCreateService, NoteEditService, and NoteDeleteService
 	public readonly updateUserQueue: CollapsedQueue<MiUser['id'], UpdateUserJob>;
+
 	public readonly updateNoteQueue: CollapsedQueue<MiNote['id'], UpdateNoteJob>;
 	public readonly updateAccessTokenQueue: CollapsedQueue<MiAccessToken['id'], UpdateAccessTokenJob>;
+	public readonly updateAntennaQueue: CollapsedQueue<MiAntenna['id'], UpdateAntennaJob>;
 
 	private readonly logger: Logger;
 
@@ -67,9 +84,13 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		@Inject(DI.accessTokensRepository)
 		public readonly accessTokensRepository: AccessTokensRepository,
 
+		@Inject(DI.antennasRepository)
+		public readonly antennasRepository: AntennasRepository,
+
 		private readonly federatedInstanceService: FederatedInstanceService,
 		private readonly envService: EnvService,
 		private readonly internalEventService: InternalEventService,
+		private readonly antennaService: AntennaService,
 
 		loggerService: LoggerService,
 	) {
@@ -136,15 +157,17 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),
 				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
-			(id, job) => this.usersRepository.update({ id }, {
-				updatedAt: job.updatedAt,
-				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
-				followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
-				followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
-			}),
+			async (id, job) => {
+				await this.usersRepository.update({ id }, {
+					updatedAt: job.updatedAt,
+					notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
+					followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
+					followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
+				});
+				await this.internalEventService.emit('userUpdated', { id });
+			},
 			{
 				onError: this.onQueueError,
-				onPerform: (_, id) => this.internalEventService.emit('userUpdated', { id }),
 				concurrency: 4, // High concurrency - this queue gets a lot of activity
 			},
 		);
@@ -183,7 +206,26 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			},
 		);
 
+		this.updateAntennaQueue = new CollapsedQueue(
+			'updateAntenna',
+			fiveMinuteInterval,
+			(oldJob, newJob) => ({
+				isActive: oldJob.isActive || newJob.isActive,
+				lastUsedAt: maxDate(oldJob.lastUsedAt, newJob.lastUsedAt),
+			}),
+			(id, job) => this.antennaService.updateAntenna(id, {
+				isActive: job.isActive,
+				lastUsedAt: job.lastUsedAt,
+			}),
+			{
+				onError: this.onQueueError,
+				concurrency: 4,
+			},
+		);
+
 		this.internalEventService.on('userChangeDeletedState', this.onUserDeleted);
+		this.internalEventService.on('antennaDeleted', this.onAntennaDeleted);
+		this.internalEventService.on('antennaUpdated', this.onAntennaDeleted);
 	}
 
 	@bindThis
@@ -194,6 +236,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		await this.performQueue(this.updateUserQueue);
 		await this.performQueue(this.updateNoteQueue);
 		await this.performQueue(this.updateAccessTokenQueue);
+		await this.performQueue(this.updateAntennaQueue);
 
 		this.logger.info('Persistence complete.');
 	}
@@ -226,8 +269,15 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		}
 	}
 
+	@bindThis
+	private onAntennaDeleted(data: MiAntenna) {
+		this.updateAntennaQueue.delete(data.id);
+	}
+
 	async onApplicationShutdown() {
 		this.internalEventService.off('userChangeDeletedState', this.onUserDeleted);
+		this.internalEventService.off('antennaDeleted', this.onAntennaDeleted);
+		this.internalEventService.off('antennaUpdated', this.onAntennaDeleted);
 
 		await this.performAllNow();
 	}
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index af1657cc63..280373db79 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -24,7 +24,6 @@ export class CollapsedQueue<K, V> {
 		private readonly perform: (key: K, value: V) => Promise<void | unknown>,
 		private readonly opts?: {
 			onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void | Promise<void>,
-			onPerform?: (queue: CollapsedQueue<K, V>, key: K, value: V) => void | Promise<void>,
 			concurrency?: number,
 		},
 	) {
@@ -74,7 +73,6 @@ export class CollapsedQueue<K, V> {
 			} else {
 				await this.perform(key, value);
 			}
-			await this.opts?.onPerform?.(this, key, value);
 		} catch (err) {
 			await this.opts?.onError?.(this, err);
 			throw err;
diff --git a/packages/backend/src/queue/processors/CleanProcessorService.ts b/packages/backend/src/queue/processors/CleanProcessorService.ts
index f678801e08..eec468e3e4 100644
--- a/packages/backend/src/queue/processors/CleanProcessorService.ts
+++ b/packages/backend/src/queue/processors/CleanProcessorService.ts
@@ -13,6 +13,7 @@ import { IdService } from '@/core/IdService.js';
 import type { Config } from '@/config.js';
 import { ReversiService } from '@/core/ReversiService.js';
 import { TimeService } from '@/global/TimeService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';
 
@@ -37,6 +38,7 @@ export class CleanProcessorService {
 		private reversiService: ReversiService,
 		private idService: IdService,
 		private readonly timeService: TimeService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('clean');
 	}
@@ -51,6 +53,7 @@ export class CleanProcessorService {
 
 		// 使われてないアンテナを停止
 		if (this.config.deactivateAntennaThreshold > 0) {
+			await this.collapsedQueueService.updateAntennaQueue.performAllNow();
 			await this.antennasRepository.update({
 				lastUsedAt: LessThan(new Date(this.timeService.now - this.config.deactivateAntennaThreshold)),
 			}, {
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index 683d5b9e91..81c0fe5169 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -16,6 +16,7 @@ import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
 import ActiveUsersChart from '@/core/chart/charts/active-users.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -79,6 +80,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private globalEventService: GlobalEventService,
 		private readonly activeUsersChart: ActiveUsersChart,
 		private readonly timeService: TimeService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -96,9 +98,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// falseだった場合はアンテナの配信先が増えたことを通知したい
 			const needPublishEvent = !antenna.isActive;
 
-			antenna.isActive = true;
-			antenna.lastUsedAt = this.timeService.date;
-			trackPromise(this.antennasRepository.update(antenna.id, antenna));
+			this.collapsedQueueService.updateAntennaQueue.enqueue(antenna.id, {
+				isActive: true,
+				lastUsedAt: this.timeService.date,
+			});
 
 			if (needPublishEvent) {
 				this.globalEventService.publishInternalEvent('antennaUpdated', antenna);

From 896a364de75eb336a67bb2b0ac99fd15668dfcf2 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 21:06:20 -0400
Subject: [PATCH 055/107] synchronize collapsed queues across the cluster to
 avoid data races

---
 packages/backend/src/core/ClipService.ts      |   4 +-
 .../backend/src/core/CollapsedQueueService.ts |  61 ++++----
 .../backend/src/core/GlobalEventService.ts    |   2 +
 .../backend/src/core/NoteCreateService.ts     |  10 +-
 .../backend/src/core/NoteDeleteService.ts     |  18 +--
 packages/backend/src/core/NoteEditService.ts  |   4 +-
 packages/backend/src/core/ReactionService.ts  |   4 +-
 .../backend/src/core/UserFollowingService.ts  |  16 +--
 .../activitypub/models/ApPersonService.ts     |   6 +-
 packages/backend/src/misc/collapsed-queue.ts  | 136 ++++++++++++++----
 .../BackgroundTaskProcessorService.ts         |   4 +-
 .../src/server/api/AuthenticateService.ts     |   2 +-
 .../server/api/endpoints/antennas/notes.ts    |   2 +-
 13 files changed, 174 insertions(+), 95 deletions(-)

diff --git a/packages/backend/src/core/ClipService.ts b/packages/backend/src/core/ClipService.ts
index 575440abd6..6bb6b78eea 100644
--- a/packages/backend/src/core/ClipService.ts
+++ b/packages/backend/src/core/ClipService.ts
@@ -132,7 +132,7 @@ export class ClipService {
 			lastClippedAt: this.timeService.date,
 		});
 
-		this.collapsedQueueService.updateNoteQueue.enqueue(noteId, { clippedCountDelta: 1 });
+		await this.collapsedQueueService.updateNoteQueue.enqueue(noteId, { clippedCountDelta: 1 });
 	}
 
 	@bindThis
@@ -157,6 +157,6 @@ export class ClipService {
 			clipId: clip.id,
 		});
 
-		this.collapsedQueueService.updateNoteQueue.enqueue(noteId, { clippedCountDelta: -1 });
+		await this.collapsedQueueService.updateNoteQueue.enqueue(noteId, { clippedCountDelta: -1 });
 	}
 }
diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 1a1def3291..c6628dad7f 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -11,10 +11,8 @@ import { renderInlineError } from '@/misc/render-inline-error.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { EnvService } from '@/core/EnvService.js';
 import { bindThis } from '@/decorators.js';
-import type { MiInstance } from '@/models/Instance.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
-import { MiUser } from '@/models/User.js';
-import type { MiNote, UsersRepository, NotesRepository, MiAccessToken, AccessTokensRepository, MiAntenna, AntennasRepository } from '@/models/_.js';
+import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, AntennasRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { AntennaService } from '@/core/AntennaService.js';
 
@@ -52,25 +50,17 @@ export type UpdateAntennaJob = {
 	lastUsedAt?: Date,
 };
 
-// TODO sync cross-process:
-//  1. Emit internal events when scheduling timer, performing queue, and enqueuing data
-//  2. On schedule, mark ID as deferred.
-//  3. On perform, clear mark.
-//  4. On performAll, skip deferred IDs.
-//  5. On enqueue when ID is deferred, send data as event instead.
-//  6. On delete when ID is deferred, clear mark
-
 @Injectable()
 export class CollapsedQueueService implements OnApplicationShutdown {
 	// Moved from InboxProcessorService
-	public readonly updateInstanceQueue: CollapsedQueue<MiInstance['id'], UpdateInstanceJob>;
+	public readonly updateInstanceQueue: CollapsedQueue<UpdateInstanceJob>;
 
 	// Moved from NoteCreateService, NoteEditService, and NoteDeleteService
-	public readonly updateUserQueue: CollapsedQueue<MiUser['id'], UpdateUserJob>;
+	public readonly updateUserQueue: CollapsedQueue<UpdateUserJob>;
 
-	public readonly updateNoteQueue: CollapsedQueue<MiNote['id'], UpdateNoteJob>;
-	public readonly updateAccessTokenQueue: CollapsedQueue<MiAccessToken['id'], UpdateAccessTokenJob>;
-	public readonly updateAntennaQueue: CollapsedQueue<MiAntenna['id'], UpdateAntennaJob>;
+	public readonly updateNoteQueue: CollapsedQueue<UpdateNoteJob>;
+	public readonly updateAccessTokenQueue: CollapsedQueue<UpdateAccessTokenJob>;
+	public readonly updateAntennaQueue: CollapsedQueue<UpdateAntennaJob>;
 
 	private readonly logger: Logger;
 
@@ -100,6 +90,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		const oneMinuteInterval = this.envService.env.NODE_ENV !== 'test' ? 60 * 1000 : 0;
 
 		this.updateInstanceQueue = new CollapsedQueue(
+			this.internalEventService,
 			'updateInstance',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
@@ -149,6 +140,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		);
 
 		this.updateUserQueue = new CollapsedQueue(
+			this.internalEventService,
 			'updateUser',
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
@@ -173,6 +165,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		);
 
 		this.updateNoteQueue = new CollapsedQueue(
+			this.internalEventService,
 			'updateNote',
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
@@ -192,6 +185,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		);
 
 		this.updateAccessTokenQueue = new CollapsedQueue(
+			this.internalEventService,
 			'updateAccessToken',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
@@ -207,6 +201,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		);
 
 		this.updateAntennaQueue = new CollapsedQueue(
+			this.internalEventService,
 			'updateAntenna',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
@@ -229,20 +224,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	async performAllNow() {
-		this.logger.info('Persisting all collapsed queues...');
-
-		await this.performQueue(this.updateInstanceQueue);
-		await this.performQueue(this.updateUserQueue);
-		await this.performQueue(this.updateNoteQueue);
-		await this.performQueue(this.updateAccessTokenQueue);
-		await this.performQueue(this.updateAntennaQueue);
-
-		this.logger.info('Persistence complete.');
-	}
-
-	@bindThis
-	private async performQueue<K, V>(queue: CollapsedQueue<K, V>): Promise<void> {
+	private async performQueue<V>(queue: CollapsedQueue<V>): Promise<void> {
 		try {
 			const results = await queue.performAllNow();
 
@@ -258,7 +240,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private onQueueError<K, V>(queue: CollapsedQueue<K, V>, error: unknown): void {
+	private onQueueError<V>(queue: CollapsedQueue<V>, error: unknown): void {
 		this.logger.error(`Error persisting ${queue.name}: ${renderInlineError(error)}`);
 	}
 
@@ -274,12 +256,25 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		this.updateAntennaQueue.delete(data.id);
 	}
 
-	async onApplicationShutdown() {
+	@bindThis
+	async dispose() {
 		this.internalEventService.off('userChangeDeletedState', this.onUserDeleted);
 		this.internalEventService.off('antennaDeleted', this.onAntennaDeleted);
 		this.internalEventService.off('antennaUpdated', this.onAntennaDeleted);
 
-		await this.performAllNow();
+		this.logger.info('Persisting all collapsed queues...');
+
+		await this.performQueue(this.updateInstanceQueue);
+		await this.performQueue(this.updateUserQueue);
+		await this.performQueue(this.updateNoteQueue);
+		await this.performQueue(this.updateAccessTokenQueue);
+		await this.performQueue(this.updateAntennaQueue);
+
+		this.logger.info('Persistence complete.');
+	}
+
+	async onApplicationShutdown() {
+		await this.dispose();
 	}
 }
 
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 2be5a580da..eeba5d6bae 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -277,6 +277,8 @@ export interface InternalEventTypes {
 	userListMemberBulkRemoved: { userListIds: MiUserList['id'][]; memberId: MiUser['id']; };
 	quantumCacheUpdated: { name: string, keys: string[] };
 	quantumCacheReset: { name: string };
+	collapsedQueueDefer: { name: string, key: string, deferred: boolean };
+	collapsedQueueEnqueue: { name: string, key: string, value: unknown };
 }
 
 type EventTypesToEventPayload<T> = EventUnionFromDictionary<UndefinedAsNullAll<SerializedAll<T>>>;
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 2c7c8add66..c1c48d1708 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -587,7 +587,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (isRemoteUser(user)) {
 				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
 					if (!this.isRenote(note) || this.isQuote(note)) {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, true);
@@ -605,10 +605,10 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		if (!this.isRenote(note) || this.isQuote(note)) {
 			// Increment notes count (user)
-			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: 1 });
+			await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: 1 });
 		}
 
-		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		await this.pushToTl(note, user);
 
@@ -618,7 +618,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}, user);
 
 		if (data.reply) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(data.reply.id, { repliesCountDelta: 1 });
+			await this.collapsedQueueService.updateNoteQueue.enqueue(data.reply.id, { repliesCountDelta: 1 });
 		}
 
 		if (data.reply == null) {
@@ -647,7 +647,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 
 		if (this.isPureRenote(data)) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(data.renote.id, { renoteCountDelta: 1 });
+			await this.collapsedQueueService.updateNoteQueue.enqueue(data.renote.id, { renoteCountDelta: 1 });
 			await this.incRenoteCount(data.renote, user);
 		}
 
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 8f8308679e..23d6dc5753 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -78,16 +78,16 @@ export class NoteDeleteService {
 		const cascadingNotes = await this.findCascadingNotes(note);
 
 		if (note.replyId) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(note.replyId, { repliesCountDelta: -1 });
+			await this.collapsedQueueService.updateNoteQueue.enqueue(note.replyId, { repliesCountDelta: -1 });
 		} else if (isPureRenote(note)) {
-			this.collapsedQueueService.updateNoteQueue.enqueue(note.renoteId, { renoteCountDelta: -1 });
+			await this.collapsedQueueService.updateNoteQueue.enqueue(note.renoteId, { renoteCountDelta: -1 });
 		}
 
 		for (const cascade of cascadingNotes) {
 			if (cascade.replyId) {
-				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.replyId, { repliesCountDelta: -1 });
+				await this.collapsedQueueService.updateNoteQueue.enqueue(cascade.replyId, { repliesCountDelta: -1 });
 			} else if (isPureRenote(cascade)) {
-				this.collapsedQueueService.updateNoteQueue.enqueue(cascade.renoteId, { renoteCountDelta: -1 });
+				await this.collapsedQueueService.updateNoteQueue.enqueue(cascade.renoteId, { renoteCountDelta: -1 });
 			}
 		}
 
@@ -139,14 +139,14 @@ export class NoteDeleteService {
 
 			if (!isPureRenote(note)) {
 				// Decrement notes count (user)
-				this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: -1 });
+				await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: -1 });
 			}
 
-			this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+			await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 			for (const cascade of cascadingNotes) {
 				if (!isPureRenote(cascade)) {
-					this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { notesCountDelta: -1 });
+					await this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { notesCountDelta: -1 });
 				}
 				// Don't mark cascaded user as updated (active)
 			}
@@ -155,7 +155,7 @@ export class NoteDeleteService {
 				if (isRemoteUser(user)) {
 					if (!isPureRenote(note)) {
 						const i = await this.federatedInstanceService.fetchOrRegister(user.host);
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(user.host, note, false);
@@ -166,7 +166,7 @@ export class NoteDeleteService {
 					if (this.userEntityService.isRemoteUser(cascade.user)) {
 						if (!isPureRenote(cascade)) {
 							const i = await this.federatedInstanceService.fetchOrRegister(cascade.user.host);
-							this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
+							await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
 						}
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateNote(cascade.user.host, cascade, false);
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index adff0cbb5b..df98283930 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -616,7 +616,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			if (isRemoteUser(user)) {
 				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
 					if (note.renote && note.text || !note.renote) {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 });
 					}
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, true);
@@ -625,7 +625,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		// ハッシュタグ更新
 		await this.pushToTl(note, user);
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 1e2e30f219..070083784f 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -226,7 +226,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		// 30%の確率、セルフではない、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (
@@ -342,7 +342,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
 			reaction: this.decodeReaction(exist.reaction).reaction,
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 9a58d2d1fe..a17006f57c 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -288,22 +288,22 @@ export class UserFollowingService implements OnModuleInit {
 		// Neither followee nor follower has moved.
 		if (!followeeUser.movedToUri && !followerUser.movedToUri) {
 			//#region Increment counts
-			this.collapsedQueueService.updateUserQueue.enqueue(follower.id, { followingCountDelta: 1 });
-			this.collapsedQueueService.updateUserQueue.enqueue(followee.id, { followersCountDelta: 1 });
+			await this.collapsedQueueService.updateUserQueue.enqueue(follower.id, { followingCountDelta: 1 });
+			await this.collapsedQueueService.updateUserQueue.enqueue(followee.id, { followersCountDelta: 1 });
 			//#endregion
 
 			//#region Update instance stats
 			if (this.meta.enableStatsForFederatedInstances) {
 				if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followingCountDelta: 1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followingCountDelta: 1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowing(i.host, true);
 						}
 					});
 				} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followersCountDelta: 1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followersCountDelta: 1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowers(i.host, true);
 						}
@@ -398,22 +398,22 @@ export class UserFollowingService implements OnModuleInit {
 		// Neither followee nor follower has moved.
 		if (!follower.movedToUri && !followee.movedToUri) {
 			//#region Decrement following / followers counts
-			this.collapsedQueueService.updateUserQueue.enqueue(follower.id, { followingCountDelta: -1 });
-			this.collapsedQueueService.updateUserQueue.enqueue(followee.id, { followersCountDelta: -1 });
+			await this.collapsedQueueService.updateUserQueue.enqueue(follower.id, { followingCountDelta: -1 });
+			await this.collapsedQueueService.updateUserQueue.enqueue(followee.id, { followersCountDelta: -1 });
 			//#endregion
 
 			//#region Update instance stats
 			if (this.meta.enableStatsForFederatedInstances) {
 				if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followingCountDelta: -1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followingCountDelta: -1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowing(i.host, false);
 						}
 					});
 				} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
 					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
-						this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followersCountDelta: -1 });
+						await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { followersCountDelta: -1 });
 						if (this.meta.enableChartsForFederatedInstances) {
 							this.instanceChart.updateFollowers(i.host, false);
 						}
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index e3442f76d1..692b04f1c8 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -577,12 +577,12 @@ export class ApPersonService implements OnModuleInit {
 
 		// Register host
 		if (this.meta.enableStatsForFederatedInstances) {
-			this.federatedInstanceService.fetchOrRegister(host).then(i => {
-				this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { usersCountDelta: 1 });
+			this.federatedInstanceService.fetchOrRegister(host).then(async i => {
+				await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { usersCountDelta: 1 });
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.newUser(i.host);
 				}
-				this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
+				await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(i);
 			});
 		}
 
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 280373db79..38582e61f0 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -5,67 +5,105 @@
 
 import { TimeService, type TimerHandle } from '@/global/TimeService.js';
 import promiseLimit from 'promise-limit';
+import { InternalEventService } from '@/core/InternalEventService.js';
+import { bindThis } from '@/decorators.js';
 
 type Job<V> = {
 	value: V;
 	timer: TimerHandle;
 };
 
-// TODO: redis使えるようにする
-export class CollapsedQueue<K, V> {
+// TODO document IPC sync process
+
+// sync cross-process:
+//  1. Emit internal events when scheduling timer, performing queue, and enqueuing data
+//  2. On enqueue, mark ID as deferred.
+//  3. On perform, clear mark.
+//  4. On performAll, skip deferred IDs.
+//  5. On enqueue when ID is deferred, send data as event instead.
+//  6. On delete, clear mark.
+//  7. On delete when ID is deferred, do nothing.
+
+export class CollapsedQueue<V> {
 	private readonly limiter?: ReturnType<typeof promiseLimit<void>>;
-	private jobs: Map<K, Job<V>> = new Map();
+	private readonly jobs: Map<string, Job<V>> = new Map();
+	private readonly deferredKeys = new Set<string>();
 
 	constructor(
+		private readonly internalEventService: InternalEventervice,
+		private readonly timeService: TimeService,
 		public readonly name: string,
-		protected readonly timeService: TimeService,
 		private readonly timeout: number,
 		private readonly collapse: (oldValue: V, newValue: V) => V,
-		private readonly perform: (key: K, value: V) => Promise<void | unknown>,
+		private readonly perform: (key: string, value: V) => Promise<void | unknown>,
 		private readonly opts?: {
-			onError?: (queue: CollapsedQueue<K, V>, error: unknown) => void | Promise<void>,
+			onError?: (queue: CollapsedQueue<V>, error: unknown) => void | Promise<void>,
 			concurrency?: number,
 		},
 	) {
 		if (opts?.concurrency) {
 			this.limiter = promiseLimit<void>(opts.concurrency);
 		}
+
+		this.internalEventService.on('collapsedQueueDefer', this.onDefer, { ignoreLocal: true });
+		this.internalEventService.on('collapsedQueueEnqueue', this.onEnqueue, { ignoreLocal: true });
 	}
 
-	enqueue(key: K, value: V) {
-		if (this.jobs.has(key)) {
-			const old = this.jobs.get(key)!;
-			const merged = this.collapse(old.value, value);
-			this.jobs.set(key, { ...old, value: merged });
-		} else {
-			const timer = this.timeService.startTimer(() => {
-				const job = this.jobs.get(key)!;
-				this.jobs.delete(key);
-				this._perform(key, job.value);
-			}, this.timeout);
-			this.jobs.set(key, { value, timer });
+	@bindThis
+	async enqueue(key: string, value: V) {
+		// If deferred, then send it out to the owning process
+		if (this.deferredKeys.has(key)) {
+			await this.internalEventService.emit('collapsedQueueEnqueue', { name: this.name, key, value });
+			return;
 		}
-	}
 
-	delete(key: K) {
+		// If already queued, then merge
 		const job = this.jobs.get(key);
 		if (job) {
-			clearTimeout(job.timer);
-			this.jobs.delete(key);
+			job.value = this.collapse(job.value, value);
+			return;
 		}
+
+		// Otherwise, create a new job
+		const timer = this.timeService.startTimer(async () => {
+			const job = this.jobs.get(key);
+			if (!job) return;
+
+			this.jobs.delete(key);
+			await this._perform(key, job.value);
+		}, this.timeout);
+		this.jobs.set(key, { value, timer });
+
+		// Mark as deferred so other processes will forward their state to us
+		await this.internalEventService.emit('collapsedQueueDefer', { name: this.name, key, deferred: true });
 	}
 
+	@bindThis
+	async delete(key: string) {
+		const job = this.jobs.get(key);
+		if (!job) return;
+
+		clearTimeout(job.timer);
+		this.jobs.delete(key);
+		await this.internalEventService.emit('collapsedQueueDefer', { name: this.name, key, deferred: false });
+	}
+
+	@bindThis
 	async performAllNow() {
-		const entries = [...this.jobs.entries()];
-		this.jobs.clear();
-		for (const [_key, job] of entries) {
-			this.timeService.stopTimer(job.timer);
+		for (const job of this.jobs.values()) {
+			clearTimeout(job.timer);
 		}
+
+		const entries = Array.from(this.jobs.entries());
+		this.jobs.clear();
+
 		return await Promise.allSettled(entries.map(([key, job]) => this._perform(key, job.value)));
 	}
 
-	private async _perform(key: K, value: V) {
+	private async _perform(key: string, value: V) {
 		try {
+			await this.internalEventService.emit('collapsedQueueDefer', { name: this.name, key, deferred: false });
+
 			if (this.limiter) {
 				await this.limiter(async () => {
 					await this.perform(key, value);
@@ -78,4 +116,48 @@ export class CollapsedQueue<K, V> {
 			throw err;
 		}
 	}
+
+	//#region Events from other processes
+	@bindThis
+	private async onDefer(data: { name: string, key: string, deferred: boolean }) {
+		if (data.name !== this.name) return;
+
+		// Check for and recover from de-sync conditions where multiple processes try to "own" the same job.
+		const job = this.jobs.get(data.key);
+		if (job) {
+			if (data.deferred) {
+				// If another process tries to claim our job, then give it to them and queue our latest state.
+				this.timeService.stopTimer(job.timer);
+				this.jobs.delete(data.key);
+				await this.internalEventService.emit('collapsedQueueEnqueue', { name: this.name, key: data.key, value: job.value });
+			} else {
+				// If another process tries to release our job, then just continue.
+				return;
+			}
+		}
+
+		if (data.deferred) {
+			this.deferredKeys.add(data.key);
+		} else {
+			this.deferredKeys.delete(data.key);
+		}
+	}
+
+	@bindThis
+	private async onEnqueue(data: { name: string, key: string, value: unknown }) {
+		if (data.name !== this.name) return;
+
+		// Only enqueue if not deferred
+		if (!this.deferredKeys.has(data.key)) {
+			await this.enqueue(data.key, data.value as V);
+		}
+	}
+	//#endregion
+
+	async dispose() {
+		this.internalEventService.off('collapsedQueueDefer', this.onDefer);
+		this.internalEventService.off('collapsedQueueEnqueue', this.onEnqueue);
+
+		return await this.performAllNow();
+	}
 }
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index bacfed3473..b1b38ff788 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -188,7 +188,7 @@ export class BackgroundTaskProcessorService {
 
 		// This is messy, but we need to minimize updates to space in Postgres blocks.
 		if (updateNotResponding || updateGoneSuspended || updateAutoSuspended) {
-			this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
+			await this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
 				notRespondingSince: updateNotResponding ? (success ? null : new Date()) : undefined,
 				shouldSuspendGone: updateGoneSuspended || undefined,
 				shouldSuspendNotResponding: updateAutoSuspended || undefined,
@@ -229,7 +229,7 @@ export class BackgroundTaskProcessorService {
 		await this.fetchInstanceMetadataService.fetchInstanceMetadataLazy(instance);
 
 		// Unsuspend instance (deferred)
-		this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
+		await this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
 			latestRequestReceivedAt: new Date(),
 			shouldUnsuspend: instance.suspensionState === 'autoSuspendedForNotResponding',
 		});
diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts
index 3f95c4b6c1..23ba7a98b9 100644
--- a/packages/backend/src/server/api/AuthenticateService.ts
+++ b/packages/backend/src/server/api/AuthenticateService.ts
@@ -81,7 +81,7 @@ export class AuthenticateService {
 				throw new AuthenticationError('invalid signature');
 			}
 
-			this.collapsedQueueService.updateAccessTokenQueue.enqueue(accessToken.id, {
+			await this.collapsedQueueService.updateAccessTokenQueue.enqueue(accessToken.id, {
 				lastUsedAt: this.timeService.date,
 			});
 
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index 81c0fe5169..5eddfe96fa 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -98,7 +98,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// falseだった場合はアンテナの配信先が増えたことを通知したい
 			const needPublishEvent = !antenna.isActive;
 
-			this.collapsedQueueService.updateAntennaQueue.enqueue(antenna.id, {
+			await this.collapsedQueueService.updateAntennaQueue.enqueue(antenna.id, {
 				isActive: true,
 				lastUsedAt: this.timeService.date,
 			});

From 7716292c78eff0474113b3839ad4ccd9754abde3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 21:54:28 -0400
Subject: [PATCH 056/107] fix type of Serialized<T>

---
 packages/backend/src/types.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 850f47ad52..e5468d2134 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -551,13 +551,17 @@ export type Serialized<T> = {
 		? string
 		: T[K] extends (Date | null)
 			? (string | null)
-			: T[K] extends Record<string, any>
-				? Serialized<T[K]>
-				: T[K] extends (Record<string, any> | null)
-					? (Serialized<T[K]> | null)
-					: T[K] extends (Record<string, any> | undefined)
-						? (Serialized<T[K]> | undefined)
-						: T[K];
+			: T[K] extends (Date | undefined)
+				? (string | undefined)
+				: T[K] extends (Date | null | undefined)
+					? (string | null | undefined)
+					: T[K] extends Record<string, any>
+						? Serialized<T[K]>
+						: T[K] extends (Record<string, any> | null)
+							? (Serialized<T[K]> | null)
+							: T[K] extends (Record<string, any> | undefined)
+								? (Serialized<T[K]> | undefined)
+								: T[K];
 };
 
 export type FilterUnionByProperty<

From 7ca90502d1b1e6e09c0ef94d1a83df4a292be8e4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 21:54:43 -0400
Subject: [PATCH 057/107] fix Date objects getting mangled by JSON

---
 .../backend/src/core/CollapsedQueueService.ts | 33 ++++++++++++++++---
 packages/backend/src/misc/collapsed-queue.ts  |  8 ++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index c6628dad7f..69e3982553 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -136,6 +136,15 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			{
 				onError: this.onQueueError,
 				concurrency: 2, // Low concurrency, this table is slow for some reason
+				redisParser: data => ({
+					...data,
+					latestRequestReceivedAt: data.latestRequestReceivedAt != null
+						? new Date(data.latestRequestReceivedAt)
+						: data.latestRequestReceivedAt,
+					notRespondingSince: data.notRespondingSince != null
+						? new Date(data.notRespondingSince)
+						: data.notRespondingSince,
+				}),
 			},
 		);
 
@@ -161,6 +170,12 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			{
 				onError: this.onQueueError,
 				concurrency: 4, // High concurrency - this queue gets a lot of activity
+				redisParser: data => ({
+					...data,
+					updatedAt: data.updatedAt != null
+						? new Date(data.updatedAt)
+						: data.updatedAt,
+				}),
 			},
 		);
 
@@ -197,6 +212,10 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			{
 				onError: this.onQueueError,
 				concurrency: 2,
+				redisParser: data => ({
+					...data,
+					lastUsedAt: new Date(data.lastUsedAt),
+				}),
 			},
 		);
 
@@ -215,6 +234,12 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			{
 				onError: this.onQueueError,
 				concurrency: 4,
+				redisParser: data => ({
+					...data,
+					lastUsedAt: data.lastUsedAt != null
+						? new Date(data.lastUsedAt)
+						: data.lastUsedAt,
+				}),
 			},
 		);
 
@@ -245,15 +270,15 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private onUserDeleted(data: { id: string, isDeleted: boolean }) {
+	private async onUserDeleted(data: { id: string, isDeleted: boolean }) {
 		if (data.isDeleted) {
-			this.updateUserQueue.delete(data.id);
+			await this.updateUserQueue.delete(data.id);
 		}
 	}
 
 	@bindThis
-	private onAntennaDeleted(data: MiAntenna) {
-		this.updateAntennaQueue.delete(data.id);
+	private async onAntennaDeleted(data: MiAntenna) {
+		await this.updateAntennaQueue.delete(data.id);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 38582e61f0..f121edbe0e 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -7,6 +7,7 @@ import { TimeService, type TimerHandle } from '@/global/TimeService.js';
 import promiseLimit from 'promise-limit';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { bindThis } from '@/decorators.js';
+import { Serialized } from '@/types.js';
 
 type Job<V> = {
 	value: V;
@@ -39,6 +40,7 @@ export class CollapsedQueue<V> {
 		private readonly opts?: {
 			onError?: (queue: CollapsedQueue<V>, error: unknown) => void | Promise<void>,
 			concurrency?: number,
+			redisParser?: (data: Serialized<V>) => V,
 		},
 	) {
 		if (opts?.concurrency) {
@@ -149,7 +151,11 @@ export class CollapsedQueue<V> {
 
 		// Only enqueue if not deferred
 		if (!this.deferredKeys.has(data.key)) {
-			await this.enqueue(data.key, data.value as V);
+			const value = this.opts?.redisParser
+				? this.opts.redisParser(data.value as Serialized<V>)
+				: data.value as V;
+
+			await this.enqueue(data.key, value);
 		}
 	}
 	//#endregion

From f8814483e81a79e702fb415fac63b73a8eb31834 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 22:26:43 -0400
Subject: [PATCH 058/107] fix "unhandled rejection" error when a queue fails to
 update

---
 packages/backend/src/core/CollapsedQueueService.ts | 2 +-
 packages/backend/src/misc/collapsed-queue.ts       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 69e3982553..be57f7923c 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -254,7 +254,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			const results = await queue.performAllNow();
 
 			const [succeeded, failed] = results.reduce((counts, result) => {
-				counts[result.status === 'fulfilled' ? 0 : 1]++;
+				counts[result ? 0 : 1]++;
 				return counts;
 			}, [0, 0]);
 
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index f121edbe0e..9bfcc38e55 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -99,7 +99,7 @@ export class CollapsedQueue<V> {
 		const entries = Array.from(this.jobs.entries());
 		this.jobs.clear();
 
-		return await Promise.allSettled(entries.map(([key, job]) => this._perform(key, job.value)));
+		return await Promise.all(entries.map(([key, job]) => this._perform(key, job.value)));
 	}
 
 	private async _perform(key: string, value: V) {
@@ -113,9 +113,11 @@ export class CollapsedQueue<V> {
 			} else {
 				await this.perform(key, value);
 			}
+
+			return true;
 		} catch (err) {
 			await this.opts?.onError?.(this, err);
-			throw err;
+			return false;
 		}
 	}
 

From c80b4138f530e86efeff6be4bc70a1cf57a52ae4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 22:27:44 -0400
Subject: [PATCH 059/107] restore stack traces for collapsed queues

---
 packages/backend/src/core/CollapsedQueueService.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index be57f7923c..906708d748 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -102,7 +102,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),
 				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
-			(id, job) => this.federatedInstanceService.update(id, {
+			async (id, job) => await this.federatedInstanceService.update(id, {
 				// Direct update if defined
 				latestRequestReceivedAt: job.latestRequestReceivedAt,
 
@@ -188,7 +188,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				renoteCountDelta: (oldJob.renoteCountDelta ?? 0) + (newJob.renoteCountDelta ?? 0),
 				clippedCountDelta: (oldJob.clippedCountDelta ?? 0) + (newJob.clippedCountDelta ?? 0),
 			}),
-			(id, job) => this.notesRepository.update({ id }, {
+			async (id, job) => await this.notesRepository.update({ id }, {
 				repliesCount: job.repliesCountDelta ? () => `"repliesCount" + ${job.repliesCountDelta}` : undefined,
 				renoteCount: job.renoteCountDelta ? () => `"renoteCount" + ${job.renoteCountDelta}` : undefined,
 				clippedCount: job.clippedCountDelta ? () => `"clippedCount" + ${job.clippedCountDelta}` : undefined,
@@ -206,7 +206,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			(oldJob, newJob) => ({
 				lastUsedAt: maxDate(oldJob.lastUsedAt, newJob.lastUsedAt),
 			}),
-			(id, job) => this.accessTokensRepository.update({ id }, {
+			async (id, job) => await this.accessTokensRepository.update({ id }, {
 				lastUsedAt: job.lastUsedAt,
 			}),
 			{
@@ -227,7 +227,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				isActive: oldJob.isActive || newJob.isActive,
 				lastUsedAt: maxDate(oldJob.lastUsedAt, newJob.lastUsedAt),
 			}),
-			(id, job) => this.antennaService.updateAntenna(id, {
+			async (id, job) => await this.antennaService.updateAntenna(id, {
 				isActive: job.isActive,
 				lastUsedAt: job.lastUsedAt,
 			}),

From 63f2073af1c36102091f7d74ec073086a52ef7ab Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 22:34:15 -0400
Subject: [PATCH 060/107] fix shouldSuspendGone and shouldSuspendNotResponding
 not working

---
 packages/backend/src/core/CollapsedQueueService.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 906708d748..d566f40adb 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -97,6 +97,8 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				latestRequestReceivedAt: maxDate(oldJob.latestRequestReceivedAt, newJob.latestRequestReceivedAt),
 				notRespondingSince: maxDate(oldJob.notRespondingSince, newJob.notRespondingSince),
 				shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend,
+				shouldSuspendGone: oldJob.shouldSuspendGone || newJob.shouldSuspendGone,
+				shouldSuspendNotResponding: oldJob.shouldSuspendNotResponding || newJob.shouldSuspendNotResponding,
 				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
 				usersCountDelta: (oldJob.usersCountDelta ?? 0) + (newJob.usersCountDelta ?? 0),
 				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),

From 1baa9b2f9d1994706fc602377eb296f5400d32a7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 25 Jun 2025 22:34:36 -0400
Subject: [PATCH 061/107] fix sporadic update failures caused by lack of data

---
 .../backend/src/core/CollapsedQueueService.ts | 101 +++++++++++-------
 1 file changed, 62 insertions(+), 39 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index d566f40adb..406f92f103 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -104,37 +104,52 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),
 				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
-			async (id, job) => await this.federatedInstanceService.update(id, {
-				// Direct update if defined
-				latestRequestReceivedAt: job.latestRequestReceivedAt,
+			async (id, job) => {
+				// Have to check this because all properties are optional
+				if (
+					job.latestRequestReceivedAt ||
+					job.notRespondingSince !== undefined ||
+					job.shouldSuspendNotResponding ||
+					job.shouldSuspendGone ||
+					job.shouldUnsuspend ||
+					job.notesCountDelta ||
+					job.usersCountDelta ||
+					job.followingCountDelta ||
+					job.followersCountDelta
+				) {
+					await this.federatedInstanceService.update(id, {
+						// Direct update if defined
+						latestRequestReceivedAt: job.latestRequestReceivedAt,
 
-				// null (responding) > Date (not responding)
-				notRespondingSince: job.latestRequestReceivedAt
-					? null
-					: job.notRespondingSince,
+						// null (responding) > Date (not responding)
+						notRespondingSince: job.latestRequestReceivedAt
+							? null
+							: job.notRespondingSince,
 
-				// false (responding) > true (not responding)
-				isNotResponding: job.latestRequestReceivedAt
-					? false
-					: job.notRespondingSince
-						? true
-						: undefined,
+						// false (responding) > true (not responding)
+						isNotResponding: job.latestRequestReceivedAt
+							? false
+							: job.notRespondingSince
+								? true
+								: undefined,
 
-				// gone > none > auto
-				suspensionState: job.shouldSuspendGone
-					? 'goneSuspended'
-					: job.shouldUnsuspend
-						? 'none'
-						: job.shouldSuspendNotResponding
-							? 'autoSuspendedForNotResponding'
-							: undefined,
+						// gone > none > auto
+						suspensionState: job.shouldSuspendGone
+							? 'goneSuspended'
+							: job.shouldUnsuspend
+								? 'none'
+								: job.shouldSuspendNotResponding
+									? 'autoSuspendedForNotResponding'
+									: undefined,
 
-				// Increment if defined
-				notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
-				usersCount: job.usersCountDelta ? () => `"usersCount" + ${job.usersCountDelta}` : undefined,
-				followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
-				followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
-			}),
+						// Increment if defined
+						notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
+						usersCount: job.usersCountDelta ? () => `"usersCount" + ${job.usersCountDelta}` : undefined,
+						followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
+						followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
+					});
+				}
+			},
 			{
 				onError: this.onQueueError,
 				concurrency: 2, // Low concurrency, this table is slow for some reason
@@ -161,13 +176,16 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
 			async (id, job) => {
-				await this.usersRepository.update({ id }, {
-					updatedAt: job.updatedAt,
-					notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
-					followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
-					followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
-				});
-				await this.internalEventService.emit('userUpdated', { id });
+				// Have to check this because all properties are optional
+				if (job.updatedAt || job.notesCountDelta || job.followingCountDelta || job.followersCountDelta) {
+					await this.usersRepository.update({ id }, {
+						updatedAt: job.updatedAt,
+						notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
+						followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
+						followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
+					});
+					await this.internalEventService.emit('userUpdated', { id });
+				}
 			},
 			{
 				onError: this.onQueueError,
@@ -190,11 +208,16 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 				renoteCountDelta: (oldJob.renoteCountDelta ?? 0) + (newJob.renoteCountDelta ?? 0),
 				clippedCountDelta: (oldJob.clippedCountDelta ?? 0) + (newJob.clippedCountDelta ?? 0),
 			}),
-			async (id, job) => await this.notesRepository.update({ id }, {
-				repliesCount: job.repliesCountDelta ? () => `"repliesCount" + ${job.repliesCountDelta}` : undefined,
-				renoteCount: job.renoteCountDelta ? () => `"renoteCount" + ${job.renoteCountDelta}` : undefined,
-				clippedCount: job.clippedCountDelta ? () => `"clippedCount" + ${job.clippedCountDelta}` : undefined,
-			}),
+			async (id, job) => {
+				// Have to check this because all properties are optional
+				if (job.repliesCountDelta || job.renoteCountDelta || job.clippedCountDelta) {
+					await this.notesRepository.update({ id }, {
+						repliesCount: job.repliesCountDelta ? () => `"repliesCount" + ${job.repliesCountDelta}` : undefined,
+						renoteCount: job.renoteCountDelta ? () => `"renoteCount" + ${job.renoteCountDelta}` : undefined,
+						clippedCount: job.clippedCountDelta ? () => `"clippedCount" + ${job.clippedCountDelta}` : undefined,
+					});
+				}
+			},
 			{
 				onError: this.onQueueError,
 				concurrency: 4, // High concurrency - this queue gets a lot of activity

From 528c0476f992da1d7fdad4fdcc90a7c75681af88 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 26 Jun 2025 10:25:16 -0400
Subject: [PATCH 062/107] add lastActiveDate to updateUserQueue

---
 .../backend/src/core/CollapsedQueueService.ts | 34 ++++++++++++++----
 packages/backend/src/core/UserService.ts      | 35 ++-----------------
 .../server/api/StreamingApiServerService.ts   |  6 ++--
 3 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 406f92f103..f142e98e35 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -12,9 +12,10 @@ import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { EnvService } from '@/core/EnvService.js';
 import { bindThis } from '@/decorators.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
-import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, AntennasRepository } from '@/models/_.js';
+import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, FollowingsRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { AntennaService } from '@/core/AntennaService.js';
+import { CacheService } from '@/core/CacheService.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
@@ -30,6 +31,7 @@ export type UpdateInstanceJob = {
 
 export type UpdateUserJob = {
 	updatedAt?: Date,
+	lastActiveDate?: Date,
 	notesCountDelta?: number,
 	followingCountDelta?: number,
 	followersCountDelta?: number,
@@ -66,21 +68,22 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 	constructor(
 		@Inject(DI.usersRepository)
-		public readonly usersRepository: UsersRepository,
+		private readonly usersRepository: UsersRepository,
 
 		@Inject(DI.notesRepository)
-		public readonly notesRepository: NotesRepository,
+		private readonly notesRepository: NotesRepository,
 
 		@Inject(DI.accessTokensRepository)
-		public readonly accessTokensRepository: AccessTokensRepository,
+		private readonly accessTokensRepository: AccessTokensRepository,
 
-		@Inject(DI.antennasRepository)
-		public readonly antennasRepository: AntennasRepository,
+		@Inject(DI.followingsRepository)
+		private readonly followingsRepository: FollowingsRepository,
 
 		private readonly federatedInstanceService: FederatedInstanceService,
 		private readonly envService: EnvService,
 		private readonly internalEventService: InternalEventService,
 		private readonly antennaService: AntennaService,
+		private readonly cacheService: CacheService,
 
 		loggerService: LoggerService,
 	) {
@@ -171,20 +174,34 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
 				updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt),
+				lastActiveDate: maxDate(oldJob.lastActiveDate, newJob.lastActiveDate),
 				notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0),
 				followingCountDelta: (oldJob.followingCountDelta ?? 0) + (newJob.followingCountDelta ?? 0),
 				followersCountDelta: (oldJob.followersCountDelta ?? 0) + (newJob.followersCountDelta ?? 0),
 			}),
 			async (id, job) => {
 				// Have to check this because all properties are optional
-				if (job.updatedAt || job.notesCountDelta || job.followingCountDelta || job.followersCountDelta) {
+				if (job.updatedAt || job.lastActiveDate || job.notesCountDelta || job.followingCountDelta || job.followersCountDelta) {
+					// Updating the user should implicitly mark them as active
+					const lastActiveDate = job.lastActiveDate ?? job.updatedAt;
+					const isWakingUp = lastActiveDate && (await this.cacheService.findUserById(id)).isHibernated;
+
+					// Update user before the hibernation cache, because the latter may refresh from DB
 					await this.usersRepository.update({ id }, {
 						updatedAt: job.updatedAt,
+						lastActiveDate,
+						isHibernated: isWakingUp ? false : undefined,
 						notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined,
 						followingCount: job.followingCountDelta ? () => `"followingCount" + ${job.followingCountDelta}` : undefined,
 						followersCount: job.followersCountDelta ? () => `"followersCount" + ${job.followersCountDelta}` : undefined,
 					});
 					await this.internalEventService.emit('userUpdated', { id });
+
+					// Wake up hibernated users
+					if (isWakingUp) {
+						await this.followingsRepository.update({ followerId: id }, { isFollowerHibernated: false });
+						await this.cacheService.hibernatedUserCache.set(id, false);
+					}
 				}
 			},
 			{
@@ -195,6 +212,9 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 					updatedAt: data.updatedAt != null
 						? new Date(data.updatedAt)
 						: data.updatedAt,
+					lastActiveDate: data.lastActiveDate != null
+						? new Date(data.lastActiveDate)
+						: data.lastActiveDate,
 				}),
 			},
 		);
diff --git a/packages/backend/src/core/UserService.ts b/packages/backend/src/core/UserService.ts
index 69efb3a230..845c83effc 100644
--- a/packages/backend/src/core/UserService.ts
+++ b/packages/backend/src/core/UserService.ts
@@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { CacheService } from '@/core/CacheService.js';
+import { CollapsedQueueService } from '@/global/CollapsedQueueService.js';
 import { TimeService } from '@/global/TimeService.js';
 
 @Injectable()
@@ -22,43 +22,14 @@ export class UserService {
 		private followingsRepository: FollowingsRepository,
 		private systemWebhookService: SystemWebhookService,
 		private userEntityService: UserEntityService,
-		private readonly cacheService: CacheService,
+		private readonly collapsedQueueService: CollapsedQueueService,
 		private readonly timeService: TimeService,
 	) {
 	}
 
 	@bindThis
 	public async updateLastActiveDate(user: MiUser): Promise<void> {
-		if (user.isHibernated) {
-			const result = await this.usersRepository.createQueryBuilder().update()
-				.set({
-					lastActiveDate: this.timeService.date,
-				})
-				.where('id = :id', { id: user.id })
-				.returning('*')
-				.execute()
-				.then((response) => {
-					return response.raw[0];
-				});
-			const wokeUp = result.isHibernated;
-			if (wokeUp) {
-				await Promise.all([
-					this.usersRepository.update(user.id, {
-						isHibernated: false,
-					}),
-					this.followingsRepository.update({
-						followerId: user.id,
-					}, {
-						isFollowerHibernated: false,
-					}),
-					this.cacheService.hibernatedUserCache.set(user.id, false),
-				]);
-			}
-		} else {
-			this.usersRepository.update(user.id, {
-				lastActiveDate: this.timeService.date,
-			});
-		}
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { lastActiveDate: this.timeService.date });
 	}
 
 	/**
diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts
index 20d8fc4ca2..88e6574263 100644
--- a/packages/backend/src/server/api/StreamingApiServerService.ts
+++ b/packages/backend/src/server/api/StreamingApiServerService.ts
@@ -271,11 +271,11 @@ export class StreamingApiServerService implements OnApplicationShutdown {
 			this.#connections.set(connection, this.timeService.now);
 
 			// TODO use collapsed queue
-			const userUpdateIntervalId = user ? this.timeService.startTimer(() => {
-				this.usersService.updateLastActiveDate(user);
+			const userUpdateIntervalId = user ? this.timeService.startTimer(async () => {
+				await this.usersService.updateLastActiveDate(user);
 			}, 1000 * 60 * 5, { repeated: true }) : null;
 			if (user) {
-				this.usersService.updateLastActiveDate(user);
+				await this.usersService.updateLastActiveDate(user);
 			}
 			const pong = () => {
 				this.#connections.set(connection, this.timeService.now);

From f6ef65fdbd7c67b60fd989dbdee2669d30ebd56c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 26 Jun 2025 14:31:09 -0400
Subject: [PATCH 063/107] fix get-online-users-count return global activity

---
 .../server/api/endpoints/get-online-users-count.ts  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
index 08a037f7a3..2cd7dd972a 100644
--- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts
+++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { MoreThan } from 'typeorm';
+import { IsNull, MoreThan } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import { USER_ONLINE_THRESHOLD } from '@/const.js';
 import type { UsersRepository } from '@/models/_.js';
@@ -23,7 +23,11 @@ export const meta = {
 		properties: {
 			count: {
 				type: 'number',
-				nullable: false,
+				nullable: false, optional: false,
+			},
+			countAcrossNetwork: {
+				type: 'number',
+				nullable: false, optional: false,
 			},
 		},
 	},
@@ -50,12 +54,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private readonly timeService: TimeService,
 	) {
 		super(meta, paramDef, async () => {
+			const countAcrossNetwork = await this.usersRepository.countBy({
+				lastActiveDate: MoreThan(new Date(Date.now() - USER_ONLINE_THRESHOLD)),
+			});
 			const count = await this.usersRepository.countBy({
 				lastActiveDate: MoreThan(new Date(this.timeService.now - USER_ONLINE_THRESHOLD)),
+				host: IsNull(),
 			});
 
 			return {
 				count,
+				countAcrossNetwork,
 			};
 		});
 	}

From 4ceff00dac8497ef5a8d4f61fbc6e0a8f1c52fe7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 26 Jun 2025 14:32:27 -0400
Subject: [PATCH 064/107] add caching to reduce database load of
 get-online-users-count

---
 .../api/endpoints/get-online-users-count.ts   | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
index 2cd7dd972a..394f422da6 100644
--- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts
+++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
@@ -10,6 +10,7 @@ import type { UsersRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { DI } from '@/di-symbols.js';
 import { TimeService } from '@/global/TimeService.js';
+import { CacheManagementService, type ManagedMemorySingleCache } from '@/global/CacheManagementService.js';
 
 export const meta = {
 	tags: ['meta'],
@@ -48,24 +49,32 @@ export const paramDef = {
 
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	private readonly cache: ManagedMemorySingleCache<{ count: number, countAcrossNetwork: number }>;
+
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 		private readonly timeService: TimeService,
+
+		cacheManagementService: CacheManagementService,
 	) {
 		super(meta, paramDef, async () => {
-			const countAcrossNetwork = await this.usersRepository.countBy({
-				lastActiveDate: MoreThan(new Date(Date.now() - USER_ONLINE_THRESHOLD)),
-			});
-			const count = await this.usersRepository.countBy({
-				lastActiveDate: MoreThan(new Date(this.timeService.now - USER_ONLINE_THRESHOLD)),
-				host: IsNull(),
-			});
+			return this.cache.fetch(async () => {
+				const countAcrossNetwork = await this.usersRepository.countBy({
+					lastActiveDate: MoreThan(new Date(this.timeService.now - USER_ONLINE_THRESHOLD)),
+				});
+				const count = await this.usersRepository.countBy({
+					lastActiveDate: MoreThan(new Date(this.timeService.now - USER_ONLINE_THRESHOLD)),
+					host: IsNull(),
+				});
 
-			return {
-				count,
-				countAcrossNetwork,
-			};
+				return {
+					count,
+					countAcrossNetwork,
+				};
+			});
 		});
+
+		this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>(1000 * 60); // 1 minute
 	}
 }

From 8b3ea577dacdf5f34b374bdbbe06275b197b59f4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 12:58:11 -0400
Subject: [PATCH 065/107] limit unbounded parallel async maps

---
 packages/backend/src/core/AntennaService.ts   |   6 +-
 .../backend/src/core/CustomEmojiService.ts    |   3 +-
 .../backend/src/core/NoteCreateService.ts     |  19 +-
 packages/backend/src/core/NoteEditService.ts  |  25 +--
 packages/backend/src/core/ReactionService.ts  |   3 +-
 .../src/core/activitypub/ApAudienceService.ts |  11 +-
 .../src/core/activitypub/ApResolverService.ts |  31 ++--
 .../activitypub/models/ApMentionService.ts    |  12 +-
 .../core/activitypub/models/ApNoteService.ts  |  24 ++-
 .../activitypub/models/ApPersonService.ts     |  47 +++--
 packages/backend/src/core/chart/core.ts       |  17 +-
 .../entities/NoteFavoriteEntityService.ts     |  15 +-
 .../src/core/entities/PageEntityService.ts    |   9 +-
 .../src/core/entities/UserEntityService.ts    |   1 +
 packages/backend/src/misc/promise-map.ts      | 107 +++++++++++
 .../src/server/ActivityPubServerService.ts    |  43 ++---
 .../backend/src/server/api/GetterService.ts   |   1 +
 .../admin/federation/remove-all-following.ts  |  13 +-
 .../server/api/endpoints/admin/show-user.ts   |   8 +-
 .../src/server/api/endpoints/antennas/list.ts |   3 +-
 .../server/api/endpoints/channels/followed.ts |   3 +-
 .../api/endpoints/channels/my-favorites.ts    |   3 +-
 .../server/api/endpoints/channels/search.ts   |   3 +-
 .../src/server/api/endpoints/drive/folders.ts |   3 +-
 .../api/endpoints/drive/folders/find.ts       |   3 +-
 .../api/endpoints/gallery/posts/create.ts     |  11 +-
 .../server/api/endpoints/hashtags/users.ts    |   3 +-
 .../server/api/endpoints/i/authorized-apps.ts |   7 +-
 .../src/server/api/endpoints/i/favorites.ts   |   6 +-
 .../server/api/endpoints/i/signin-history.ts  |   3 +-
 .../src/server/api/endpoints/my/apps.ts       |   7 +-
 .../api/endpoints/notes/schedule/list.ts      |  18 +-
 .../backend/src/server/api/endpoints/users.ts |   3 +-
 .../server/api/endpoints/users/lists/list.ts  |   3 +-
 .../api/mastodon/MastodonApiServerService.ts  |  11 +-
 .../server/api/mastodon/MastodonConverters.ts |  17 +-
 .../server/api/mastodon/endpoints/account.ts  |   7 +-
 .../api/mastodon/endpoints/notifications.ts   |   3 +-
 .../server/api/mastodon/endpoints/search.ts   |  23 +--
 .../server/api/mastodon/endpoints/status.ts   |   9 +-
 .../server/api/mastodon/endpoints/timeline.ts |  13 +-
 .../backend/test/unit/misc/promise-map.ts     | 170 ++++++++++++++++++
 42 files changed, 508 insertions(+), 219 deletions(-)
 create mode 100644 packages/backend/src/misc/promise-map.ts
 create mode 100644 packages/backend/test/unit/misc/promise-map.ts

diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index 8404da2a08..ca451256db 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -19,6 +19,7 @@ import type { MiAntenna } from '@/models/Antenna.js';
 import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { CacheService } from './CacheService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
@@ -95,7 +96,10 @@ export class AntennaService implements OnApplicationShutdown {
 	@bindThis
 	public async addNoteToAntennas(note: MiNote, noteUser: { id: MiUser['id']; username: string; host: string | null; isBot: boolean; }): Promise<void> {
 		const antennas = await this.getAntennas();
-		const antennasWithMatchResult = await Promise.all(antennas.map(antenna => this.checkHitAntenna(antenna, note, noteUser).then(hit => [antenna, hit] as const)));
+		const antennasWithMatchResult = await promiseMap(antennas, async antenna => {
+			const hit = await this.checkHitAntenna(antenna, note, noteUser);
+			return [antenna, hit] as const;
+		});
 		const matchedAntennas = antennasWithMatchResult.filter(([, hit]) => hit).map(([antenna]) => antenna);
 
 		const redisPipeline = this.redisForTimelines.pipeline();
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index dff6560378..15adf0faae 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -23,6 +23,7 @@ import { DriveService } from '@/core/DriveService.js';
 import { CacheManagementService, type ManagedQuantumKVCache } from '@/global/CacheManagementService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { LoggerService } from '@/core/LoggerService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { isRetryableSymbol } from '@/misc/is-retryable-error.js';
 import type Logger from '@/logger.js';
 import { KeyNotFoundError } from '@/misc/errors/KeyNotFoundError.js';
@@ -577,7 +578,7 @@ export class CustomEmojiService {
 	 */
 	@bindThis
 	public async populateEmojis(emojiNames: string[], noteUserHost: string | null): Promise<Record<string, string>> {
-		const emojis = await Promise.all(emojiNames.map(x => this.populateEmoji(x, noteUserHost)));
+		const emojis = await promiseMap(emojiNames, async x => await this.populateEmoji(x, noteUserHost), { limit: 4 });
 		const res = {} as Record<string, string>;
 		for (let i = 0; i < emojiNames.length; i++) {
 			const resolvedEmoji = emojis[i];
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index c1c48d1708..489edcf5dd 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -60,6 +60,7 @@ import { CacheService } from '@/core/CacheService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -889,20 +890,16 @@ export class NoteCreateService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private async extractMentionedUsers(user: { host: MiUser['host']; }, tokens: mfm.MfmNode[]): Promise<MiUser[]> {
-		if (tokens == null) return [];
+	public async extractMentionedUsers(user: { host: MiUser['host']; }, tokens: mfm.MfmNode[]): Promise<MiUser[]> {
+		if (tokens == null || tokens.length === 0) return [];
 
-		const mentions = extractMentions(tokens);
-		let mentionedUsers = (await Promise.all(mentions.map(m =>
-			this.remoteUserResolveService.resolveUser(m.username, m.host ?? user.host).catch(() => null),
-		))).filter(x => x != null);
+		const allMentions = extractMentions(tokens);
+		const mentions = new Map(allMentions.map(m => [`${m.username.toLowerCase()}@${m.host?.toLowerCase()}`, m]));
 
-		// Drop duplicate users
-		mentionedUsers = mentionedUsers.filter((u, i, self) =>
-			i === self.findIndex(u2 => u.id === u2.id),
-		);
+		const allMentionedUsers = await promiseMap(mentions.values(), async m => await this.remoteUserResolveService.resolveUser(m.username, m.host ?? user.host).catch(() => null), { limit: 2 });
+		const mentionedUsers = new Map(allMentionedUsers.filter(u => u != null).map(u => [u.id, u]));
 
-		return mentionedUsers;
+		return Array.from(mentionedUsers.values());
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index df98283930..0e36cc1c63 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -3,18 +3,16 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { setImmediate } from 'node:timers/promises';
 import * as mfm from 'mfm-js';
-import { DataSource, In, IsNull, LessThan } from 'typeorm';
+import { DataSource, In } from 'typeorm';
 import * as Redis from 'ioredis';
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { UnrecoverableError } from 'bullmq';
-import { extractMentions } from '@/misc/extract-mentions.js';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
 import { extractHashtags } from '@/misc/extract-hashtags.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { MiNote } from '@/models/Note.js';
-import type { NoteEditsRepository, ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository, PollsRepository } from '@/models/_.js';
+import type { NoteEditsRepository, ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository, PollsRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiApp } from '@/models/App.js';
 import { concat } from '@/misc/prelude/array.js';
@@ -430,7 +428,7 @@ export class NoteEditService implements OnApplicationShutdown {
 
 			emojis = data.apEmojis ?? extractCustomEmojisFromMfm(combinedTokens);
 
-			mentionedUsers = data.apMentions ?? await this.extractMentionedUsers(user, combinedTokens);
+			mentionedUsers = data.apMentions ?? await this.noteCreateService.extractMentionedUsers(user, combinedTokens);
 		}
 
 		// if the host is media-silenced, custom emojis are not allowed
@@ -789,23 +787,6 @@ export class NoteEditService implements OnApplicationShutdown {
 		await this.searchService.indexNote(note);
 	}
 
-	@bindThis
-	private async extractMentionedUsers(user: { host: MiUser['host']; }, tokens: mfm.MfmNode[]): Promise<MiUser[]> {
-		if (tokens == null) return [];
-
-		const mentions = extractMentions(tokens);
-		let mentionedUsers = (await Promise.all(mentions.map(m =>
-			this.remoteUserResolveService.resolveUser(m.username, m.host ?? user.host).catch(() => null),
-		))).filter(x => x !== null) as MiUser[];
-
-		// Drop duplicate users
-		mentionedUsers = mentionedUsers.filter((u, i, self) =>
-			i === self.findIndex(u2 => u.id === u2.id),
-		);
-
-		return mentionedUsers;
-	}
-
 	@bindThis
 	private async pushToTl(note: MiNote, user: { id: MiUser['id']; host: MiUser['host']; }) {
 		if (!this.meta.enableFanoutTimeline) return;
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 070083784f..6af04dcba5 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -34,6 +34,7 @@ import { CacheService } from '@/core/CacheService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import type { DataSource } from 'typeorm';
 
 const FALLBACK = '\u2764';
@@ -298,7 +299,7 @@ export class ReactionService implements OnModuleInit {
 			if (['public', 'home', 'followers'].includes(note.visibility)) {
 				dm.addFollowersRecipe();
 			} else if (note.visibility === 'specified') {
-				const visibleUsers = await Promise.all(note.visibleUserIds.map(id => this.usersRepository.findOneBy({ id })));
+				const visibleUsers = await promiseMap(note.visibleUserIds, async id => await this.cacheService.findOptionalUserById(id), { limit: 2 });
 				for (const u of visibleUsers.filter(u => u && isRemoteUser(u))) {
 					dm.addDirectRecipe(u as MiRemoteUser);
 				}
diff --git a/packages/backend/src/core/activitypub/ApAudienceService.ts b/packages/backend/src/core/activitypub/ApAudienceService.ts
index 15c4546063..e6c00aa5e7 100644
--- a/packages/backend/src/core/activitypub/ApAudienceService.ts
+++ b/packages/backend/src/core/activitypub/ApAudienceService.ts
@@ -8,6 +8,7 @@ import promiseLimit from 'promise-limit';
 import type { MiRemoteUser, MiUser } from '@/models/User.js';
 import { concat, unique } from '@/misc/prelude/array.js';
 import { bindThis } from '@/decorators.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { getApIds } from './type.js';
 import { ApPersonService } from './models/ApPersonService.js';
 import type { ApObject } from './type.js';
@@ -37,10 +38,12 @@ export class ApAudienceService {
 
 		const others = unique(concat([toGroups.other, ccGroups.other]));
 
-		const limit = promiseLimit<MiUser | null>(2);
-		const mentionedUsers = (await Promise.all(
-			others.map(id => limit(() => this.apPersonService.resolvePerson(id, resolver).catch(() => null))),
-		)).filter(x => x != null);
+		const resolved = await promiseMap(others, async x => {
+			return await this.apPersonService.resolvePerson(x, resolver).catch(() => null) as MiUser | null;
+		}, {
+			limit: 2,
+		});
+		const mentionedUsers = resolved.filter(x => x != null);
 
 		// If no audience is specified, then assume public
 		if (
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index 506686cb46..a1510db1b3 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -5,7 +5,6 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { IsNull, Not } from 'typeorm';
-import promiseLimit from 'promise-limit';
 import type { MiLocalUser, MiRemoteUser } from '@/models/User.js';
 import type { NotesRepository, PollsRepository, NoteReactionsRepository, UsersRepository, FollowRequestsRepository, MiMeta, SkApFetchLog } from '@/models/_.js';
 import type { Config } from '@/config.js';
@@ -24,6 +23,7 @@ import { toArray } from '@/misc/prelude/array.js';
 import { isPureRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { AnyCollection, getApId, getNullableApId, IObjectWithId, isCollection, isCollectionOrOrderedCollection, isCollectionPage, isOrderedCollection, isOrderedCollectionPage } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
@@ -151,21 +151,20 @@ export class Resolver {
 		const recursionLimit = this.recursionLimit - this.history.size;
 		const batchLimit = Math.min(source.length, recursionLimit, itemLimit);
 
-		const limiter = promiseLimit<IObject>(concurrency);
-		const batch = await Promise.all(source
-			.slice(0, batchLimit)
-			.map(item => limiter(async () => {
-				if (sentFrom) {
-					// Use secureResolve to avoid re-fetching items that were included inline.
-					return await this.secureResolve(item, sentFrom, allowAnonymousItems);
-				} else if (allowAnonymousItems) {
-					return await this.resolveAnonymous(item);
-				} else {
-					// ID is required if we have neither sentFrom not allowAnonymousItems
-					const id = getApId(item);
-					return await this.resolve(id);
-				}
-			})));
+		const batch = await promiseMap(source.slice(0, batchLimit), async item => {
+			if (sentFrom) {
+				// Use secureResolve to avoid re-fetching items that were included inline.
+				return await this.secureResolve(item, sentFrom, allowAnonymousItems);
+			} else if (allowAnonymousItems) {
+				return await this.resolveAnonymous(item);
+			} else {
+				// ID is required if we have neither sentFrom not allowAnonymousItems
+				const id = getApId(item);
+				return await this.resolve(id);
+			}
+		}, {
+			limit: concurrency,
+		});
 
 		destination.push(...batch);
 	};
diff --git a/packages/backend/src/core/activitypub/models/ApMentionService.ts b/packages/backend/src/core/activitypub/models/ApMentionService.ts
index 2cd151fa04..1aab5894d3 100644
--- a/packages/backend/src/core/activitypub/models/ApMentionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApMentionService.ts
@@ -12,6 +12,7 @@ import { isMention } from '../type.js';
 import { Resolver } from '../ApResolverService.js';
 import { ApPersonService } from './ApPersonService.js';
 import type { IObject, IApMention } from '../type.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 @Injectable()
 export class ApMentionService {
@@ -24,12 +25,13 @@ export class ApMentionService {
 	public async extractApMentions(tags: IObject | IObject[] | null | undefined, resolver: Resolver): Promise<MiUser[]> {
 		const hrefs = unique(this.extractApMentionObjects(tags).map(x => x.href));
 
-		const limit = promiseLimit<MiUser | null>(2);
-		const mentionedUsers = (await Promise.all(
-			hrefs.map(x => limit(() => this.apPersonService.resolvePerson(x, resolver).catch(() => null))),
-		)).filter(x => x != null);
+		const mentionedUsers = await promiseMap(hrefs, async x => {
+			return await this.apPersonService.resolvePerson(x, resolver).catch(() => null) as MiUser | null;
+		}, {
+			limit: 2,
+		});
 
-		return mentionedUsers;
+		return mentionedUsers.filter(resolved => resolved != null);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 9b717af32d..690110a7f7 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -6,7 +6,6 @@
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
 import { In } from 'typeorm';
 import { UnrecoverableError } from 'bullmq';
-import promiseLimit from 'promise-limit';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository, PollsRepository, EmojisRepository, NotesRepository, MiMeta } from '@/models/_.js';
@@ -32,6 +31,7 @@ import { renderInlineError } from '@/misc/render-inline-error.js';
 import { extractMediaFromHtml } from '@/core/activitypub/misc/extract-media-from-html.js';
 import { extractMediaFromMfm } from '@/core/activitypub/misc/extract-media-from-mfm.js';
 import { getContentByType } from '@/core/activitypub/misc/get-content-by-type.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
 import { CustomEmojiService, encodeEmojiKey, isValidEmojiName } from '@/core/CustomEmojiService.js';
 import { TimeService } from '@/global/TimeService.js';
@@ -583,8 +583,8 @@ export class ApNoteService implements OnModuleInit {
 		const emojiKeys = eomjiTags.map(tag => encodeEmojiKey({ name: tag.name, host }));
 		const existingEmojis = await this.customEmojiService.emojisByKeyCache.fetchMany(emojiKeys);
 
-		return await Promise.all(eomjiTags.map(async tag => {
-			const name = tag.name;
+		return await promiseMap(eomjiTags, async tag => {
+			const name = tag.name.replaceAll(':', '');
 			tag.icon = toSingle(tag.icon);
 
 			const exists = existingEmojis.values.find(x => x.name === name);
@@ -627,7 +627,9 @@ export class ApNoteService implements OnModuleInit {
 				// _misskey_license が存在しなければ `null`
 				license: (tag._misskey_license?.freeText ?? null),
 			});
-		}));
+		}, {
+			limit: 4,
+		});
 	}
 
 	/**
@@ -691,7 +693,7 @@ export class ApNoteService implements OnModuleInit {
 			}
 		};
 
-		const results = await Promise.all(Array.from(quoteUris).map(u => resolveQuote(u)));
+		const results = await promiseMap(quoteUris, async u => resolveQuote(u), { limit: 2 });
 
 		// Success - return the quote
 		const quote = results.find(r => typeof(r) === 'object');
@@ -753,14 +755,10 @@ export class ApNoteService implements OnModuleInit {
 
 		// Resolve all files w/ concurrency 2.
 		// This prevents one big file from blocking the others.
-		const limiter = promiseLimit<MiDriveFile | null>(2);
-		const results = await Promise
-			.all(Array
-				.from(attachments.values())
-				.map(attach => limiter(async () => {
-					attach.sensitive ??= note.sensitive;
-					return await this.resolveImage(actor, attach);
-				})));
+		const results = await promiseMap(attachments.values(), async attach => {
+			attach.sensitive ??= note.sensitive;
+			return await this.resolveImage(actor, attach);
+		});
 
 		// Process results
 		let hasFileError = false;
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 692b04f1c8..5f31d529ad 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -48,7 +48,8 @@ import { renderInlineError } from '@/misc/render-inline-error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
-import { getApId, getApType, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js';
+import { promiseMap } from '@/misc/promise-map.js';
+import { getApId, getApType, getNullableApId, isActor, isPost, isPropertyValue } from '../type.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import { extractApHashtags } from './tag.js';
 import type { OnModuleInit } from '@nestjs/common';
@@ -933,35 +934,27 @@ export class ApPersonService implements OnModuleInit {
 
 		this.logger.info(`Updating the featured: ${user.uri}`);
 
-		const _resolver = resolver ?? this.apResolverService.createResolver();
-
-		// Resolve to (Ordered)Collection Object
-		const collection = user.featured ? await _resolver.resolveCollection(user.featured, true, user.uri).catch(err => {
-			// Permanent error implies hidden or inaccessible, which is a normal thing.
-			if (isRetryableError(err)) {
-				this.logger.warn(`Failed to update featured notes: ${renderInlineError(err)}`);
-			}
-
-			return null;
-		}) : null;
-		if (!collection) return;
-
-		if (!isCollectionOrOrderedCollection(collection)) throw new UnrecoverableError(`failed to update user ${user.uri}: featured ${user.featured} is not Collection or OrderedCollection`);
-
-		// Resolve to Object(may be Note) arrays
-		const unresolvedItems = isCollection(collection) ? collection.items : collection.orderedItems;
-		const items = await Promise.all(toArray(unresolvedItems).map(x => _resolver.resolve(x)));
+		resolver ??= this.apResolverService.createResolver();
 
 		// Resolve and regist Notes
-		const limit = promiseLimit<MiNote | null>(2);
 		const maxPinned = (await this.roleService.getUserPolicies(user.id)).pinLimit;
-		const featuredNotes = await Promise.all(items
-			.filter(item => getApType(item) === 'Note')	// TODO: Noteでなくてもいいかも
-			.slice(0, maxPinned)
-			.map(item => limit(() => this.apNoteService.resolveNote(item, {
-				resolver: _resolver,
-				sentFrom: user.uri,
-			}))));
+		const items = await resolver.resolveCollectionItems(user.featured, true, user.uri, maxPinned, 2);
+		const featuredNotes = await promiseMap(items, async item => {
+			const itemId = getNullableApId(item);
+			if (itemId && isPost(item)) {
+				try {
+					return await this.apNoteService.resolveNote(item, {
+						resolver: resolver,
+						sentFrom: user.uri,
+					});
+				} catch (err) {
+					this.logger.warn(`Couldn't fetch pinned note ${itemId} for user ${user.id} (@${user.username}@${user.host}): ${renderInlineError(err)}`);
+				}
+			}
+			return null;
+		}, {
+			limit: 2,
+		});
 
 		await this.db.transaction(async transactionalEntityManager => {
 			await transactionalEntityManager.delete(MiUserNotePining, { userId: user.id });
diff --git a/packages/backend/src/core/chart/core.ts b/packages/backend/src/core/chart/core.ts
index 2f1ed27132..883a72139f 100644
--- a/packages/backend/src/core/chart/core.ts
+++ b/packages/backend/src/core/chart/core.ts
@@ -15,6 +15,7 @@ import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/misc
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import { MiRepository, miRepository } from '@/models/_.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import type { DataSource, Repository } from 'typeorm';
 import type { Lock } from 'redis-lock';
 
@@ -526,13 +527,13 @@ export default abstract class Chart<T extends Schema> {
 
 		const groups = removeDuplicates(this.buffer.map(log => log.group));
 
-		await Promise.all(
-			groups.map(group =>
-				Promise.all([
-					this.claimCurrentLog(group, 'hour'),
-					this.claimCurrentLog(group, 'day'),
-				]).then(([logHour, logDay]) =>
-					update(logHour, logDay))));
+		await promiseMap(groups, async group => {
+			const logHour = await this.claimCurrentLog(group, 'hour');
+			const logDay = await this.claimCurrentLog(group, 'day');
+			await update(logHour, logDay);
+		}, {
+			limit: 2,
+		});
 	}
 
 	@bindThis
@@ -564,7 +565,7 @@ export default abstract class Chart<T extends Schema> {
 			]);
 		};
 
-		return Promise.all([
+		return await Promise.all([
 			this.claimCurrentLog(group, 'hour'),
 			this.claimCurrentLog(group, 'day'),
 		]).then(([logHour, logDay]) =>
diff --git a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
index 3cdafe48ad..3d879b0dff 100644
--- a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
@@ -5,12 +5,13 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { NoteFavoritesRepository } from '@/models/_.js';
+import type { MiNote, NoteFavoritesRepository } from '@/models/_.js';
 import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
+import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from './NoteEntityService.js';
 
 @Injectable()
@@ -28,6 +29,7 @@ export class NoteFavoriteEntityService {
 	public async pack(
 		src: MiNoteFavorite['id'] | MiNoteFavorite,
 		me?: { id: MiUser['id'] } | null | undefined,
+		notes?: Map<string, Packed<'Note'>>,
 	) {
 		const favorite = typeof src === 'object' ? src : await this.noteFavoritesRepository.findOneByOrFail({ id: src });
 
@@ -35,15 +37,18 @@ export class NoteFavoriteEntityService {
 			id: favorite.id,
 			createdAt: this.idService.parse(favorite.id).date.toISOString(),
 			noteId: favorite.noteId,
-			note: await this.noteEntityService.pack(favorite.note ?? favorite.noteId, me),
+			note: notes?.get(favorite.noteId) ?? await this.noteEntityService.pack(favorite.note ?? favorite.noteId, me),
 		};
 	}
 
 	@bindThis
-	public packMany(
-		favorites: any[],
+	public async packMany(
+		favorites: (MiNoteFavorite & { note: MiNote })[],
 		me: { id: MiUser['id'] },
 	) {
-		return Promise.all(favorites.map(x => this.pack(x, me)));
+		const packedNotes = await this.noteEntityService.packMany(favorites.map(f => f.note), me);
+		const packedNotesMap = new Map(packedNotes.map(n => [n.id, n]));
+
+		return Promise.all(favorites.map(x => this.pack(x, me, packedNotesMap)));
 	}
 }
diff --git a/packages/backend/src/core/entities/PageEntityService.ts b/packages/backend/src/core/entities/PageEntityService.ts
index 3106001676..5a56b9cec5 100644
--- a/packages/backend/src/core/entities/PageEntityService.ts
+++ b/packages/backend/src/core/entities/PageEntityService.ts
@@ -105,10 +105,13 @@ export class PageEntityService {
 			font: page.font,
 			script: page.script,
 			eyeCatchingImageId: page.eyeCatchingImageId,
-			eyeCatchingImage: page.eyeCatchingImageId ? await this.driveFileEntityService.pack(page.eyeCatchingImageId) : null,
-			attachedFiles: this.driveFileEntityService.packMany((await Promise.all(attachedFiles)).filter(x => x != null)),
+			eyeCatchingImage: page.eyeCatchingImageId ? this.driveFileEntityService.pack(page.eyeCatchingImageId) : null,
+			attachedFiles: Promise
+				.all(attachedFiles)
+				.then(fs => fs.filter(x => x != null))
+				.then(fs => this.driveFileEntityService.packMany(fs)),
 			likedCount: page.likedCount,
-			isLiked: meId ? await this.pageLikesRepository.exists({ where: { pageId: page.id, userId: meId } }) : undefined,
+			isLiked: meId ? this.pageLikesRepository.exists({ where: { pageId: page.id, userId: meId } }) : undefined,
 		});
 	}
 
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index bacc3c3fde..5ea53c32ba 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -645,6 +645,7 @@ export class UserEntityService implements OnModuleInit {
 			...(isDetailed ? {
 				url: profile!.url,
 				uri: user.uri,
+				// TODO hints for all of this
 				movedTo: user.movedToUri ? Promise.resolve(opts.userIdsByUri?.get(user.movedToUri) ?? this.apPersonService.resolvePerson(user.movedToUri).then(user => user.id).catch(() => null)) : null,
 				movedToUri: user.movedToUri,
 				// alsoKnownAs moved from packedUserDetailedNotMeOnly for privacy
diff --git a/packages/backend/src/misc/promise-map.ts b/packages/backend/src/misc/promise-map.ts
new file mode 100644
index 0000000000..e3fc5f1d65
--- /dev/null
+++ b/packages/backend/src/misc/promise-map.ts
@@ -0,0 +1,107 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import promiseLimit from 'promise-limit';
+
+/**
+ * Pipes a stream of values through an async mapping callback to produce a new stream of results.
+ * Avoids extra work by bailing out if any promise rejects or the caller stops iterating the stream.
+ *
+ * Can optionally accept a concurrency limit and/or abort signal to further customize behavior.
+ * If a limit is provided, then no more than that many promises will execute at once.
+ * If a signal is provided, then all promises will terminate when the signal aborts.
+ * A signal cannot be provided without a limit, as that would be a no-op.
+ */
+export async function promiseMap<Input, Output>(
+	values: Iterable<Input> | AsyncIterable<Input>,
+	callback: (value: Input, index: number) => Promise<Output>,
+	opts?: {
+		limit: number | ReturnType<typeof promiseLimit<void>>;
+		signal?: AbortSignal;
+	},
+): Promise<Output[]> {
+	// Parse the configured limit or create no-op
+	const limiter = createLimiter(opts?.limit);
+
+	// Internal state
+	const outputs: Output[] = [];
+	const errors: unknown[] = [];
+	const queue: Promise<void>[] = [];
+
+	let count = 0;
+	for await (const input of values) {
+		// Capture the destination index to make sure items are returned in the same order
+		const index = count;
+		count++;
+
+		// Stop when any promise fails
+		if (errors.length > 0) {
+			break;
+		}
+
+		// Kick off the next item
+		const promise = limiter(async () => {
+			// Check for rejection without throwing any new errors
+			if (errors.length > 0) return;
+
+			try {
+				// Checking the abort signal here covers all locations.
+				// 1. It bails the callback directly.
+				// 2. The error is written to errors, which breaks out of the loop
+				opts?.signal?.throwIfAborted();
+
+				// Populate the next value
+				outputs[index] = await callback(input, index);
+			} catch (err) {
+				errors.push(err);
+			}
+		});
+
+		// But don't forget about it!
+		queue.push(promise);
+	}
+
+	// Wait for everything to complete
+	await Promise.allSettled(queue);
+
+	// Failed - consolidate and throw errors
+	if (errors.length > 0) {
+		throwResults(errors);
+	}
+
+	// Success - return results
+	return outputs;
+}
+
+type Limiter = (cb: () => Promise<void>) => Promise<void>;
+
+function createLimiter(limit: undefined | number | ReturnType<typeof promiseLimit<void>>): Limiter {
+	if (!limit) {
+		return cb => cb();
+	}
+
+	if (typeof limit === 'number') {
+		return promiseLimit<void>(limit);
+	}
+
+	return limit;
+}
+
+function throwResults(errors: unknown[]): never {
+	if (errors.length === 0) {
+		// Shouldn't happen
+		throw new Error('Mapping promise rejected');
+	}
+
+	if (errors.length === 1) {
+		if (errors[0] instanceof Error) {
+			throw errors[0];
+		} else {
+			throw new Error('Mapping promise rejected', { cause: errors[0] });
+		}
+	}
+
+	throw new AggregateError(errors);
+}
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index e73de15241..de9d588bfa 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -14,7 +14,7 @@ import accepts from 'accepts';
 import vary from 'vary';
 import secureJson from 'secure-json-parse';
 import { DI } from '@/di-symbols.js';
-import type { FollowingsRepository, NotesRepository, EmojisRepository, NoteReactionsRepository, UserProfilesRepository, UserNotePiningsRepository, UsersRepository, FollowRequestsRepository, MiMeta } from '@/models/_.js';
+import type { FollowingsRepository, NotesRepository, EmojisRepository, NoteReactionsRepository, UserProfilesRepository, UserNotePiningsRepository, UsersRepository, FollowRequestsRepository, MiMeta, MiUserNotePining } from '@/models/_.js';
 import * as url from '@/misc/prelude/url.js';
 import type { Config } from '@/config.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
@@ -40,6 +40,7 @@ import { CustomEmojiService, encodeEmojiKey } from '@/core/CustomEmojiService.js
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify';
 import type { FindOptionsWhere } from 'typeorm';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
 const LD_JSON = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
@@ -418,7 +419,7 @@ export class ActivityPubServerService {
 			const inStock = followings.length === limit + 1;
 			if (inStock) followings.pop();
 
-			const renderedFollowers = await Promise.all(followings.map(following => this.apRendererService.renderFollowUser(following.followerId)));
+			const renderedFollowers = await promiseMap(followings, async following => this.apRendererService.renderFollowUser(following.followerId), { limit: 4 });
 			const rendered = this.apRendererService.renderOrderedCollectionPage(
 				`${partOf}?${url.query({
 					page: 'true',
@@ -515,7 +516,7 @@ export class ActivityPubServerService {
 			const inStock = followings.length === limit + 1;
 			if (inStock) followings.pop();
 
-			const renderedFollowees = await Promise.all(followings.map(following => this.apRendererService.renderFollowUser(following.followeeId)));
+			const renderedFollowees = await promiseMap(followings, async following => this.apRendererService.renderFollowUser(following.followeeId), { limit: 4 });
 			const rendered = this.apRendererService.renderOrderedCollectionPage(
 				`${partOf}?${url.query({
 					page: 'true',
@@ -555,10 +556,7 @@ export class ActivityPubServerService {
 
 		const userId = request.params.user;
 
-		const user = await this.usersRepository.findOneBy({
-			id: userId,
-			host: IsNull(),
-		});
+		const user = await this.cacheService.findLocalUserById(userId);
 
 		if (user == null) {
 			reply.code(404);
@@ -568,13 +566,14 @@ export class ActivityPubServerService {
 		const pinings = await this.userNotePiningsRepository.find({
 			where: { userId: user.id },
 			order: { id: 'DESC' },
-		});
+			relations: { note: true },
+		}) as (MiUserNotePining & { note: MiNote })[];
 
-		const pinnedNotes = (await Promise.all(pinings.map(pining =>
-			this.notesRepository.findOneByOrFail({ id: pining.noteId }))))
+		const pinnedNotes = pinings
+			.map(pin => pin.note)
 			.filter(note => !note.localOnly && ['public', 'home'].includes(note.visibility) && !isPureRenote(note));
 
-		const renderedNotes = await Promise.all(pinnedNotes.map(note => this.apRendererService.renderNote(note, user)));
+		const renderedNotes = await promiseMap(pinnedNotes, async note => await this.apRendererService.renderNote(note, user), { limit: 4 });
 
 		const rendered = this.apRendererService.renderOrderedCollection(
 			`${this.config.url}/users/${userId}/collections/featured`,
@@ -664,7 +663,7 @@ export class ActivityPubServerService {
 
 			if (sinceId) notes.reverse();
 
-			const activities = await Promise.all(notes.map(note => this.packActivity(note, user)));
+			const activities = await promiseMap(notes, async note => await this.packActivity(note, user));
 			const rendered = this.apRendererService.renderOrderedCollectionPage(
 				`${partOf}?${url.query({
 					page: 'true',
@@ -1092,14 +1091,8 @@ export class ActivityPubServerService {
 			// check if the following exists.
 
 			const [follower, followee] = await Promise.all([
-				this.usersRepository.findOneBy({
-					id: request.params.follower,
-					host: IsNull(),
-				}),
-				this.usersRepository.findOneBy({
-					id: request.params.followee,
-					host: Not(IsNull()),
-				}),
+				this.cacheService.findLocalUserById(request.params.follower),
+				this.cacheService.findRemoteUserById(request.params.followee),
 			]) as [MiLocalUser | MiRemoteUser | null, MiLocalUser | MiRemoteUser | null];
 
 			if (follower == null || followee == null) {
@@ -1134,14 +1127,8 @@ export class ActivityPubServerService {
 			}
 
 			const [follower, followee] = await Promise.all([
-				this.usersRepository.findOneBy({
-					id: followRequest.followerId,
-					host: IsNull(),
-				}),
-				this.usersRepository.findOneBy({
-					id: followRequest.followeeId,
-					host: Not(IsNull()),
-				}),
+				this.cacheService.findLocalUserById(followRequest.followerId),
+				this.cacheService.findRemoteUserById(followRequest.followeeId),
 			]) as [MiLocalUser | MiRemoteUser | null, MiLocalUser | MiRemoteUser | null];
 
 			if (follower == null || followee == null) {
diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts
index 47b4e2f1bc..ee8018dfab 100644
--- a/packages/backend/src/server/api/GetterService.ts
+++ b/packages/backend/src/server/api/GetterService.ts
@@ -12,6 +12,7 @@ import { isRemoteUser, isLocalUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
 import { CacheService } from '@/core/CacheService.js';
 import { bindThis } from '@/decorators.js';
+import { CacheService } from '@/core/CacheService.js';
 
 @Injectable()
 export class GetterService {
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
index 8a66e004d7..19df5b1355 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
@@ -9,6 +9,7 @@ import type { FollowingsRepository, UsersRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { QueueService } from '@/core/QueueService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -48,10 +49,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				},
 			]);
 
-			const pairs = await Promise.all(followings.map(f => Promise.all([
-				this.usersRepository.findOneByOrFail({ id: f.followerId }),
-				this.usersRepository.findOneByOrFail({ id: f.followeeId }),
-			]).then(([from, to]) => [{ id: from.id }, { id: to.id }])));
+			const pairs = await promiseMap(followings, async f => {
+				const [from, to] = await Promise.all([
+					this.usersRepository.findOneByOrFail({ id: f.followerId }),
+					this.usersRepository.findOneByOrFail({ id: f.followeeId }),
+				]);
+
+				return [{ id: from.id }, { id: to.id }];
+			});
 
 			await this.moderationLogService.log(me, 'severFollowRelations', {
 				host: ps.host,
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index 49ce0f8bd4..00f4413c74 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -300,14 +300,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const [user, profile] = await Promise.all([
-				this.usersRepository.findOneBy({ id: ps.userId }),
-				this.userProfilesRepository.findOneBy({ userId: ps.userId }),
+				this.cacheService.findUserById(ps.userId),
+				this.cacheService.userProfileCache.fetch(ps.userId),
 			]);
 
-			if (user == null || profile == null) {
-				throw new Error('user not found');
-			}
-
 			const isModerator = await this.roleService.isModerator(user);
 			const isAdministrator = await this.roleService.isAdministrator(user);
 			const isSilenced = user.isSilenced || !(await this.roleService.getUserPolicies(user.id)).canPublicNote;
diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts
index ed7d1c9daa..c370143d4f 100644
--- a/packages/backend/src/server/api/endpoints/antennas/list.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/list.ts
@@ -8,6 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { AntennasRepository } from '@/models/_.js';
 import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['antennas', 'account'],
@@ -52,7 +53,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				userId: me.id,
 			});
 
-			return await Promise.all(antennas.map(x => this.antennaEntityService.pack(x)));
+			return await promiseMap(antennas, async x => await this.antennaEntityService.pack(x), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index 415f7ee29a..d25ba82593 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -9,6 +9,7 @@ import type { ChannelFollowingsRepository } from '@/models/_.js';
 import { QueryService } from '@/core/QueryService.js';
 import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['channels', 'account'],
@@ -69,7 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit)
 				.getMany();
 
-			return await Promise.all(followings.map(x => this.channelEntityService.pack(x.followeeId, me)));
+			return await promiseMap(followings, async x => await this.channelEntityService.pack(x.followeeId, me), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts
index 72a1cc0cf9..8cfe7a65fb 100644
--- a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts
+++ b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts
@@ -8,6 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { ChannelFavoritesRepository } from '@/models/_.js';
 import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['channels', 'account'],
@@ -56,7 +57,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const favorites = await query
 				.getMany();
 
-			return await Promise.all(favorites.map(x => this.channelEntityService.pack(x.channel!, me)));
+			return await promiseMap(favorites, async x => await this.channelEntityService.pack(x.channel!, me), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/channels/search.ts b/packages/backend/src/server/api/endpoints/channels/search.ts
index 9476c494a3..6483a08116 100644
--- a/packages/backend/src/server/api/endpoints/channels/search.ts
+++ b/packages/backend/src/server/api/endpoints/channels/search.ts
@@ -11,6 +11,7 @@ import type { ChannelsRepository } from '@/models/_.js';
 import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['channels'],
@@ -75,7 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit)
 				.getMany();
 
-			return await Promise.all(channels.map(x => this.channelEntityService.pack(x, me)));
+			return await promiseMap(channels, async x => await this.channelEntityService.pack(x, me), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts
index 525cb8c5d6..bd2ae8bd18 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders.ts
@@ -10,6 +10,7 @@ import { QueryService } from '@/core/QueryService.js';
 import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['drive'],
@@ -71,7 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 			const folders = await query.limit(ps.limit).getMany();
 
-			return await Promise.all(folders.map(folder => this.driveFolderEntityService.pack(folder)));
+			return await promiseMap(folders, async folder => await this.driveFolderEntityService.pack(folder), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
index 950aeacea0..2c4cf857c4 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
@@ -9,6 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { DriveFoldersRepository } from '@/models/_.js';
 import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['drive'],
@@ -58,7 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				parentId: ps.parentId ?? IsNull(),
 			});
 
-			return await Promise.all(folders.map(folder => this.driveFolderEntityService.pack(folder)));
+			return await promiseMap(folders, async folder => await this.driveFolderEntityService.pack(folder), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
index f280dd8986..7193cf993f 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -13,6 +13,7 @@ import { IdService } from '@/core/IdService.js';
 import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { TimeService } from '@/global/TimeService.js';
+import { In } from 'typeorm';
 
 export const meta = {
 	tags: ['gallery'],
@@ -66,12 +67,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private readonly timeService: TimeService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const files = (await Promise.all(ps.fileIds.map(fileId =>
-				this.driveFilesRepository.findOneBy({
-					id: fileId,
-					userId: me.id,
-				}),
-			))).filter(x => x != null);
+			const files = await this.driveFilesRepository.findBy({
+				id: In(ps.fileIds),
+				userId: me.id,
+			});
 
 			if (files.length === 0) {
 				throw new Error('no files specified');
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index 1be9f6a553..160d3c1cc3 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -12,6 +12,7 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { RoleService } from '@/core/RoleService.js';
 import { TimeService } from '@/global/TimeService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	requireCredential: false,
@@ -97,7 +98,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// 2. A span of more than "limit" consecutive non-trendable users may cause the pagination to stop early.
 			// Unfortunately, there's no better solution unless we refactor role policies to be persisted to the DB.
 			if (ps.trending) {
-				const usersWithRoles = await Promise.all(users.map(async u => [u, await this.roleService.getUserPolicies(u)] as const));
+				const usersWithRoles = await promiseMap(users, async u => [u, await this.roleService.getUserPolicies(u)] as const, { limit: 4 });
 				users = usersWithRoles
 					.filter(([,p]) => p.canTrend)
 					.map(([u]) => u);
diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
index 447fd18dcf..ad9adac304 100644
--- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
@@ -9,6 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { AccessTokensRepository } from '@/models/_.js';
 import { AppEntityService } from '@/core/entities/AppEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	requireCredential: true,
@@ -88,9 +89,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				},
 			});
 
-			return await Promise.all(tokens.map(token => this.appEntityService.pack(token.appId!, me, {
+			return await promiseMap(tokens, async token => await this.appEntityService.pack(token.appId!, me, {
 				detail: true,
-			})));
+			}), {
+				limit: 4,
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts
index 49d47e1624..e1b1be3f73 100644
--- a/packages/backend/src/server/api/endpoints/i/favorites.ts
+++ b/packages/backend/src/server/api/endpoints/i/favorites.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { NoteFavoritesRepository } from '@/models/_.js';
+import type { MiNote, MiNoteFavorite, NoteFavoritesRepository } from '@/models/_.js';
 import { QueryService } from '@/core/QueryService.js';
 import { NoteFavoriteEntityService } from '@/core/entities/NoteFavoriteEntityService.js';
 import { DI } from '@/di-symbols.js';
@@ -56,11 +56,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.noteFavoritesRepository.createQueryBuilder('favorite'), ps.sinceId, ps.untilId)
 				.andWhere('favorite.userId = :meId', { meId: me.id })
-				.leftJoinAndSelect('favorite.note', 'note');
+				.innerJoinAndSelect('favorite.note', 'note');
 
 			const favorites = await query
 				.limit(ps.limit)
-				.getMany();
+				.getMany() as (MiNoteFavorite & { note: MiNote })[];
 
 			return await this.noteFavoriteEntityService.packMany(favorites, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts
index 8b39b87a7f..3094747a74 100644
--- a/packages/backend/src/server/api/endpoints/i/signin-history.ts
+++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts
@@ -9,6 +9,7 @@ import type { SigninsRepository } from '@/models/_.js';
 import { QueryService } from '@/core/QueryService.js';
 import { SigninEntityService } from '@/core/entities/SigninEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	requireCredential: true,
@@ -56,7 +57,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const history = await query.limit(ps.limit).getMany();
 
-			return await Promise.all(history.map(record => this.signinEntityService.pack(record)));
+			return await promiseMap(history, async record => await this.signinEntityService.pack(record), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts
index 3fb0d1b3b7..58996f60e7 100644
--- a/packages/backend/src/server/api/endpoints/my/apps.ts
+++ b/packages/backend/src/server/api/endpoints/my/apps.ts
@@ -8,6 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { AppsRepository } from '@/models/_.js';
 import { AppEntityService } from '@/core/entities/AppEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['account', 'app'],
@@ -60,9 +61,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				skip: ps.offset,
 			});
 
-			return await Promise.all(apps.map(app => this.appEntityService.pack(app, me, {
+			return await promiseMap(apps, async app => await this.appEntityService.pack(app, me, {
 				detail: true,
-			})));
+			}), {
+				limit: 4,
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/schedule/list.ts b/packages/backend/src/server/api/endpoints/notes/schedule/list.ts
index 374a4248d1..bfc0010014 100644
--- a/packages/backend/src/server/api/endpoints/notes/schedule/list.ts
+++ b/packages/backend/src/server/api/endpoints/notes/schedule/list.ts
@@ -15,6 +15,8 @@ import { QueryService } from '@/core/QueryService.js';
 import { Packed } from '@/misc/json-schema.js';
 import { noteVisibilities } from '@/types.js';
 import { bindThis } from '@/decorators.js';
+import { promiseMap } from '@/misc/promise-map.js';
+import { In } from 'typeorm';
 
 export const meta = {
 	tags: ['notes'],
@@ -95,6 +97,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const query = this.queryService.makePaginationQuery(this.noteScheduleRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
 				.andWhere('note.userId = :userId', { userId: me.id });
 			const scheduleNotes = await query.limit(ps.limit).getMany();
+			const refNoteIds = scheduleNotes.flatMap(s => [s.note.reply, s.note.renote]).filter(id => id != null);
+			const refNotesList = await this.notesRepository.findBy({ id: In(refNoteIds) });
+			const refNotesMap = new Map(refNotesList.map(n => [n.id, n]));
 			const user = await this.userEntityService.pack(me, me);
 			const scheduleNotesPack: {
 				id: string;
@@ -111,9 +116,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				};
 				userId: string;
 				scheduledAt: string;
-			}[] = await Promise.all(scheduleNotes.map(async (item: MiNoteSchedule) => {
-				const renote = await this.fetchNote(item.note.renote, me);
-				const reply = await this.fetchNote(item.note.reply, me);
+			}[] = await promiseMap(scheduleNotes, async (item: MiNoteSchedule) => {
+				const renote = await this.fetchNote(item.note.renote, me, refNotesMap);
+				const reply = await this.fetchNote(item.note.reply, me, refNotesMap);
 
 				return {
 					...item,
@@ -136,7 +141,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						poll: item.note.poll ? await this.fillPoll(item.note.poll) : undefined,
 					},
 				};
-			}));
+			}, {
+				limit: 4,
+			});
 
 			return scheduleNotesPack;
 		});
@@ -146,9 +153,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	private async fetchNote(
 		id: MiNote['id'] | null | undefined,
 		me: MiUser,
+		hint?: Map<string, MiNote>,
 	): Promise<Packed<'Note'> | null> {
 		if (id) {
-			const note = await this.notesRepository.findOneBy({ id });
+			const note = hint?.get(id) ?? await this.notesRepository.findOneBy({ id });
 			if (note) {
 				note.reactionAndUserPairCache ??= [];
 				return await this.noteEntityService.pack(note, me);
diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts
index 1efab2afca..ab4a8bf991 100644
--- a/packages/backend/src/server/api/endpoints/users.ts
+++ b/packages/backend/src/server/api/endpoints/users.ts
@@ -12,6 +12,7 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { RoleService } from '@/core/RoleService.js';
 import { TimeService } from '@/global/TimeService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import type { SelectQueryBuilder } from 'typeorm';
 
 export const meta = {
@@ -113,7 +114,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// 1. It may return less than "limit" results.
 			// 2. A span of more than "limit" consecutive non-trendable users may cause the pagination to stop early.
 			// Unfortunately, there's no better solution unless we refactor role policies to be persisted to the DB.
-			const usersWithRoles = await Promise.all(allUsers.map(async u => [u, await this.roleService.getUserPolicies(u)] as const));
+			const usersWithRoles = await promiseMap(allUsers, async u => [u, await this.roleService.getUserPolicies(u)] as const, { limit: 4 });
 			const users = usersWithRoles
 				.filter(([,p]) => p.canTrend)
 				.map(([u]) => u);
diff --git a/packages/backend/src/server/api/endpoints/users/lists/list.ts b/packages/backend/src/server/api/endpoints/users/lists/list.ts
index 976da9512d..2599ea0e34 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/list.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/list.ts
@@ -9,6 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { UserListEntityService } from '@/core/entities/UserListEntityService.js';
 import { ApiError } from '@/server/api/error.js';
 import { DI } from '@/di-symbols.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 export const meta = {
 	tags: ['lists', 'account'],
@@ -88,7 +89,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				isPublic: true,
 			});
 
-			return await Promise.all(userLists.map(x => this.userListEntityService.pack(x, me?.id)));
+			return await promiseMap(userLists, async x => await this.userListEntityService.pack(x, me?.id), { limit: 4 });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
index 1d2a1db625..287bb9036e 100644
--- a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
@@ -23,6 +23,7 @@ import { parseTimelineArgs, TimelineArgs, toBoolean } from './argsUtils.js';
 import { convertAnnouncement, convertAttachment, MastodonConverters, convertRelationship } from './MastodonConverters.js';
 import type { Entity } from 'megalodon';
 import type { FastifyInstance, FastifyPluginOptions } from 'fastify';
+import { promiseMap } from '@/misc/promise-map.js';
 
 @Injectable()
 export class MastodonApiServerService {
@@ -178,7 +179,7 @@ export class MastodonApiServerService {
 			const { client, me } = await this.clientService.getAuthClient(_request);
 
 			const data = await client.getBookmarks(parseTimelineArgs(_request.query));
-			const response = await Promise.all(data.data.map((status) => this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async (status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			return reply.send(response);
 		});
@@ -200,7 +201,7 @@ export class MastodonApiServerService {
 				userId: me.id,
 			};
 			const data = await client.getFavourites(args);
-			const response = await Promise.all(data.data.map((status) => this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async (status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			return reply.send(response);
 		});
@@ -209,7 +210,7 @@ export class MastodonApiServerService {
 			const client = this.clientService.getClient(_request);
 
 			const data = await client.getMutes(parseTimelineArgs(_request.query));
-			const response = await Promise.all(data.data.map((account) => this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async (account) => await this.mastoConverters.convertAccount(account), { limit: 4 });
 
 			return reply.send(response);
 		});
@@ -218,7 +219,7 @@ export class MastodonApiServerService {
 			const client = this.clientService.getClient(_request);
 
 			const data = await client.getBlocks(parseTimelineArgs(_request.query));
-			const response = await Promise.all(data.data.map((account) => this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async (account) => await this.mastoConverters.convertAccount(account), { limit: 4 });
 
 			return reply.send(response);
 		});
@@ -228,7 +229,7 @@ export class MastodonApiServerService {
 
 			const limit = _request.query.limit ? parseInt(_request.query.limit) : 20;
 			const data = await client.getFollowRequests(limit);
-			const response = await Promise.all(data.data.map((account) => this.mastoConverters.convertAccount(account as Entity.Account)));
+			const response = await promiseMap(data.data, async (account) => await this.mastoConverters.convertAccount(account), { limit: 4 });
 
 			return reply.send(response);
 		});
diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
index 963bde3726..6abd918bc6 100644
--- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
@@ -24,6 +24,7 @@ import { GetterService } from '@/server/api/GetterService.js';
 import { appendContentWarning } from '@/misc/append-content-warning.js';
 import { isRenote } from '@/misc/is-renote.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import { promiseMap } from '@/misc/promise-map.js';
 
 // Missing from Megalodon apparently
 // https://docs.joinmastodon.org/entities/StatusEdit/
@@ -283,11 +284,15 @@ export class MastodonConverters {
 			});
 		});
 
-		const mentions = Promise.all(note.mentions.map(p =>
-			this.getUser(p)
-				.then(u => this.encode(u, mentionedRemoteUsers))
-				.catch(() => null)))
-			.then((p: (Entity.Mention | null)[]) => p.filter(m => m != null));
+		const mentions = promiseMap(note.mentions, async p => {
+			try {
+				const u = await this.getUser(p);
+				return this.encode(u, mentionedRemoteUsers);
+			} catch {
+				return null;
+			}
+		}, { limit: 4 })
+			.then((p: Entity.Mention[]) => p.filter(m => m));
 
 		const tags = note.tags.map(tag => {
 			return {
@@ -363,7 +368,7 @@ export class MastodonConverters {
 	public async convertConversation(conversation: Entity.Conversation, me: MiLocalUser | null): Promise<MastodonEntity.Conversation> {
 		return {
 			id: conversation.id,
-			accounts: await Promise.all(conversation.accounts.map((a: Entity.Account) => this.convertAccount(a))),
+			accounts: await promiseMap(conversation.accounts, async (a: Entity.Account) => await this.convertAccount(a), { limit: 4 }),
 			last_status: conversation.last_status ? await this.convertStatus(conversation.last_status, me) : null,
 			unread: conversation.unread,
 		};
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 0d22ac8ab5..260ab58ece 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -12,6 +12,7 @@ import type { AccessTokensRepository, UserProfilesRepository } from '@/models/_.
 import { attachMinMaxPagination } from '@/server/api/mastodon/pagination.js';
 import { MastodonConverters, convertRelationship, convertFeaturedTag, convertList } from '../MastodonConverters.js';
 import type { FastifyInstance } from 'fastify';
+import { promiseMap } from '@/misc/promise-map.js';
 
 interface ApiAccountMastodonRoute {
 	Params: { id?: string },
@@ -188,7 +189,7 @@ export class ApiAccountMastodon {
 			const { client, me } = await this.clientService.getAuthClient(request);
 			const args = parseTimelineArgs(request.query);
 			const data = await client.getAccountStatuses(request.params.id, args);
-			const response = await Promise.all(data.data.map(async (status) => await this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async status => await this.mastoConverters.convertStatus(status, me), { limit: 2 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -212,7 +213,7 @@ export class ApiAccountMastodon {
 				request.params.id,
 				parseTimelineArgs(request.query),
 			);
-			const response = await Promise.all(data.data.map(async (account) => await this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async account => await this.mastoConverters.convertAccount(account), { limit: 2 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -226,7 +227,7 @@ export class ApiAccountMastodon {
 				request.params.id,
 				parseTimelineArgs(request.query),
 			);
-			const response = await Promise.all(data.data.map(async (account) => await this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async account => await this.mastoConverters.convertAccount(account), { limit: 2 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
index f6cc59e782..dc2c0fefdc 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
@@ -10,6 +10,7 @@ import { MastodonConverters } from '@/server/api/mastodon/MastodonConverters.js'
 import { attachMinMaxPagination } from '@/server/api/mastodon/pagination.js';
 import { MastodonClientService } from '../MastodonClientService.js';
 import type { FastifyInstance } from 'fastify';
+import { promiseMap } from '@/misc/promise-map.js';
 
 interface ApiNotifyMastodonRoute {
 	Params: {
@@ -29,7 +30,7 @@ export class ApiNotificationsMastodon {
 		fastify.get<ApiNotifyMastodonRoute>('/v1/notifications', async (request, reply) => {
 			const { client, me } = await this.clientService.getAuthClient(request);
 			const data = await client.getNotifications(parseTimelineArgs(request.query));
-			const notifications = await Promise.all(data.data.map(n => this.mastoConverters.convertNotification(n, me)));
+			const notifications = await promiseMap(data.data, async n => await this.mastoConverters.convertNotification(n, me), { limit: 4 });
 			const response: MastodonEntity.Notification[] = [];
 			for (const notification of notifications) {
 				// Notifications for inaccessible notes will be null and should be ignored
diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts
index 0d1df8c06b..89da9daef9 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/search.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts
@@ -6,6 +6,7 @@
 import { Injectable } from '@nestjs/common';
 import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js';
 import { attachMinMaxPagination, attachOffsetPagination } from '@/server/api/mastodon/pagination.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { MastodonConverters } from '../MastodonConverters.js';
 import { parseTimelineArgs, TimelineArgs, toBoolean, toInt } from '../argsUtils.js';
 import { ApiError } from '../../error.js';
@@ -52,8 +53,8 @@ export class ApiSearchMastodon {
 			const { data } = await client.search(request.query.q, { type, ...query });
 			const response = {
 				...data,
-				accounts: await Promise.all(data.accounts.map((account: Entity.Account) => this.mastoConverters.convertAccount(account))),
-				statuses: await Promise.all(data.statuses.map((status: Entity.Status) => this.mastoConverters.convertStatus(status, me))),
+				accounts: await promiseMap(data.accounts, (account: Entity.Account) => this.mastoConverters.convertAccount(account), { limit: 3 }),
+				statuses: await promiseMap(data.statuses, (status: Entity.Status) => this.mastoConverters.convertStatus(status, me), { limit: 3 }),
 			};
 
 			if (type === 'hashtags') {
@@ -89,8 +90,8 @@ export class ApiSearchMastodon {
 			const stat = !type || type === 'statuses' ? await client.search(request.query.q, { type: 'statuses', ...query }) : null;
 			const tags = !type || type === 'hashtags' ? await client.search(request.query.q, { type: 'hashtags', ...query }) : null;
 			const response = {
-				accounts: await Promise.all(acct?.data.accounts.map((account: Entity.Account) => this.mastoConverters.convertAccount(account)) ?? []),
-				statuses: await Promise.all(stat?.data.statuses.map((status: Entity.Status) => this.mastoConverters.convertStatus(status, me)) ?? []),
+				accounts: acct ? await promiseMap(acct.data.accounts, async (account: Entity.Account) => await this.mastoConverters.convertAccount(account), { limit: 3 }) : [],
+				statuses: acct ? await promiseMap(acct.data.statuses, async (status: Entity.Status) => this.mastoConverters.convertStatus(status, me), { limit: 3 }) : [],
 				hashtags: tags?.data.hashtags ?? [],
 			};
 
@@ -123,7 +124,7 @@ export class ApiSearchMastodon {
 
 			const data = await res.json() as Entity.Status[];
 			const me = await this.clientService.getAuth(request);
-			const response = await Promise.all(data.map(status => this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data, async status => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -150,12 +151,12 @@ export class ApiSearchMastodon {
 			await verifyResponse(res);
 
 			const data = await res.json() as Entity.Account[];
-			const response = await Promise.all(data.map(async entry => {
-				return {
-					source: 'global',
-					account: await this.mastoConverters.convertAccount(entry),
-				};
-			}));
+			const response = await promiseMap(data, async entry => ({
+				source: 'global',
+				account: await this.mastoConverters.convertAccount(entry),
+			}), {
+				limit: 4,
+			});
 
 			attachOffsetPagination(request, reply, response);
 			return reply.send(response);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index f5942a5267..e126a22f58 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -11,6 +11,7 @@ import { MastodonClientService } from '@/server/api/mastodon/MastodonClientServi
 import { MastodonDataService } from '@/server/api/mastodon/MastodonDataService.js';
 import { getNoteSummary } from '@/misc/get-note-summary.js';
 import { isPureRenote } from '@/misc/is-renote.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { convertAttachment, convertPoll, MastodonConverters } from '../MastodonConverters.js';
 import type { Entity } from 'megalodon';
 import type { FastifyInstance } from 'fastify';
@@ -97,8 +98,8 @@ export class ApiStatusMastodon {
 
 			const { client, me } = await this.clientService.getAuthClient(_request);
 			const { data } = await client.getStatusContext(_request.params.id, parseTimelineArgs(_request.query));
-			const ancestors = await Promise.all(data.ancestors.map(async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me)));
-			const descendants = await Promise.all(data.descendants.map(async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me)));
+			const ancestors = await promiseMap(data.ancestors, async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
+			const descendants = await promiseMap(data.descendants, async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 			const response = { ancestors, descendants };
 
 			return reply.send(response);
@@ -118,7 +119,7 @@ export class ApiStatusMastodon {
 
 			const client = this.clientService.getClient(_request);
 			const data = await client.getStatusRebloggedBy(_request.params.id);
-			const response = await Promise.all(data.data.map((account: Entity.Account) => this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async (account: Entity.Account) => await this.mastoConverters.convertAccount(account), { limit: 4 });
 
 			return reply.send(response);
 		});
@@ -128,7 +129,7 @@ export class ApiStatusMastodon {
 
 			const client = this.clientService.getClient(_request);
 			const data = await client.getStatusFavouritedBy(_request.params.id);
-			const response = await Promise.all(data.data.map((account: Entity.Account) => this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async (account: Entity.Account) => await this.mastoConverters.convertAccount(account), { limit: 4 });
 
 			return reply.send(response);
 		});
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index b2f7b18dc9..df56c34c82 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -6,6 +6,7 @@
 import { Injectable } from '@nestjs/common';
 import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js';
 import { attachMinMaxPagination } from '@/server/api/mastodon/pagination.js';
+import { promiseMap } from '@/misc/promise-map.js';
 import { convertList, MastodonConverters } from '../MastodonConverters.js';
 import { parseTimelineArgs, TimelineArgs, toBoolean } from '../argsUtils.js';
 import type { Entity } from 'megalodon';
@@ -25,7 +26,7 @@ export class ApiTimelineMastodon {
 			const data = toBoolean(request.query.local)
 				? await client.getLocalTimeline(query)
 				: await client.getPublicTimeline(query);
-			const response = await Promise.all(data.data.map((status: Entity.Status) => this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -35,7 +36,7 @@ export class ApiTimelineMastodon {
 			const { client, me } = await this.clientService.getAuthClient(request);
 			const query = parseTimelineArgs(request.query);
 			const data = await client.getHomeTimeline(query);
-			const response = await Promise.all(data.data.map((status: Entity.Status) => this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -47,7 +48,7 @@ export class ApiTimelineMastodon {
 			const { client, me } = await this.clientService.getAuthClient(request);
 			const query = parseTimelineArgs(request.query);
 			const data = await client.getTagTimeline(request.params.hashtag, query);
-			const response = await Promise.all(data.data.map((status: Entity.Status) => this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -59,7 +60,7 @@ export class ApiTimelineMastodon {
 			const { client, me } = await this.clientService.getAuthClient(request);
 			const query = parseTimelineArgs(request.query);
 			const data = await client.getListTimeline(request.params.id, query);
-			const response = await Promise.all(data.data.map(async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me)));
+			const response = await promiseMap(data.data, async (status: Entity.Status) => await this.mastoConverters.convertStatus(status, me), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -69,7 +70,7 @@ export class ApiTimelineMastodon {
 			const { client, me } = await this.clientService.getAuthClient(request);
 			const query = parseTimelineArgs(request.query);
 			const data = await client.getConversationTimeline(query);
-			const response = await Promise.all(data.data.map((conversation: Entity.Conversation) => this.mastoConverters.convertConversation(conversation, me)));
+			const response = await promiseMap(data.data, async (conversation: Entity.Conversation) => await this.mastoConverters.convertConversation(conversation, me), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
@@ -99,7 +100,7 @@ export class ApiTimelineMastodon {
 
 			const client = this.clientService.getClient(request);
 			const data = await client.getAccountsInList(request.params.id, parseTimelineArgs(request.query));
-			const response = await Promise.all(data.data.map((account: Entity.Account) => this.mastoConverters.convertAccount(account)));
+			const response = await promiseMap(data.data, async (account: Entity.Account) => await this.mastoConverters.convertAccount(account), { limit: 4 });
 
 			attachMinMaxPagination(request, reply, response);
 			return reply.send(response);
diff --git a/packages/backend/test/unit/misc/promise-map.ts b/packages/backend/test/unit/misc/promise-map.ts
new file mode 100644
index 0000000000..81d21c8e0e
--- /dev/null
+++ b/packages/backend/test/unit/misc/promise-map.ts
@@ -0,0 +1,170 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { setTimeout } from 'node:timers/promises';
+import promiseLimit from 'promise-limit';
+import { promiseMap } from '@/misc/promise-map.js';
+
+async function randomDelay() {
+	await setTimeout(10 * Math.abs(Math.random()));
+}
+
+describe(promiseMap, () => {
+	it('should return empty array with no input', async () => {
+		const result = await promiseMap([] as string[], async () => 'wrong');
+		expect(result).toHaveLength(0);
+	});
+
+	it('should map items in correct order', async () => {
+		const items = [1, 2, 3, 4, 5];
+
+		const results = await promiseMap(items, async i => {
+			await randomDelay();
+			return String(i);
+		});
+
+		expect(results).toEqual(['1', '2', '3', '4', '5']);
+	});
+
+	it('should accept async iterable input', async () => {
+		async function *generator() {
+			yield 1;
+			yield 2;
+			yield 3;
+		}
+
+		const results = await promiseMap(generator(), async i => String(i));
+
+		expect(results).toEqual(['1', '2', '3']);
+	});
+
+	it('should accept limit input', async () => {
+		const items = [1, 2, 3, 4, 5];
+
+		let inProgress = 0;
+		let maxProgress = 0;
+
+		const results = await promiseMap(items, async i => {
+			inProgress++;
+			maxProgress = Math.max(maxProgress, inProgress);
+
+			await randomDelay();
+
+			inProgress--;
+			return String(i);
+		}, {
+			limit: 2,
+		});
+
+		expect(results).toEqual(['1', '2', '3', '4', '5']);
+		expect(maxProgress).toEqual(2);
+	});
+
+	it('should accept limit as instance', async () => {
+		const items = [1, 2, 3, 4, 5];
+		const limit = promiseLimit<void>(2);
+
+		let inProgress = 0;
+		let maxProgress = 0;
+
+		const results = await promiseMap(items, async i => {
+			inProgress++;
+			maxProgress = Math.max(maxProgress, inProgress);
+
+			await randomDelay();
+
+			inProgress--;
+			return String(i);
+		}, {
+			limit,
+		});
+
+		expect(results).toEqual(['1', '2', '3', '4', '5']);
+		expect(maxProgress).toEqual(2);
+	});
+
+	it('should reject when signal aborts', async () => {
+		const items = [1, 2, 3, 4, 5];
+		const controller = new AbortController();
+
+		const promise = promiseMap(items, async i => {
+			if (i === 3) {
+				controller.abort(new Error('test abort'));
+			}
+
+			return String(i);
+		}, {
+			limit: 1,
+			signal: controller.signal,
+		});
+
+		await expect(promise).rejects.toThrow('abort');
+	});
+
+	it('should abort when signal aborts', async () => {
+		const items = [1, 2, 3, 4, 5];
+		const controller = new AbortController();
+
+		const processed: number[] = [];
+
+		await promiseMap(items, async i => {
+			if (i === 3) {
+				controller.abort('test abort');
+			}
+
+			processed.push(i);
+			return String(i);
+		}, {
+			limit: 1,
+			signal: controller.signal,
+		}).catch(() => null);
+
+		expect(processed).toEqual([1, 2, 3]);
+	});
+
+	it('should reject when promise rejects', async () => {
+		const items = [1, 2, 3, 4, 5];
+
+		const promise = promiseMap(items, async i => {
+			if (i === 3) {
+				throw new Error('test error');
+			}
+
+			return String(i);
+		});
+
+		await expect(promise).rejects.toThrow('test');
+	});
+
+	it('should abort when promise rejects', async () => {
+		const items = [1, 2, 3, 4, 5];
+
+		const processed: number[] = [];
+
+		await promiseMap(items, async i => {
+			if (i === 3) {
+				throw new Error('test error');
+			}
+
+			processed.push(i);
+
+			return String(i);
+		}).catch(() => null);
+
+		expect(processed).toEqual([1, 2]);
+	});
+
+	it('should aggregate all errors', async () => {
+		const items = [1, 2, 3, 4, 5];
+
+		const promise = promiseMap(items, async i => {
+			await setTimeout(10);
+
+			throw new Error(`test error: ${i}`);
+		});
+
+		await expect(promise).rejects.toThrow(AggregateError);
+	});
+});

From 7b809b2b58eb4bbcca076ec6f5ebcb37e8fd492b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 8 Jul 2025 20:41:43 -0400
Subject: [PATCH 066/107] fix error when editing a poll

---
 packages/backend/src/core/NoteEditService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 0e36cc1c63..c3ecd1c2bb 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -583,13 +583,13 @@ export class NoteEditService implements OnApplicationShutdown {
 						});
 
 						if (oldPoll) {
-							await transactionalEntityManager.update(MiPoll, { pollId: oldPoll.noteId }, poll);
+							await transactionalEntityManager.update(MiPoll, { noteId: oldPoll.noteId }, poll);
 						} else {
 							await transactionalEntityManager.insert(MiPoll, poll);
 						}
 					// Delete poll
 					} else if (oldPoll) {
-						await transactionalEntityManager.delete(MiPoll, { pollId: oldPoll.noteId });
+						await transactionalEntityManager.delete(MiPoll, { noteId: oldPoll.noteId });
 					}
 				});
 			} else {

From a903d77a3f8e44bf68461960d4e799b6c99adb53 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 9 Jul 2025 18:20:59 -0400
Subject: [PATCH 067/107] fix ImmediateApPersonService producing duplicate
 calls to updateFeatured

---
 .../test/misc/immediateBackgroundTasks.ts     | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/packages/backend/test/misc/immediateBackgroundTasks.ts b/packages/backend/test/misc/immediateBackgroundTasks.ts
index fd059e3f10..24c344da2f 100644
--- a/packages/backend/test/misc/immediateBackgroundTasks.ts
+++ b/packages/backend/test/misc/immediateBackgroundTasks.ts
@@ -3,42 +3,25 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { IObject } from '@/core/activitypub/type.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
-import { MiRemoteUser, MiUser } from '@/models/User.js';
+import { MiUser } from '@/models/User.js';
 import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
 import { MiInstance } from '@/models/Instance.js';
 import { Resolver } from '@/core/activitypub/ApResolverService.js';
 import { bindThis } from '@/decorators.js';
 
 export class ImmediateApPersonService extends ApPersonService {
-	@bindThis
-	async createPerson(uri: string, resolver?: Resolver): Promise<MiRemoteUser> {
-		const user = await super.createPerson(uri, resolver);
-		await this.updateFeatured(user, resolver);
-		return user;
-	}
-
-	@bindThis
-	async updatePerson(uri: string, resolver?: Resolver | null, hint?: IObject, movePreventUris: string[] = []): Promise<string | void> {
-		const result = await super.updatePerson(uri, resolver, hint, movePreventUris);
-
-		const user = await this.fetchPerson(uri);
-		if (user == null) throw new Error('updated user is null, did you forget to mock out caches?');
-		await this.updateFeatured(user, resolver ?? undefined);
-
-		return result;
-	}
+	public resolver?: Resolver;
 
 	@bindThis
 	async updatePersonLazy(uriOrUser: string | MiUser): Promise<void> {
 		const userId = typeof(uriOrUser) === 'object' ? uriOrUser.id : uriOrUser;
-		await this.updatePerson(userId);
+		await this.updatePerson(userId, this.resolver);
 	}
 
 	@bindThis
 	async updateFeaturedLazy(userOrId: string | MiUser): Promise<void> {
-		await this.updateFeatured(userOrId);
+		await this.updateFeatured(userOrId, this.resolver);
 	}
 }
 

From f9a6a8d214ea883a45d977526bd1ffc3616d0e49 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 9 Jul 2025 18:21:35 -0400
Subject: [PATCH 068/107] fix MockResolver failing on calls to secureResolve

---
 packages/backend/test/misc/mock-resolver.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/backend/test/misc/mock-resolver.ts b/packages/backend/test/misc/mock-resolver.ts
index 3bb71a1471..ec535751f7 100644
--- a/packages/backend/test/misc/mock-resolver.ts
+++ b/packages/backend/test/misc/mock-resolver.ts
@@ -31,7 +31,7 @@ import { bindThis } from '@/decorators.js';
 import { Resolver } from '@/core/activitypub/ApResolverService.js';
 import { DI } from '@/di-symbols.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { NativeTimeService } from '@/global/TimeService.js';
+import type { MiLocalUser } from '@/models/User.js';
 
 type MockResponse = {
 	type: string;
@@ -115,8 +115,9 @@ export class MockResolver extends Resolver {
 		return this.#remoteGetTrials;
 	}
 
-	public async resolve(value: string | [string]): Promise<IObjectWithId>;
-	public async resolve(value: string | IObject | [string | IObject]): Promise<IObject>;
+	public async resolve(value: string | [string], allowAnonymous?: boolean, fetchUser?: MiLocalUser): Promise<IObjectWithId>;
+	public async resolve(value: string | IObjectWithId | [string | IObjectWithId], allowAnonymous?: boolean, fetchUser?: MiLocalUser): Promise<IObjectWithId>;
+	public async resolve(value: string | IObject | [string | IObject], allowAnonymous?: boolean, fetchUser?: MiLocalUser): Promise<IObject>;
 	@bindThis
 	public async resolve(value: string | IObject | [string | IObject]): Promise<IObject> {
 		value = fromTuple(value);

From 5db73f86dfaf5ef2127b0b9c2a35bbb12f54e2c6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 9 Jul 2025 18:21:52 -0400
Subject: [PATCH 069/107] fix logic errors in collection fetch and featured
 posts validation

---
 .../src/core/activitypub/models/ApPersonService.ts  | 11 +++++++++--
 packages/backend/test/unit/activitypub.ts           | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 5f31d529ad..2b87e94314 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -943,10 +943,17 @@ export class ApPersonService implements OnModuleInit {
 			const itemId = getNullableApId(item);
 			if (itemId && isPost(item)) {
 				try {
-					return await this.apNoteService.resolveNote(item, {
+					const note = await this.apNoteService.resolveNote(item, {
 						resolver: resolver,
-						sentFrom: user.uri,
+						sentFrom: itemId, // resolveCollectionItems has already verified this, so we can re-use it to avoid double fetch
 					});
+
+					if (note && note.userId !== userId) {
+						this.logger.warn(`Ignoring cross-note pin: user ${userId} tried to pin note ${note.id} belonging to user ${note.userId}`);
+						return null;
+					}
+
+					return note;
 				} catch (err) {
 					this.logger.warn(`Couldn't fetch pinned note ${itemId} for user ${user.id} (@${user.username}@${user.host}): ${renderInlineError(err)}`);
 				}
diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index eccad42633..1e2cc02f2f 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -26,10 +26,11 @@ import { LoggerService } from '@/core/LoggerService.js';
 import { CacheManagementService } from '@/global/CacheManagementService.js';
 import { ApResolverService } from '@/core/activitypub/ApResolverService.js';
 import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
-import { MiMeta, MiNote, MiUser, MiUserKeypair, UserProfilesRepository, UserPublickeysRepository, UserKeypairsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
+import { MiMeta, MiNote, MiUser, MiUserKeypair, UserNotePiningsRepository, UserProfilesRepository, UserPublickeysRepository, UserKeypairsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { DownloadService } from '@/core/DownloadService.js';
+import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
 import { genAidx } from '@/misc/id/aidx.js';
 import { IdService } from '@/core/IdService.js';
 import { MockResolver } from '../misc/mock-resolver.js';
@@ -75,7 +76,7 @@ function createRandomFeaturedCollection(actor: NonTransientIActor, length: numbe
 	return {
 		'@context': 'https://www.w3.org/ns/activitystreams',
 		type: 'Collection',
-		id: actor.outbox as string,
+		id: actor.featured as string | null ?? `${actor.id}/featured`,
 		totalItems: items.length,
 		items,
 	};
@@ -108,6 +109,7 @@ describe('ActivityPub', () => {
 	let cacheManagementService: CacheManagementService;
 	let mockConsole: MockConsole;
 	let notesRepository: NotesRepository;
+	let userNotePiningsRepository: UserNotePiningsRepository;
 
 	const metaInitial = {
 		id: 'x',
@@ -185,6 +187,7 @@ describe('ActivityPub', () => {
 		mockConsole = app.get<MockConsole>(DI.console);
 		notesRepository = app.get<NotesRepository>(DI.notesRepository);
 	});
+		userNotePiningsRepository = app.get<UserNotePiningsRepository>(DI.userNotePiningsRepository);
 
 	afterAll(async () => {
 		await app.close();
@@ -380,7 +383,7 @@ describe('ActivityPub', () => {
 			resolver.register(actor2.id, actor2);
 			resolver.register(actor2Note.id, actor2Note);
 
-			await personService.createPerson(actor1.id, resolver);
+			const created = await personService.createPerson(actor1.id, resolver);
 
 			// actor2Note is from a different server and needs to be fetched again
 			assert.deepStrictEqual(
@@ -394,6 +397,10 @@ describe('ActivityPub', () => {
 			// Reflects the original content instead of the fraud
 			assert.strictEqual(note.text, 'test test foo');
 			assert.strictEqual(note.uri, actor2Note.id);
+
+			// Cross-user pin should be rejected
+			const pinExists = await userNotePiningsRepository.existsBy({ userId: created.id, noteId: note.id });
+			expect(pinExists).toBe(false);
 		});
 
 		test('Fetch a note that is a featured note of the attributed actor', async () => {

From 1d38814450091714391b89c1c1f3951c4186e5c3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 25 Jul 2025 17:20:29 -0400
Subject: [PATCH 070/107] fix softwareName / softwareVersion mix-up

---
 packages/backend/src/core/FetchInstanceMetadataService.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 8453758c39..d929e4bb4e 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -125,7 +125,7 @@ export class FetchInstanceMetadataService {
 				this.getDescription(info, dom, manifest).catch(() => null),
 			]);
 
-			this.logger.debug(`Successfuly fetched metadata of ${instance.host}`);
+			this.logger.debug(`Successfully fetched metadata of ${instance.host}`);
 
 			const updates = {
 				infoUpdatedAt: this.timeService.date,
@@ -133,7 +133,9 @@ export class FetchInstanceMetadataService {
 
 			if (info) {
 				const softwareName = typeof info.software?.name === 'string' ? info.software.name.toLowerCase() : '?';
-				if (softwareName !== instance.softwareName) updates.softwareName = updates.softwareVersion = info.software?.version;
+				if (softwareName !== instance.softwareName) updates.softwareName = softwareName;
+				const softwareVersion = typeof info.software?.version === 'string' ? info.software.version.toLowerCase() : '?';
+				if (softwareVersion !== instance.softwareVersion) updates.softwareVersion = softwareVersion;
 				if (info.openRegistrations !== instance.openRegistrations) updates.openRegistrations = info.openRegistrations;
 				const maintainerName = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.name ?? null) : null : null;
 				if (maintainerName !== instance.maintainerName) updates.maintainerName = maintainerName;

From 7fe1f8b39fbe43060c5e2e3fc8d1f64be6087c3c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 16 Sep 2025 11:58:11 -0400
Subject: [PATCH 071/107] use CacheService.getUsers instead of
 promiseMap+CacheService.getOptionalUserById

---
 packages/backend/src/core/ReactionService.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 6af04dcba5..6d69b079ce 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -34,7 +34,6 @@ import { CacheService } from '@/core/CacheService.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
-import { promiseMap } from '@/misc/promise-map.js';
 import type { DataSource } from 'typeorm';
 
 const FALLBACK = '\u2764';
@@ -299,9 +298,11 @@ export class ReactionService implements OnModuleInit {
 			if (['public', 'home', 'followers'].includes(note.visibility)) {
 				dm.addFollowersRecipe();
 			} else if (note.visibility === 'specified') {
-				const visibleUsers = await promiseMap(note.visibleUserIds, async id => await this.cacheService.findOptionalUserById(id), { limit: 2 });
-				for (const u of visibleUsers.filter(u => u && isRemoteUser(u))) {
-					dm.addDirectRecipe(u as MiRemoteUser);
+				const visibleUsers = await this.cacheService.getUsers(note.visibleUserIds);
+				for (const u of visibleUsers.values()) {
+					if (isRemoteUser(u)) {
+						dm.addDirectRecipe(u as MiRemoteUser);
+					}
 				}
 			}
 

From b61109563232369328cca1c1b6d3e032a217be05 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 16 Sep 2025 11:59:14 -0400
Subject: [PATCH 072/107] remove dependencies on NoteEntityService /
 UserEntityService from ReactionService

---
 packages/backend/src/core/ReactionService.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 6d69b079ce..3ef379cf5b 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -8,6 +8,7 @@ import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository, MiMeta } from '@/models/_.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { isLocalUser, isRemoteUser } from '@/models/User.js';
 import type { MiRemoteUser, MiUser } from '@/models/User.js';
 import { isLocalUser, isRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
@@ -121,7 +122,7 @@ export class ReactionService implements OnModuleInit {
 	}
 
 	@bindThis
-	public async create(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot'] }, note: MiNote, _reaction?: string | null) {
+	public async create(user: MiUser, note: MiNote, _reaction?: string | null) {
 		// Check blocking
 		if (note.userId !== user.id) {
 			const blocked = await this.userBlockingService.checkBlocked(note.userId, user.id);
@@ -312,7 +313,7 @@ export class ReactionService implements OnModuleInit {
 	}
 
 	@bindThis
-	public async delete(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, exist?: MiNoteReaction | null) {
+	public async delete(user: MiUser, note: MiNote, exist?: MiNoteReaction | null) {
 		// if already unreacted
 		exist ??= await this.noteReactionsRepository.findOneBy({
 			noteId: note.id,

From 91f3691d2b80260c8005f8dbc88dfd265e891eef Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 16 Sep 2025 11:59:26 -0400
Subject: [PATCH 073/107] use CacheService in ReactionService

---
 packages/backend/src/core/ReactionService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 3ef379cf5b..1e6c6a5139 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -292,7 +292,7 @@ export class ReactionService implements OnModuleInit {
 			const content = this.apRendererService.addContext(await this.apRendererService.renderLike(record, note));
 			const dm = this.apDeliverManagerService.createDeliverManager(user, content);
 			if (note.userHost !== null) {
-				const reactee = await this.usersRepository.findOneBy({ id: note.userId });
+				const reactee = await this.cacheService.findRemoteUserById(note.userId);
 				dm.addDirectRecipe(reactee as MiRemoteUser);
 			}
 
@@ -357,7 +357,7 @@ export class ReactionService implements OnModuleInit {
 			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(await this.apRendererService.renderLike(exist, note), user));
 			const dm = this.apDeliverManagerService.createDeliverManager(user, content);
 			if (note.userHost !== null) {
-				const reactee = await this.usersRepository.findOneBy({ id: note.userId });
+				const reactee = await this.cacheService.findRemoteUserById(note.userId);
 				dm.addDirectRecipe(reactee as MiRemoteUser);
 			}
 			dm.addFollowersRecipe();

From a24df431eeb7690bbabfc7126be1dae2dc82c409 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 16 Sep 2025 12:09:21 -0400
Subject: [PATCH 074/107] restore NoteEntityService until we merge
 NoteVisibilityService

---
 packages/backend/src/core/ReactionService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 1e6c6a5139..d818d148f0 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -20,6 +20,7 @@ import { NotificationService } from '@/core/NotificationService.js';
 import PerUserReactionsChart from '@/core/chart/charts/per-user-reactions.js';
 import { emojiRegex } from '@/misc/emoji-regex.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { bindThis } from '@/decorators.js';
 import { UtilityService } from '@/core/UtilityService.js';

From 7ae9c3de6037ae0c4bfe54b8c76a4e9549b175fc Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 16 Sep 2025 12:10:15 -0400
Subject: [PATCH 075/107] fix merge error in QueueStatsService

---
 packages/backend/src/daemons/QueueStatsService.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/backend/src/daemons/QueueStatsService.ts b/packages/backend/src/daemons/QueueStatsService.ts
index 9d2266e7e7..767e80bc81 100644
--- a/packages/backend/src/daemons/QueueStatsService.ts
+++ b/packages/backend/src/daemons/QueueStatsService.ts
@@ -138,7 +138,7 @@ export class QueueStatsService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async stop(): void {
+	public async stop(): Promise<void> {
 		if (this.intervalId) {
 			this.timeService.stopTimer(this.intervalId);
 		}
@@ -159,11 +159,6 @@ export class QueueStatsService implements OnApplicationShutdown {
 		this.activeBackgroundJobs = 0;
 	}
 
-	@bindThis
-	public async dispose(): void {
-		await this.stop();
-	}
-
 	@bindThis
 	public async dispose() {
 		await this.stop();

From 2f11ddb767cfa78d00397f8f222d9bcf1a74fb2f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 24 Jun 2025 23:15:42 -0400
Subject: [PATCH 076/107] fix typings of resolveCollection and
 resolveCollectionItems

---
 .../src/core/activitypub/ApInboxService.ts    |  2 +-
 .../src/core/activitypub/ApResolverService.ts | 30 ++++++++-----------
 .../src/server/api/endpoints/ap/get.ts        |  2 +-
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index de37944344..3cd742533f 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -107,7 +107,7 @@ export class ApInboxService {
 			const results = [] as [string, string | void][];
 			resolver ??= this.apResolverService.createResolver();
 
-			const items = await resolver.resolveCollectionItems(activity);
+			const items = await resolver.resolveCollectionItems(activity, true, getNullableApId(activity) ?? undefined);
 			for (let i = 0; i < items.length; i++) {
 				const act = items[i];
 				if (act.id != null) {
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index a1510db1b3..535b64424c 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -69,27 +69,21 @@ export class Resolver {
 		return this.recursionLimit;
 	}
 
-	public async resolveCollection(value: string | IObjectWithId, allowAnonymous?: boolean, sentFromUri?: string): Promise<AnyCollection & IObjectWithId>;
-	public async resolveCollection(value: string | IObject, allowAnonymous: boolean | undefined, sentFromUri: string): Promise<AnyCollection & IObjectWithId>;
-	public async resolveCollection(value: string | IObject, allowAnonymous?: boolean, sentFromUri?: string): Promise<AnyCollection>;
 	@bindThis
 	public async resolveCollection(value: string | IObject, allowAnonymous?: boolean, sentFromUri?: string): Promise<AnyCollection> {
-		const collection = typeof value === 'string'
-			? sentFromUri
-				? await this.secureResolve(value, sentFromUri, allowAnonymous)
-				: await this.resolve(value, allowAnonymous)
-			: value; // TODO try and remove this eventually, as it's a major security foot-gun
+		const collection = sentFromUri
+			? await this.secureResolve(value, sentFromUri, allowAnonymous)
+			: allowAnonymous
+				? await this.resolveAnonymous(value)
+				: await this.resolve(value, allowAnonymous);
 
 		if (isCollectionOrOrderedCollection(collection)) {
 			return collection;
 		} else {
-			throw new IdentifiableError('f100eccf-f347-43fb-9b45-96a0831fb635', `collection ${getApId(value)} has unsupported type: ${collection.type}`);
+			throw new IdentifiableError('f100eccf-f347-43fb-9b45-96a0831fb635', `collection ${getNullableApId(value)} has unsupported type: ${collection.type}`);
 		}
 	}
 
-	public async resolveCollectionItems(collection: IAnonymousObject, limit?: number | null, allowAnonymousItems?: true, concurrency?: number): Promise<IAnonymousObject[]>;
-	public async resolveCollectionItems(collection: string | IObjectWithId, limit?: number | null, allowAnonymousItems?: boolean, concurrency?: number): Promise<IObjectWithId[]>;
-	public async resolveCollectionItems(collection: string | IObject, limit?: number | null, allowAnonymousItems?: boolean, concurrency?: number): Promise<IObject[]>;
 	/**
 	 * Recursively resolves items from a collection.
 	 * Stops when reaching the resolution limit or an optional item limit - whichever is lower.
@@ -97,11 +91,12 @@ export class Resolver {
 	 * Malformed collections (mixing Ordered and un-Ordered types) are also supported.
 	 * @param collection Collection to resolve from - can be a URL or object of any supported collection type.
 	 * @param limit Maximum number of items to resolve. If null or undefined (default), then items will be resolved until reaching the recursion limit.
-	 * @param allowAnonymousItems If true, collection items can be anonymous (lack an ID). If false (default), then an error is thrown when reaching an item without ID.
+	 * @param allowAnonymous If true, collection items can be anonymous (lack an ID). If false (default), then an error is thrown when reaching an item without ID.
+	 * @param sentFromUri If collection is an object, this is the URI where it was sent from.
 	 * @param concurrency Maximum number of items to resolve at once. (default: 4)
 	 */
 	@bindThis
-	public async resolveCollectionItems(collection: string | IObject, limit?: number | null, allowAnonymousItems?: boolean, concurrency = 4): Promise<IObject[]> {
+	public async resolveCollectionItems(collection: string | IObject, allowAnonymous = false, sentFromUri?: string, limit?: number | null, concurrency = 4): Promise<IObject[]> {
 		const resolvedItems: IObject[] = [];
 
 		// This is pulled up to avoid code duplication below
@@ -109,11 +104,10 @@ export class Resolver {
 			const sentFrom = current.id;
 			const itemArr = toArray(items);
 			const itemLimit = limit ?? Number.MAX_SAFE_INTEGER;
-			const allowAnonymous = allowAnonymousItems ?? false;
 			await this.resolveItemArray(itemArr, sentFrom, itemLimit, concurrency, allowAnonymous, resolvedItems);
 		};
 
-		let current: AnyCollection | null = await this.resolveCollection(collection);
+		let current: AnyCollection | null = await this.resolveCollection(collection, allowAnonymous, sentFromUri);
 		do {
 			// Iterate all items in the current page
 			if (current.items) {
@@ -131,10 +125,10 @@ export class Resolver {
 				current = null;
 			} else if (isCollection(current) || isOrderedCollection(current)) {
 				// Continue to first page
-				current = current.first ? await this.resolveCollection(current.first, true, current.id) : null;
+				current = current.first ? await this.resolveCollection(current.first, allowAnonymous, current.id) : null;
 			} else if (isCollectionPage(current) || isOrderedCollectionPage(current)) {
 				// Continue to next page
-				current = current.next ? await this.resolveCollection(current.next, true, current.id) : null;
+				current = current.next ? await this.resolveCollection(current.next, allowAnonymous, current.id) : null;
 			} else {
 				// Stop in all other conditions
 				current = null;
diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts
index e3e68b50af..bdd7ea4d01 100644
--- a/packages/backend/src/server/api/endpoints/ap/get.ts
+++ b/packages/backend/src/server/api/endpoints/ap/get.ts
@@ -91,7 +91,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const object = await resolver.resolve(uri, ps.allowAnonymous ?? false);
 
 			if (ps.expandCollectionItems && isCollectionOrOrderedCollection(object)) {
-				const items = await resolver.resolveCollectionItems(object, ps.expandCollectionLimit, ps.allowAnonymous ?? false);
+				const items = await resolver.resolveCollectionItems(object, ps.allowAnonymous ?? false, uri, ps.expandCollectionLimit);
 
 				if (isOrderedCollection(object) || isOrderedCollectionPage(object)) {
 					object.orderedItems = items;

From 2514ebd166815ae6333721c352a8de1d7852862f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 16 Sep 2025 12:19:27 -0400
Subject: [PATCH 077/107] ignore errors when fetching collection items

---
 .../src/core/activitypub/ApResolverService.ts | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index 535b64424c..d29ad9ba31 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -24,6 +24,7 @@ import { isPureRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
 import { promiseMap } from '@/misc/promise-map.js';
+import { renderInlineError } from '@/misc/render-inline-error.js';
 import { AnyCollection, getApId, getNullableApId, IObjectWithId, isCollection, isCollectionOrOrderedCollection, isCollectionPage, isOrderedCollection, isOrderedCollectionPage } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
@@ -94,9 +95,10 @@ export class Resolver {
 	 * @param allowAnonymous If true, collection items can be anonymous (lack an ID). If false (default), then an error is thrown when reaching an item without ID.
 	 * @param sentFromUri If collection is an object, this is the URI where it was sent from.
 	 * @param concurrency Maximum number of items to resolve at once. (default: 4)
+	 * @param ignoreErrors If true (default), inaccessible items will be skipped instead of causing an exception. Inaccessible collections will still throw.
 	 */
 	@bindThis
-	public async resolveCollectionItems(collection: string | IObject, allowAnonymous = false, sentFromUri?: string, limit?: number | null, concurrency = 4): Promise<IObject[]> {
+	public async resolveCollectionItems(collection: string | IObject, allowAnonymous = false, sentFromUri?: string, limit?: number | null, concurrency = 4, ignoreErrors = true): Promise<IObject[]> {
 		const resolvedItems: IObject[] = [];
 
 		// This is pulled up to avoid code duplication below
@@ -104,7 +106,7 @@ export class Resolver {
 			const sentFrom = current.id;
 			const itemArr = toArray(items);
 			const itemLimit = limit ?? Number.MAX_SAFE_INTEGER;
-			await this.resolveItemArray(itemArr, sentFrom, itemLimit, concurrency, allowAnonymous, resolvedItems);
+			await this.resolveItemArray(itemArr, sentFrom, itemLimit, concurrency, allowAnonymous, resolvedItems, ignoreErrors);
 		};
 
 		let current: AnyCollection | null = await this.resolveCollection(collection, allowAnonymous, sentFromUri);
@@ -138,29 +140,38 @@ export class Resolver {
 		return resolvedItems;
 	}
 
-	private async resolveItemArray(source: (string | IObject)[], sentFrom: undefined, itemLimit: number, concurrency: number, allowAnonymousItems: true, destination: IAnonymousObject[]): Promise<void>;
-	private async resolveItemArray(source: (string | IObject)[], sentFrom: string, itemLimit: number, concurrency: number, allowAnonymousItems: boolean, destination: IObjectWithId[]): Promise<void>;
-	private async resolveItemArray(source: (string | IObject)[], sentFrom: string | undefined, itemLimit: number, concurrency: number, allowAnonymousItems: boolean, destination: IObject[]): Promise<void>;
-	private async resolveItemArray(source: (string | IObject)[], sentFrom: string | undefined, itemLimit: number, concurrency: number, allowAnonymousItems: boolean, destination: IObject[]): Promise<void> {
+	private async resolveItemArray(source: (string | IObject)[], sentFrom: string | undefined, itemLimit: number, concurrency: number, allowAnonymousItems: boolean, destination: IObject[], ignoreErrors?: boolean): Promise<void> {
 		const recursionLimit = this.recursionLimit - this.history.size;
 		const batchLimit = Math.min(source.length, recursionLimit, itemLimit);
 
 		const batch = await promiseMap(source.slice(0, batchLimit), async item => {
-			if (sentFrom) {
-				// Use secureResolve to avoid re-fetching items that were included inline.
-				return await this.secureResolve(item, sentFrom, allowAnonymousItems);
-			} else if (allowAnonymousItems) {
-				return await this.resolveAnonymous(item);
-			} else {
-				// ID is required if we have neither sentFrom not allowAnonymousItems
-				const id = getApId(item);
-				return await this.resolve(id);
+			try {
+				if (sentFrom) {
+					// Use secureResolve to avoid re-fetching items that were included inline.
+					return await this.secureResolve(item, sentFrom, allowAnonymousItems);
+				} else if (allowAnonymousItems) {
+					return await this.resolveAnonymous(item);
+				} else {
+					// ID is required if we have neither sentFrom not allowAnonymousItems
+					const id = getApId(item);
+					return await this.resolve(id);
+				}
+			} catch (err) {
+				if (ignoreErrors) {
+					this.logger.warn(`Ignoring error in collection item ${getNullableApId(item)}: ${renderInlineError(err)}`);
+					return null;
+				} else {
+					throw err;
+				}
 			}
 		}, {
 			limit: concurrency,
 		});
 
-		destination.push(...batch);
+		// Items will be null if a request fails and ignoreErrors is true
+		const batchItems = batch.filter(item => item != null);
+
+		destination.push(...batchItems);
 	};
 
 	/**

From 09ef662444e8e3b085bcc0e536137613339cfbb0 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 11:45:25 -0400
Subject: [PATCH 078/107] use cache when resolving user for updateFeatured

---
 .../activitypub/models/ApPersonService.ts     | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 2b87e94314..8d8728f8ed 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -916,23 +916,19 @@ export class ApPersonService implements OnModuleInit {
 	 * Duplicate updates are automatically skipped.
 	 */
 	@bindThis
-	public async updateFeaturedLazy(userOrId: MiUser | MiUser['id']): Promise<void> {
-		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
-		const user = typeof(userOrId) === 'object' ? userOrId : await this.usersRepository.findOneByOrFail({ id: userId, isDeleted: false });
+	public async updateFeaturedLazy(userOrId: MiRemoteUser | MiUser['id']): Promise<void> {
+		const user = await this.resolveUserForFeatured(userOrId);
+		if (!user) return;
 
-		if (isRemoteUser(user) && user.featured) {
-			await this.queueService.createUpdateFeaturedJob(userId);
-		}
+		await this.queueService.createUpdateFeaturedJob(user.id);
 	}
 
 	@bindThis
-	public async updateFeatured(userOrId: MiUser | MiUser['id'], resolver?: Resolver): Promise<void> {
-		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
-		const user = typeof(userOrId) === 'object' ? userOrId : await this.usersRepository.findOneByOrFail({ id: userId, isDeleted: false });
-		if (!isRemoteUser(user)) return;
-		if (!user.featured) return;
+	public async updateFeatured(userOrId: MiRemoteUser | MiUser['id'], resolver?: Resolver): Promise<void> {
+		const user = await this.resolveUserForFeatured(userOrId);
+		if (!user) return;
 
-		this.logger.info(`Updating the featured: ${user.uri}`);
+		this.logger.info(`Updating featured notes for: ${user.uri}`);
 
 		resolver ??= this.apResolverService.createResolver();
 
@@ -948,8 +944,8 @@ export class ApPersonService implements OnModuleInit {
 						sentFrom: itemId, // resolveCollectionItems has already verified this, so we can re-use it to avoid double fetch
 					});
 
-					if (note && note.userId !== userId) {
-						this.logger.warn(`Ignoring cross-note pin: user ${userId} tried to pin note ${note.id} belonging to user ${note.userId}`);
+					if (note && note.userId !== user.id) {
+						this.logger.warn(`Ignoring cross-note pin: user ${user.id} tried to pin note ${note.id} belonging to other user ${note.userId}`);
 						return null;
 					}
 
@@ -979,6 +975,25 @@ export class ApPersonService implements OnModuleInit {
 		});
 	}
 
+	@bindThis
+	private async resolveUserForFeatured(userOrId: MiRemoteUser | MiUser['id']): Promise<(MiRemoteUser & { featured: string }) | null> {
+		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
+		const user = typeof(userOrId) === 'object' ? userOrId : await this.cacheService.findRemoteUserById(userId);
+
+		if (user.isDeleted || user.isSuspended) {
+			this.logger.debug(`Not updating featured for ${userId}: user is deleted`);
+			return null;
+		}
+
+		if (!user.featured) {
+			this.logger.debug(`Not updating featured for ${userId}: no featured collection`);
+			return null;
+		}
+
+		// For some reason TS doesn't recognize the type check above.
+		return user as MiRemoteUser & { featured: string };
+	}
+
 	/**
 	 * リモート由来のアカウント移行処理を行います
 	 * @param src 移行元アカウント（リモートかつupdatePerson後である必要がある、というかこれ自体がupdatePersonで呼ばれる前提）

From f4e1558424e29720e97c1edd9bfbe7b4744fe292 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 11:47:03 -0400
Subject: [PATCH 079/107] fix references to old user object in
 ApPersonService.updatePerson

---
 .../activitypub/models/ApPersonService.ts     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 8d8728f8ed..1ed03c25fb 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -765,9 +765,12 @@ export class ApPersonService implements OnModuleInit {
 			return `skip: user ${exist.id} is deleted`;
 		}
 
+		// Do not use "exist" after this point!!
+		const updated = { ...exist, ...updates };
+
 		if (person.publicKey) {
 			const publicKey = new MiUserPublickey({
-				userId: exist.id,
+				userId: updated.id,
 				keyId: person.publicKey.id,
 				keyPem: person.publicKey.publicKeyPem,
 			});
@@ -781,7 +784,7 @@ export class ApPersonService implements OnModuleInit {
 				this.publicKeyByUserIdCache.set(publicKey.userId, publicKey),
 			]);
 		} else {
-			const existingPublicKey = await this.userPublickeysRepository.findOneBy({ userId: exist.id });
+			const existingPublicKey = await this.userPublickeysRepository.findOneBy({ userId: updated.id });
 			if (existingPublicKey) {
 				// Delete key
 				await Promise.all([
@@ -800,7 +803,7 @@ export class ApPersonService implements OnModuleInit {
 			_description = this.apMfmService.htmlToMfm(truncate(person.summary, this.config.maxRemoteBioLength), person.tag);
 		}
 
-		await this.userProfilesRepository.update({ userId: exist.id }, {
+		await this.userProfilesRepository.update({ userId: updated.id }, {
 			url,
 			fields,
 			verifiedLinks,
@@ -813,27 +816,25 @@ export class ApPersonService implements OnModuleInit {
 			listenbrainz: person.listenbrainz ?? null,
 		});
 
-		this.globalEventService.publishInternalEvent('remoteUserUpdated', { id: exist.id });
+		this.globalEventService.publishInternalEvent('remoteUserUpdated', { id: updated.id });
 
 		// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
-		if (exist.inbox !== person.inbox || exist.sharedInbox !== (person.sharedInbox ?? person.endpoints?.sharedInbox)) {
+		if (updated.inbox !== person.inbox || updated.sharedInbox !== (person.sharedInbox ?? person.endpoints?.sharedInbox)) {
 			await this.followingsRepository.update(
-				{ followerId: exist.id },
+				{ followerId: updated.id },
 				{
 					followerInbox: person.inbox,
 					followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
 				},
 			);
 
-			await this.cacheService.refreshFollowRelationsFor(exist.id);
+			await this.cacheService.refreshFollowRelationsFor(updated.id);
 		}
 
 		// ハッシュタグ更新
-		await this.queueService.createUpdateUserTagsJob(exist.id);
+		await this.queueService.createUpdateUserTagsJob(updated.id);
 
-		await this.updateFeaturedLazy(exist);
-
-		const updated = { ...exist, ...updates };
+		await this.updateFeaturedLazy(updated);
 
 		// 移行処理を行う
 		if (updated.movedAt && (

From 0ebb0230588a1702ff74616eb4db8e1380c9ffc3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 11:49:36 -0400
Subject: [PATCH 080/107] replace GlobalEventService with InternalEventService
 in ApPersonService

---
 .../src/core/activitypub/models/ApPersonService.ts   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 1ed03c25fb..171ae60774 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -24,7 +24,6 @@ import type { MiNote } from '@/models/Note.js';
 import { IdService } from '@/core/IdService.js';
 import type { MfmService } from '@/core/MfmService.js';
 import { toArray } from '@/misc/prelude/array.js';
-import type { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import type { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
 import { MiUserProfile } from '@/models/UserProfile.js';
@@ -47,6 +46,7 @@ import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
+import { InternalEventService } from '@/core/InternalEventService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { promiseMap } from '@/misc/promise-map.js';
 import { getApId, getApType, getNullableApId, isActor, isPost, isPropertyValue } from '../type.js';
@@ -74,7 +74,7 @@ export class ApPersonService implements OnModuleInit {
 	private readonly publicKeyByUserIdCache: ManagedQuantumKVCache<MiUserPublickey>;
 
 	private driveFileEntityService: DriveFileEntityService;
-	private globalEventService: GlobalEventService;
+	private idService: IdService;
 	private federatedInstanceService: FederatedInstanceService;
 	private fetchInstanceMetadataService: FetchInstanceMetadataService;
 	private cacheService: CacheService;
@@ -126,6 +126,7 @@ export class ApPersonService implements OnModuleInit {
 		private readonly timeService: TimeService,
 		private readonly queueService: QueueService,
 		private readonly collapsedQueueService: CollapsedQueueService,
+		private readonly internalEventService: InternalEventService,
 
 		apLoggerService: ApLoggerService,
 	) {
@@ -184,7 +185,7 @@ export class ApPersonService implements OnModuleInit {
 	@bindThis
 	onModuleInit(): void {
 		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
-		this.globalEventService = this.moduleRef.get('GlobalEventService');
+		this.idService = this.moduleRef.get('IdService');
 		this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
 		this.fetchInstanceMetadataService = this.moduleRef.get('FetchInstanceMetadataService');
 		this.cacheService = this.moduleRef.get('CacheService');
@@ -765,6 +766,9 @@ export class ApPersonService implements OnModuleInit {
 			return `skip: user ${exist.id} is deleted`;
 		}
 
+		// Notify event ASAP
+		await this.internalEventService.emit('remoteUserUpdated', { id: exist.id });
+
 		// Do not use "exist" after this point!!
 		const updated = { ...exist, ...updates };
 
@@ -816,8 +820,6 @@ export class ApPersonService implements OnModuleInit {
 			listenbrainz: person.listenbrainz ?? null,
 		});
 
-		this.globalEventService.publishInternalEvent('remoteUserUpdated', { id: updated.id });
-
 		// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
 		if (updated.inbox !== person.inbox || updated.sharedInbox !== (person.sharedInbox ?? person.endpoints?.sharedInbox)) {
 			await this.followingsRepository.update(

From 09de5dff44a2871ac5894c18e5b555ef2b9f7191 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 11:50:24 -0400
Subject: [PATCH 081/107] update userProfileCache from updatePerson

---
 packages/backend/src/core/activitypub/models/ApPersonService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 171ae60774..fd56a7f231 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -819,6 +819,7 @@ export class ApPersonService implements OnModuleInit {
 			location: person['vcard:Address'] ?? null,
 			listenbrainz: person.listenbrainz ?? null,
 		});
+		await this.cacheService.userProfileCache.delete(updated.id);
 
 		// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
 		if (updated.inbox !== person.inbox || updated.sharedInbox !== (person.sharedInbox ?? person.endpoints?.sharedInbox)) {

From 3c64fbc9a52368c93c54278c805ca477154b3b88 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 11:55:08 -0400
Subject: [PATCH 082/107] fix cache sync after populating user's banner

---
 .../backend/src/core/activitypub/models/ApPersonService.ts   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index fd56a7f231..7316dfa30a 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -594,10 +594,8 @@ export class ApPersonService implements OnModuleInit {
 		try {
 			const updates = await this.resolveAvatarAndBanner(user, person.icon, person.image, person.backgroundUrl);
 			await this.usersRepository.update(user.id, updates);
+			await this.internalEventService.emit('remoteUserUpdated', { id: user.id });
 			user = { ...user, ...updates };
-
-			// Register to the cache
-			await this.uriPersonCache.set(user.uri, user.id);
 		} catch (err) {
 			// Permanent error implies hidden or inaccessible, which is a normal thing.
 			if (isRetryableError(err)) {
@@ -1013,6 +1011,7 @@ export class ApPersonService implements OnModuleInit {
 		let dst = await this.fetchPerson(src.movedToUri);
 
 		if (dst && isLocalUser(dst)) {
+			// TODO this branch should not be possible
 			// targetがローカルユーザーだった場合データベースから引っ張ってくる
 			dst = await this.usersRepository.findOneByOrFail({ uri: src.movedToUri }) as MiLocalUser;
 		} else if (dst) {

From e81c8b075b31c3a6ab2e00a2a2045889757310cd Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 12:25:24 -0400
Subject: [PATCH 083/107] make sure validation errors in background
 update-featured are returned to the job queue

---
 .../activitypub/models/ApPersonService.ts     | 26 ++++++++++++++-----
 .../backend/src/misc/identifiable-error.ts    | 12 +++++++++
 .../BackgroundTaskProcessorService.ts         | 19 +++++++++++---
 .../federation/update-remote-user.ts          |  2 +-
 .../test/misc/immediateBackgroundTasks.ts     | 20 +++++++++-----
 5 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 7316dfa30a..f28f4cdd8d 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -44,7 +44,7 @@ import { TimeService } from '@/global/TimeService.js';
 import { verifyFieldLinks } from '@/misc/verify-field-link.js';
 import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
@@ -919,16 +919,30 @@ export class ApPersonService implements OnModuleInit {
 	 */
 	@bindThis
 	public async updateFeaturedLazy(userOrId: MiRemoteUser | MiUser['id']): Promise<void> {
-		const user = await this.resolveUserForFeatured(userOrId);
-		if (!user) return;
+		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
+		const user = typeof(userOrId) === 'object' ? userOrId : await this.cacheService.findRemoteUserById(userId);
 
-		await this.queueService.createUpdateFeaturedJob(user.id);
+		if (user.isDeleted || user.isSuspended) {
+			this.logger.debug(`Not updating featured for ${userId}: user is deleted`);
+			return;
+		}
+
+		if (!user.featured) {
+			this.logger.debug(`Not updating featured for ${userId}: no featured collection`);
+			return;
+		}
+
+		await this.queueService.createUpdateFeaturedJob(userId);
 	}
 
 	@bindThis
 	public async updateFeatured(userOrId: MiRemoteUser | MiUser['id'], resolver?: Resolver): Promise<void> {
-		const user = await this.resolveUserForFeatured(userOrId);
-		if (!user) return;
+		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
+		const user = typeof(userOrId) === 'object' ? userOrId : await this.cacheService.findRemoteUserById(userId);
+
+		if (user.isDeleted) throw new IdentifiableError(errorCodes.userIsDeleted, `Can't update featured for ${userId}: user is deleted`);
+		if (user.isSuspended) throw new IdentifiableError(errorCodes.userIsSuspended, `Can't update featured for ${userId}: user is suspended`);
+		if (!user.featured) throw new IdentifiableError(errorCodes.noFeaturedCollection, `Can't update featured for ${userId}: no featured collection`);
 
 		this.logger.info(`Updating featured notes for: ${user.uri}`);
 
diff --git a/packages/backend/src/misc/identifiable-error.ts b/packages/backend/src/misc/identifiable-error.ts
index 9497791ea1..782c2efd67 100644
--- a/packages/backend/src/misc/identifiable-error.ts
+++ b/packages/backend/src/misc/identifiable-error.ts
@@ -25,3 +25,15 @@ export class IdentifiableError extends Error {
 		this.isRetryable = isRetryable;
 	}
 }
+
+/**
+ * Standard error codes to reference throughout the app
+ */
+export const errorCodes = {
+	// User has been deleted (hard or soft deleted)
+	userIsDeleted: '4cac9436-baa3-4955-a368-7628aea676cf',
+	// User is suspended (directly or by instance)
+	userIsSuspended: '1e56d624-737f-48e4-beb6-0bdddb9fa809',
+	// User has no valid featured collection (not defined, invalid, etc)
+	noFeaturedCollection: '2aa4766e-b7d8-4291-a671-56800498b085',
+} as const;
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index b1b38ff788..eb7ebbe9a4 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -28,6 +28,8 @@ import { trackTask } from '@/misc/promise-tracker.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { ApLogService } from '@/core/ApLogService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
+import { isRemoteUser } from '@/models/User.js';
+import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -110,7 +112,7 @@ export class BackgroundTaskProcessorService {
 		const user = await this.cacheService.findOptionalUserById(task.userId);
 		if (!user || user.isDeleted) return `Skipping update-user task: user ${task.userId} has been deleted`;
 		if (user.isSuspended) return `Skipping update-user task: user ${task.userId} is suspended`;
-		if (!user.uri) return `Skipping update-user task: user ${task.userId} is local`;
+		if (!isRemoteUser(user)) return `Skipping update-user task: user ${task.userId} is local`;
 
 		if (user.lastFetchedAt && Date.now() - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-user task: user ${task.userId} was recently updated`;
@@ -124,14 +126,23 @@ export class BackgroundTaskProcessorService {
 		const user = await this.cacheService.findOptionalUserById(task.userId);
 		if (!user || user.isDeleted) return `Skipping update-featured task: user ${task.userId} has been deleted`;
 		if (user.isSuspended) return `Skipping update-featured task: user ${task.userId} is suspended`;
-		if (!user.uri) return `Skipping update-featured task: user ${task.userId} is local`;
+		if (!isRemoteUser(user)) return `Skipping update-featured task: user ${task.userId} is local`;
 		if (!user.featured) return `Skipping update-featured task: user ${task.userId} has no featured collection`;
 
 		if (user.lastFetchedAt && Date.now() - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-featured task: user ${task.userId} was recently updated`;
 		}
 
-		await this.apPersonService.updateFeatured(user);
+		try {
+			await this.apPersonService.updateFeatured(user);
+		} catch (err) {
+			if (err instanceof IdentifiableError) {
+				if (err.id === errorCodes.userIsSuspended) return err.message;
+				if (err.id === errorCodes.userIsDeleted) return err.message;
+				if (err.id === errorCodes.noFeaturedCollection) return err.message;
+			}
+			throw err;
+		}
 		return 'ok';
 	}
 
@@ -139,7 +150,7 @@ export class BackgroundTaskProcessorService {
 		const user = await this.cacheService.findOptionalUserById(task.userId);
 		if (!user || user.isDeleted) return `Skipping update-user-tags task: user ${task.userId} has been deleted`;
 		if (user.isSuspended) return `Skipping update-user-tags task: user ${task.userId} is suspended`;
-		if (!user.uri) return `Skipping update-user-tags task: user ${task.userId} is local`;
+		if (!isRemoteUser(user)) return `Skipping update-user-tags task: user ${task.userId} is local`;
 
 		await this.hashtagService.updateUsertags(user, user.tags);
 		return 'ok';
diff --git a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
index 27c3e63ade..aec1d54fbe 100644
--- a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
+++ b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private readonly cacheService: CacheService,
 	) {
 		super(meta, paramDef, async (ps) => {
-			const user = await this.cacheService.findRemoteUserById(ps.userId);
+			const user = await this.cacheService.findRemoteUserById(ps.userId).catch(() => null);
 
 			if (!user) {
 				throw new ApiError(meta.errors.noSuchUser);
diff --git a/packages/backend/test/misc/immediateBackgroundTasks.ts b/packages/backend/test/misc/immediateBackgroundTasks.ts
index 24c344da2f..a60a2cd7f8 100644
--- a/packages/backend/test/misc/immediateBackgroundTasks.ts
+++ b/packages/backend/test/misc/immediateBackgroundTasks.ts
@@ -3,25 +3,33 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import type { MiRemoteUser } from '@/models/User.js';
+import type { MiInstance } from '@/models/Instance.js';
+import type { Resolver } from '@/core/activitypub/ApResolverService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
-import { MiUser } from '@/models/User.js';
 import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
-import { MiInstance } from '@/models/Instance.js';
-import { Resolver } from '@/core/activitypub/ApResolverService.js';
 import { bindThis } from '@/decorators.js';
+import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
 
 export class ImmediateApPersonService extends ApPersonService {
 	public resolver?: Resolver;
 
 	@bindThis
-	async updatePersonLazy(uriOrUser: string | MiUser): Promise<void> {
+	async updatePersonLazy(uriOrUser: string | MiRemoteUser): Promise<void> {
 		const userId = typeof(uriOrUser) === 'object' ? uriOrUser.id : uriOrUser;
 		await this.updatePerson(userId, this.resolver);
 	}
 
 	@bindThis
-	async updateFeaturedLazy(userOrId: string | MiUser): Promise<void> {
-		await this.updateFeatured(userOrId, this.resolver);
+	async updateFeaturedLazy(userOrId: string | MiRemoteUser): Promise<void> {
+		await this.updateFeatured(userOrId, this.resolver).catch(err => {
+			if (err instanceof IdentifiableError) {
+				if (err.id === errorCodes.userIsSuspended) return;
+				if (err.id === errorCodes.userIsDeleted) return;
+				if (err.id === errorCodes.noFeaturedCollection) return;
+			}
+			throw err;
+		});
 	}
 }
 

From d2a20fcccd18c9a1cf063bd3c693c29ee1bbd067 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 12:31:36 -0400
Subject: [PATCH 084/107] record more logs from Background Queue

---
 packages/backend/src/core/QueueService.ts           |  9 ---------
 packages/backend/src/queue/QueueProcessorService.ts | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 99911f38a7..344ea2ab40 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -940,15 +940,6 @@ export class QueueService implements OnModuleInit {
 			data.type,
 			data,
 			{
-				removeOnComplete: {
-					age: 3600 * 24 * 7, // keep up to 7 days
-					count: 30,
-				},
-				removeOnFail: {
-					age: 3600 * 24 * 7, // keep up to 7 days
-					count: 100,
-				},
-
 				// https://docs.bullmq.io/guide/retrying-failing-jobs#custom-back-off-strategies
 				attempts: this.config.backgroundJobMaxAttempts ?? 8,
 				backoff: {
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index b04d19618f..0124660227 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -591,6 +591,16 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				settings: {
 					backoffStrategy: httpRelatedBackoff,
 				},
+				// Keep a lot of jobs, because this queue moves *fast*!
+				// https://docs.bullmq.io/guide/workers/auto-removal-of-jobs
+				removeOnComplete: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 1000,
+				},
+				removeOnFail: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 1000,
+				},
 			});
 			this.backgroundTaskWorker
 				.on('active', (job) => logger.debug(`active id=${job.id}`))

From c647481b221eabdd53632477804e1b2659f3e851 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 12:37:34 -0400
Subject: [PATCH 085/107] regenerate misskey-js

---
 packages/misskey-js/etc/misskey-js.api.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 33f2459b94..4ee76288e1 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -3499,6 +3499,12 @@ type QueueStats = {
         waiting: number;
         delayed: number;
     };
+    background: {
+        activeSincePrevTick: number;
+        active: number;
+        waiting: number;
+        delayed: number;
+    };
 };
 
 // @public (undocumented)

From 94c4df602f6ed58b833de49babd603bebf9f98d4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 13:27:31 -0400
Subject: [PATCH 086/107] add MiUser.lastFetchedFeaturedAt

---
 ...1758129782800-add-user-lastFetchedFeaturedAt.js | 14 ++++++++++++++
 packages/backend/src/core/ReversiService.ts        |  2 ++
 .../src/core/activitypub/models/ApPersonService.ts |  9 ++++++++-
 packages/backend/src/models/User.ts                |  5 +++++
 .../processors/BackgroundTaskProcessorService.ts   |  2 +-
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 packages/backend/migration/1758129782800-add-user-lastFetchedFeaturedAt.js

diff --git a/packages/backend/migration/1758129782800-add-user-lastFetchedFeaturedAt.js b/packages/backend/migration/1758129782800-add-user-lastFetchedFeaturedAt.js
new file mode 100644
index 0000000000..fc3713cec9
--- /dev/null
+++ b/packages/backend/migration/1758129782800-add-user-lastFetchedFeaturedAt.js
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddUserLastFetchedFeaturedAt1758129782800 {
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" ADD "lastFetchedFeaturedAt" DATE`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "lastFetchedFeaturedAt"`);
+	}
+}
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index 2edba73677..388ebf61e2 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -587,6 +587,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 					updatedAt: parsed.user1.updatedAt != null ? new Date(parsed.user1.updatedAt) : null,
 					lastActiveDate: parsed.user1.lastActiveDate != null ? new Date(parsed.user1.lastActiveDate) : null,
 					lastFetchedAt: parsed.user1.lastFetchedAt != null ? new Date(parsed.user1.lastFetchedAt) : null,
+					lastFetchedFeaturedAt: parsed.user1.lastFetchedFeaturedAt != null ? new Date(parsed.user1.lastFetchedFeaturedAt) : null,
 					movedAt: parsed.user1.movedAt != null ? new Date(parsed.user1.movedAt) : null,
 					instance: null,
 					userProfile: null,
@@ -599,6 +600,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 					updatedAt: parsed.user2.updatedAt != null ? new Date(parsed.user2.updatedAt) : null,
 					lastActiveDate: parsed.user2.lastActiveDate != null ? new Date(parsed.user2.lastActiveDate) : null,
 					lastFetchedAt: parsed.user2.lastFetchedAt != null ? new Date(parsed.user2.lastFetchedAt) : null,
+					lastFetchedFeaturedAt: parsed.user2.lastFetchedFeaturedAt != null ? new Date(parsed.user2.lastFetchedFeaturedAt) : null,
 					movedAt: parsed.user2.movedAt != null ? new Date(parsed.user2.movedAt) : null,
 					instance: null,
 					userProfile: null,
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index f28f4cdd8d..66311d4655 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -701,13 +701,16 @@ export class ApPersonService implements OnModuleInit {
 
 		const profileUrls = url ? [url, person.id] : [person.id];
 		const verifiedLinks = await verifyFieldLinks(fields, profileUrls, this.httpRequestService);
+		const featuredUri = person.featured ? getApId(person.featured) : undefined;
 
 		const updates = {
 			lastFetchedAt: this.timeService.date,
 			inbox: person.inbox,
 			sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
 			followersUri: person.followers ? getApId(person.followers) : undefined,
-			featured: person.featured ? getApId(person.featured) : undefined,
+			// If the featured collection changes, then reset the fetch timeout.
+			lastFetchedFeaturedAt: featuredUri !== exist.featured ? null : undefined,
+			featured: featuredUri,
 			emojis: emojiNames,
 			name: truncate(person.name, nameLength),
 			tags,
@@ -948,6 +951,10 @@ export class ApPersonService implements OnModuleInit {
 
 		resolver ??= this.apResolverService.createResolver();
 
+		// Mark as updated
+		await this.usersRepository.update({ id: userId }, { lastFetchedFeaturedAt: new Date() });
+		await this.internalEventService.emit('remoteUserUpdated', { id: userId });
+
 		// Resolve and regist Notes
 		const maxPinned = (await this.roleService.getUserPolicies(user.id)).pinLimit;
 		const items = await resolver.resolveCollectionItems(user.featured, true, user.uri, maxPinned, 2);
diff --git a/packages/backend/src/models/User.ts b/packages/backend/src/models/User.ts
index b2b13e1724..10c142c53b 100644
--- a/packages/backend/src/models/User.ts
+++ b/packages/backend/src/models/User.ts
@@ -28,6 +28,11 @@ export class MiUser {
 	})
 	public lastFetchedAt: Date | null;
 
+	@Column('timestamp with time zone', {
+		nullable: true,
+	})
+	public lastFetchedFeaturedAt?: Date | null;
+
 	@Index()
 	@Column('timestamp with time zone', {
 		nullable: true,
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index eb7ebbe9a4..3d10996baf 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -129,7 +129,7 @@ export class BackgroundTaskProcessorService {
 		if (!isRemoteUser(user)) return `Skipping update-featured task: user ${task.userId} is local`;
 		if (!user.featured) return `Skipping update-featured task: user ${task.userId} has no featured collection`;
 
-		if (user.lastFetchedAt && Date.now() - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
+		if (user.lastFetchedFeaturedAt && Date.now() - user.lastFetchedFeaturedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-featured task: user ${task.userId} was recently updated`;
 		}
 

From 372385b755678ba767bbd36311fef19b025cb905 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 17 Sep 2025 15:19:08 -0400
Subject: [PATCH 087/107] fix DB type of MiUser.lastFetchedFeaturedAt

---
 ...36690898-fix-user-lastFetchedFeaturedAt-type.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 packages/backend/migration/1758136690898-fix-user-lastFetchedFeaturedAt-type.js

diff --git a/packages/backend/migration/1758136690898-fix-user-lastFetchedFeaturedAt-type.js b/packages/backend/migration/1758136690898-fix-user-lastFetchedFeaturedAt-type.js
new file mode 100644
index 0000000000..4a0d767eb9
--- /dev/null
+++ b/packages/backend/migration/1758136690898-fix-user-lastFetchedFeaturedAt-type.js
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class FixUserLastFetchedFeaturedAtType1758136690898 {
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "lastFetchedFeaturedAt" TYPE TIMESTAMP WITH TIME ZONE`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "lastFetchedFeaturedAt" TYPE DATE`);
+	}
+}

From 87212185b2deda9d0ed87f507042cc2b9d0568e0 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 19:51:00 -0400
Subject: [PATCH 088/107] add "immediate" option to NoteDeleteService

---
 .../backend/src/core/NoteDeleteService.ts     | 33 ++++++++++++-------
 .../src/server/api/endpoints/notes/delete.ts  |  2 +-
 .../server/api/endpoints/notes/unrenote.ts    |  4 +--
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 23d6dc5753..cd23a1751a 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -28,7 +28,6 @@ import { ApLogService } from '@/core/ApLogService.js';
 import { TimeService } from '@/global/TimeService.js';
 import { trackTask } from '@/misc/promise-tracker.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
-import { CacheService } from '@/core/CacheService.js';
 
 @Injectable()
 export class NoteDeleteService {
@@ -62,15 +61,12 @@ export class NoteDeleteService {
 		private readonly apLogService: ApLogService,
 		private readonly timeService: TimeService,
 		private readonly collapsedQueueService: CollapsedQueueService,
-		private readonly cacheService: CacheService,
 	) {}
 
 	/**
 	 * 投稿を削除します。
-	 * @param user 投稿者
-	 * @param note 投稿
 	 */
-	async delete(user: { id: MiUser['id']; uri: MiUser['uri']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, quiet = false, deleter?: MiUser) {
+	async delete(user: MiUser, note: MiNote, deleter?: MiUser, immediate = false) {
 		// This kicks off lots of things that can run in parallel, but we should still wait for completion to ensure consistent state and to avoid task flood when calling in a loop.
 		const promises: Promise<unknown>[] = [];
 
@@ -91,7 +87,8 @@ export class NoteDeleteService {
 			}
 		}
 
-		if (!quiet) {
+		// Braces preserved to avoid merge conflicts
+		{
 			promises.push(this.globalEventService.publishNoteStream(note.id, 'deleted', {
 				deletedAt: deletedAt,
 			}));
@@ -188,13 +185,16 @@ export class NoteDeleteService {
 		});
 
 		// Update the Latest Note index / following feed *after* note is deleted
-		promises.push(this.latestNoteService.handleDeletedNoteDeferred(note));
+		promises.push(immediate
+			? this.latestNoteService.handleDeletedNote(note)
+			: this.latestNoteService.handleDeletedNoteDeferred(note));
 		for (const cascadingNote of cascadingNotes) {
-			promises.push(this.latestNoteService.handleDeletedNoteDeferred(cascadingNote));
+			promises.push(immediate
+				? this.latestNoteService.handleDeletedNote(cascadingNote)
+				: this.latestNoteService.handleDeletedNoteDeferred(cascadingNote));
 		}
 
-		if (deleter && (note.userId !== deleter.id)) {
-			const user = await this.cacheService.findUserById(note.userId);
+		if (deleter && (user.id !== deleter.id)) {
 			promises.push(this.moderationLogService.log(deleter, 'deleteNote', {
 				noteId: note.id,
 				noteUserId: note.userId,
@@ -207,11 +207,22 @@ export class NoteDeleteService {
 			.map(n => n.uri)
 			.filter((u): u is string => u != null);
 		if (deletedUris.length > 0) {
-			promises.push(this.apLogService.deleteObjectLogsDeferred(deletedUris));
+			promises.push(immediate
+				? this.apLogService.deleteObjectLogs(deletedUris)
+				: this.apLogService.deleteObjectLogsDeferred(deletedUris));
 		}
 
 		await trackTask(async () => {
 			await Promise.allSettled(promises);
+
+			// This is deferred to make sure we don't race the enqueue() calls
+			if (immediate) {
+				await Promise.allSettled([
+					this.collapsedQueueService.updateNoteQueue.performAllNow(),
+					this.collapsedQueueService.updateUserQueue.performAllNow(),
+					this.collapsedQueueService.updateInstanceQueue.performAllNow(),
+				]);
+			}
 		});
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts
index 9d7c9a9081..e37e8869e9 100644
--- a/packages/backend/src/server/api/endpoints/notes/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/delete.ts
@@ -70,7 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			// この操作を行うのが投稿者とは限らない(例えばモデレーター)ため
-			await this.noteDeleteService.delete(await this.usersRepository.findOneByOrFail({ id: note.userId }), note, false, me);
+			await this.noteDeleteService.delete(await this.usersRepository.findOneByOrFail({ id: note.userId }), note, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
index 5c5bd740dc..7443b1d26e 100644
--- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
@@ -70,9 +70,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// TODO inline this into the above query
 			for (const note of renotes) {
 				if (ps.quote) {
-					if (isQuote(note)) await this.noteDeleteService.delete(me, note, false);
+					if (isQuote(note)) await this.noteDeleteService.delete(me, note);
 				} else {
-					if (!isQuote(note)) await this.noteDeleteService.delete(me, note, false);
+					if (!isQuote(note)) await this.noteDeleteService.delete(me, note);
 				}
 			}
 		});

From 3aa302ff15476c62909ebdc1fa27073a88126a4e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 19:51:21 -0400
Subject: [PATCH 089/107] use immediate delete options in
 DeleteAccountProcessorService

---
 .../src/queue/processors/DeleteAccountProcessorService.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
index b95b89d6ce..f5190e67fe 100644
--- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
@@ -328,7 +328,7 @@ export class DeleteAccountProcessorService {
 
 				// Delete replies through the usual service to ensure we get all "cascading notes" logic.
 				for (const reply of replies) {
-					await this.noteDeleteService.delete(reply.user as MiUser, reply);
+					await this.noteDeleteService.delete(reply.user as MiUser, reply, undefined, true);
 				}
 
 				await this.noteEditsRepository.delete({
@@ -345,7 +345,7 @@ export class DeleteAccountProcessorService {
 				// Delete note AP logs
 				const noteUris = notes.map(n => n.uri).filter(u => !!u) as string[];
 				if (noteUris.length > 0) {
-					await this.apLogService.deleteObjectLogsDeferred(noteUris);
+					await this.apLogService.deleteObjectLogs(noteUris);
 				}
 			}
 
@@ -383,10 +383,10 @@ export class DeleteAccountProcessorService {
 
 		{ // Delete actor logs
 			if (user.uri) {
-				await this.apLogService.deleteObjectLogsDeferred(user.uri);
+				await this.apLogService.deleteObjectLogs(user.uri);
 			}
 
-			await this.apLogService.deleteInboxLogsDeferred(user.id);
+			await this.apLogService.deleteInboxLogs(user.id);
 
 			this.logger.info('All AP logs deleted');
 		}

From 75d41c39591ad4b4f2bb70543ff8428f6191c1a6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 1 Oct 2025 19:25:07 -0400
Subject: [PATCH 090/107] fix merge error

---
 packages/backend/src/core/MetaService.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/backend/src/core/MetaService.ts b/packages/backend/src/core/MetaService.ts
index 519994e57e..68902ef539 100644
--- a/packages/backend/src/core/MetaService.ts
+++ b/packages/backend/src/core/MetaService.ts
@@ -16,7 +16,6 @@ import { TimeService, type TimerHandle } from '@/global/TimeService.js';
 import { MiInstance } from '@/models/Instance.js';
 import { diffArrays } from '@/misc/diff-arrays.js';
 import type { MetasRepository } from '@/models/_.js';
-import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -37,7 +36,6 @@ export class MetaService implements OnApplicationShutdown {
 		private featuredService: FeaturedService,
 		private globalEventService: GlobalEventService,
 		private readonly timeService: TimeService,
-		private readonly federatedInstanceService: FederatedInstanceService,
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
@@ -158,7 +156,6 @@ export class MetaService implements OnApplicationShutdown {
 			});
 		}
 
-		await this.federatedInstanceService.syncCache(before, updated);
 		this.globalEventService.publishInternalEvent('metaUpdated', { before, after: updated });
 
 		return updated;

From 5d962da61ef4de0ae5409ab360567fcedd5a5735 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 1 Oct 2025 22:32:53 -0400
Subject: [PATCH 091/107] fix merge errors

---
 packages/backend/src/core/CollapsedQueueService.ts        | 7 +++++++
 packages/backend/src/core/DriveService.ts                 | 2 +-
 packages/backend/src/core/NoteDeleteService.ts            | 2 +-
 packages/backend/src/core/ReactionService.ts              | 5 ++---
 .../src/core/activitypub/models/ApPersonService.ts        | 3 +--
 packages/backend/src/misc/collapsed-queue.ts              | 8 ++++----
 packages/backend/src/server/api/GetterService.ts          | 1 -
 packages/backend/test/unit/activitypub.ts                 | 3 +--
 8 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index f142e98e35..5bb041eb76 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -16,6 +16,7 @@ import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenn
 import { DI } from '@/di-symbols.js';
 import { AntennaService } from '@/core/AntennaService.js';
 import { CacheService } from '@/core/CacheService.js';
+import type { TimeService } from '@/core/TimeService.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
@@ -84,6 +85,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 		private readonly internalEventService: InternalEventService,
 		private readonly antennaService: AntennaService,
 		private readonly cacheService: CacheService,
+		private readonly timeService: TimeService,
 
 		loggerService: LoggerService,
 	) {
@@ -94,6 +96,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		this.updateInstanceQueue = new CollapsedQueue(
 			this.internalEventService,
+			this.timeService,
 			'updateInstance',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
@@ -170,6 +173,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		this.updateUserQueue = new CollapsedQueue(
 			this.internalEventService,
+			this.timeService,
 			'updateUser',
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
@@ -221,6 +225,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		this.updateNoteQueue = new CollapsedQueue(
 			this.internalEventService,
+			this.timeService,
 			'updateNote',
 			oneMinuteInterval,
 			(oldJob, newJob) => ({
@@ -246,6 +251,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		this.updateAccessTokenQueue = new CollapsedQueue(
 			this.internalEventService,
+			this.timeService,
 			'updateAccessToken',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
@@ -266,6 +272,7 @@ export class CollapsedQueueService implements OnApplicationShutdown {
 
 		this.updateAntennaQueue = new CollapsedQueue(
 			this.internalEventService,
+			this.timeService,
 			'updateAntenna',
 			fiveMinuteInterval,
 			(oldJob, newJob) => ({
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index 28e79d1c1d..11e34a7952 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -739,7 +739,7 @@ export class DriveService {
 	}
 
 	@bindThis
-	public async deleteFile(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
+	public async deleteFile(file: MiDriveFile, isExpired = false, deleter?: { id: string }) {
 		await this.queueService.createDeleteFileJob(file.id, isExpired, deleter?.id);
 	}
 
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index cd23a1751a..bd5deec596 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -160,7 +160,7 @@ export class NoteDeleteService {
 				}
 
 				for (const cascade of cascadingNotes) {
-					if (this.userEntityService.isRemoteUser(cascade.user)) {
+					if (isRemoteUser(cascade.user)) {
 						if (!isPureRenote(cascade)) {
 							const i = await this.federatedInstanceService.fetchOrRegister(cascade.user.host);
 							await this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: -1 });
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index d818d148f0..8fe3b04180 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -10,7 +10,6 @@ import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesR
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { isLocalUser, isRemoteUser } from '@/models/User.js';
 import type { MiRemoteUser, MiUser } from '@/models/User.js';
-import { isLocalUser, isRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
 import { IdService } from '@/core/IdService.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
@@ -228,7 +227,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: this.timeService.date });
 
 		// 30%の確率、セルフではない、3日以内に投稿されたノートの場合ハイライト用ランキング更新
 		if (
@@ -346,7 +345,7 @@ export class ReactionService implements OnModuleInit {
 				.execute();
 		}
 
-		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: this.timeService.date });
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
 			reaction: this.decodeReaction(exist.reaction).reaction,
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 66311d4655..051972af19 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -122,7 +122,6 @@ export class ApPersonService implements OnModuleInit {
 		private readonly cacheManagementService: CacheManagementService,
 		private readonly utilityService: UtilityService,
 		private readonly apUtilityService: ApUtilityService,
-		private readonly idService: IdService,
 		private readonly timeService: TimeService,
 		private readonly queueService: QueueService,
 		private readonly collapsedQueueService: CollapsedQueueService,
@@ -952,7 +951,7 @@ export class ApPersonService implements OnModuleInit {
 		resolver ??= this.apResolverService.createResolver();
 
 		// Mark as updated
-		await this.usersRepository.update({ id: userId }, { lastFetchedFeaturedAt: new Date() });
+		await this.usersRepository.update({ id: userId }, { lastFetchedFeaturedAt: this.timeService.date });
 		await this.internalEventService.emit('remoteUserUpdated', { id: userId });
 
 		// Resolve and regist Notes
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 9bfcc38e55..7f7e7bb03b 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { TimeService, type TimerHandle } from '@/global/TimeService.js';
 import promiseLimit from 'promise-limit';
+import type { TimeService, TimerHandle } from '@/global/TimeService.js';
 import { InternalEventService } from '@/core/InternalEventService.js';
 import { bindThis } from '@/decorators.js';
 import { Serialized } from '@/types.js';
@@ -31,7 +31,7 @@ export class CollapsedQueue<V> {
 	private readonly deferredKeys = new Set<string>();
 
 	constructor(
-		private readonly internalEventService: InternalEventervice,
+		private readonly internalEventService: InternalEventService,
 		private readonly timeService: TimeService,
 		public readonly name: string,
 		private readonly timeout: number,
@@ -85,7 +85,7 @@ export class CollapsedQueue<V> {
 		const job = this.jobs.get(key);
 		if (!job) return;
 
-		clearTimeout(job.timer);
+		this.timeService.stopTimer(job.timer);
 		this.jobs.delete(key);
 		await this.internalEventService.emit('collapsedQueueDefer', { name: this.name, key, deferred: false });
 	}
@@ -93,7 +93,7 @@ export class CollapsedQueue<V> {
 	@bindThis
 	async performAllNow() {
 		for (const job of this.jobs.values()) {
-			clearTimeout(job.timer);
+			this.timeService.stopTimer(job.timer);
 		}
 
 		const entries = Array.from(this.jobs.entries());
diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts
index ee8018dfab..47b4e2f1bc 100644
--- a/packages/backend/src/server/api/GetterService.ts
+++ b/packages/backend/src/server/api/GetterService.ts
@@ -12,7 +12,6 @@ import { isRemoteUser, isLocalUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
 import { CacheService } from '@/core/CacheService.js';
 import { bindThis } from '@/decorators.js';
-import { CacheService } from '@/core/CacheService.js';
 
 @Injectable()
 export class GetterService {
diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index 1e2cc02f2f..85e27012dc 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -30,7 +30,6 @@ import { MiMeta, MiNote, MiUser, MiUserKeypair, UserNotePiningsRepository, UserP
 import { DI } from '@/di-symbols.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { DownloadService } from '@/core/DownloadService.js';
-import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
 import { genAidx } from '@/misc/id/aidx.js';
 import { IdService } from '@/core/IdService.js';
 import { MockResolver } from '../misc/mock-resolver.js';
@@ -186,8 +185,8 @@ describe('ActivityPub', () => {
 		cacheManagementService = app.get(CacheManagementService);
 		mockConsole = app.get<MockConsole>(DI.console);
 		notesRepository = app.get<NotesRepository>(DI.notesRepository);
-	});
 		userNotePiningsRepository = app.get<UserNotePiningsRepository>(DI.userNotePiningsRepository);
+	});
 
 	afterAll(async () => {
 		await app.close();

From 821b8bf82d4535c17e89b1769ede58ec8f71d548 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 1 Oct 2025 22:35:36 -0400
Subject: [PATCH 092/107] fix lint errors: use TimeService

---
 packages/backend/src/core/NoteCreateService.ts     |  2 +-
 packages/backend/src/core/NoteDeleteService.ts     |  2 +-
 packages/backend/src/core/NoteEditService.ts       |  2 +-
 .../processors/BackgroundTaskProcessorService.ts   | 14 ++++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 489edcf5dd..67bcd797db 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -609,7 +609,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: 1 });
 		}
 
-		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: this.timeService.date });
 
 		await this.pushToTl(note, user);
 
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index bd5deec596..6316e886c8 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -139,7 +139,7 @@ export class NoteDeleteService {
 				await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: -1 });
 			}
 
-			await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+			await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: this.timeService.date });
 
 			for (const cascade of cascadingNotes) {
 				if (!isPureRenote(cascade)) {
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index c3ecd1c2bb..f9bd39d580 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -623,7 +623,7 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() });
+		await this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: this.timeService.date });
 
 		// ハッシュタグ更新
 		await this.pushToTl(note, user);
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 3d10996baf..053673fa22 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -30,6 +30,7 @@ import { ApLogService } from '@/core/ApLogService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { isRemoteUser } from '@/models/User.js';
 import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
+import { TimeService } from '@/core/TimeService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
@@ -66,6 +67,7 @@ export class BackgroundTaskProcessorService {
 		private readonly latestNoteService: LatestNoteService,
 		private readonly userSuspendService: UserSuspendService,
 		private readonly apLogService: ApLogService,
+		private readonly timeService: TimeService,
 
 		queueLoggerService: QueueLoggerService,
 	) {
@@ -114,7 +116,7 @@ export class BackgroundTaskProcessorService {
 		if (user.isSuspended) return `Skipping update-user task: user ${task.userId} is suspended`;
 		if (!isRemoteUser(user)) return `Skipping update-user task: user ${task.userId} is local`;
 
-		if (user.lastFetchedAt && Date.now() - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
+		if (user.lastFetchedAt && this.timeService.now - user.lastFetchedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-user task: user ${task.userId} was recently updated`;
 		}
 
@@ -129,7 +131,7 @@ export class BackgroundTaskProcessorService {
 		if (!isRemoteUser(user)) return `Skipping update-featured task: user ${task.userId} is local`;
 		if (!user.featured) return `Skipping update-featured task: user ${task.userId} has no featured collection`;
 
-		if (user.lastFetchedFeaturedAt && Date.now() - user.lastFetchedFeaturedAt.getTime() < 1000 * 60 * 60 * 24) {
+		if (user.lastFetchedFeaturedAt && this.timeService.now - user.lastFetchedFeaturedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-featured task: user ${task.userId} was recently updated`;
 		}
 
@@ -171,7 +173,7 @@ export class BackgroundTaskProcessorService {
 		if (instance.isBlocked) return `Skipping update-instance task: instance ${task.host} is blocked`;
 		if (instance.suspensionState === 'goneSuspended') return `Skipping update-instance task: instance ${task.host} is gone`;
 
-		if (instance.infoUpdatedAt && Date.now() - instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24) {
+		if (instance.infoUpdatedAt && this.timeService.now - instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24) {
 			return `Skipping update-instance task: instance ${task.host} was recently updated`;
 		}
 
@@ -195,12 +197,12 @@ export class BackgroundTaskProcessorService {
 		const updateGoneSuspended = task.result === 'perm-fail' && instance.suspensionState !== 'goneSuspended';
 
 		// Check if we need to auto-suspend the instance
-		const updateAutoSuspended = instance.isNotResponding && instance.notRespondingSince && instance.suspensionState === 'none' && instance.notRespondingSince.getTime() <= Date.now() - 1000 * 60 * 60 * 24 * 7;
+		const updateAutoSuspended = instance.isNotResponding && instance.notRespondingSince && instance.suspensionState === 'none' && instance.notRespondingSince.getTime() <= this.timeService.now - 1000 * 60 * 60 * 24 * 7;
 
 		// This is messy, but we need to minimize updates to space in Postgres blocks.
 		if (updateNotResponding || updateGoneSuspended || updateAutoSuspended) {
 			await this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
-				notRespondingSince: updateNotResponding ? (success ? null : new Date()) : undefined,
+				notRespondingSince: updateNotResponding ? (success ? null : this.timeService.date) : undefined,
 				shouldSuspendGone: updateGoneSuspended || undefined,
 				shouldSuspendNotResponding: updateAutoSuspended || undefined,
 			});
@@ -241,7 +243,7 @@ export class BackgroundTaskProcessorService {
 
 		// Unsuspend instance (deferred)
 		await this.collapsedQueueService.updateInstanceQueue.enqueue(instance.id, {
-			latestRequestReceivedAt: new Date(),
+			latestRequestReceivedAt: this.timeService.date,
 			shouldUnsuspend: instance.suspensionState === 'autoSuspendedForNotResponding',
 		});
 

From 1b65893bfaebf3eb790b2564edf12733d9c8870f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 1 Oct 2025 22:40:33 -0400
Subject: [PATCH 093/107] fix import in CollapsedQueueService.ts

---
 packages/backend/src/core/CollapsedQueueService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index 5bb041eb76..e3e5229ca5 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -16,7 +16,7 @@ import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenn
 import { DI } from '@/di-symbols.js';
 import { AntennaService } from '@/core/AntennaService.js';
 import { CacheService } from '@/core/CacheService.js';
-import type { TimeService } from '@/core/TimeService.js';
+import { TimeService } from '@/core/TimeService.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,

From 342a125cbfec4d54afae15713c54b30c518b2d81 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 1 Oct 2025 22:46:04 -0400
Subject: [PATCH 094/107] fix activitypub.ts tests

---
 packages/backend/test/unit/activitypub.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index 85e27012dc..9413d715c8 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -11,6 +11,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { jest } from '@jest/globals';
 import { MockApResolverService } from '../misc/MockApResolverService.js';
 import { MockConsole } from '../misc/MockConsole.js';
+import { ImmediateApPersonService, ImmediateFetchInstanceMetadataService } from '../misc/immediateBackgroundTasks.js';
 import type { Config } from '@/config.js';
 import type { MiLocalUser, MiRemoteUser } from '@/models/User.js';
 import { ApImageService } from '@/core/activitypub/models/ApImageService.js';
@@ -25,6 +26,7 @@ import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { CacheManagementService } from '@/global/CacheManagementService.js';
 import { ApResolverService } from '@/core/activitypub/ApResolverService.js';
+import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
 import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
 import { MiMeta, MiNote, MiUser, MiUserKeypair, UserNotePiningsRepository, UserProfilesRepository, UserPublickeysRepository, UserKeypairsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
@@ -164,6 +166,8 @@ describe('ActivityPub', () => {
 			.overrideProvider(DI.meta).useValue(meta)
 			.overrideProvider(ApResolverService).useClass(MockApResolverService)
 			.overrideProvider(DI.console).useClass(MockConsole)
+			.overrideProvider(FetchInstanceMetadataService).useClass(ImmediateFetchInstanceMetadataService)
+			.overrideProvider(ApPersonService).useClass(ImmediateApPersonService)
 			.compile();
 
 		await app.init();

From a8ca345fd2de5d679617d1407e9bcccc22c9ad5b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 6 Oct 2025 00:20:31 -0400
Subject: [PATCH 095/107] regenerate misskey-js

---
 packages/misskey-js/src/autogen/types.ts | 43 ++++++++++++++++++------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index d64e8ffffd..f9a59b91a8 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -16592,7 +16592,7 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                     /** @enum {string} */
                     state: '*' | 'completed' | 'wait' | 'active' | 'paused' | 'prioritized' | 'delayed' | 'failed';
                 };
@@ -16800,19 +16800,41 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                     state: ('active' | 'paused' | 'wait' | 'delayed' | 'completed' | 'failed')[];
                     search?: string;
                 };
             };
         };
         responses: {
-            /** @description OK (without any results) */
-            204: {
+            /** @description OK (with results) */
+            200: {
                 headers: {
                     [name: string]: unknown;
                 };
-                content?: never;
+                content: {
+                    'application/json': {
+                        id?: string;
+                        name: string;
+                        data?: {
+                            [key: string]: unknown;
+                        } | null;
+                        opts: {
+                            [key: string]: unknown;
+                        };
+                        timestamp: number;
+                        processedOn?: number;
+                        processedBy?: string;
+                        finishedOn?: number;
+                        progress: unknown;
+                        attempts: number;
+                        delay: number;
+                        failedReason?: string;
+                        stackTrace?: string[];
+                        returnValue: unknown;
+                        isFailed?: boolean;
+                    }[];
+                };
             };
             /** @description Client error */
             400: {
@@ -16872,7 +16894,7 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                 };
             };
         };
@@ -16942,7 +16964,7 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                 };
             };
         };
@@ -17075,7 +17097,7 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                     jobId: string;
                 };
             };
@@ -17146,7 +17168,7 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                     jobId: string;
                 };
             };
@@ -17217,7 +17239,7 @@ export interface operations {
             content: {
                 'application/json': {
                     /** @enum {string} */
-                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost';
+                    queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver' | 'scheduleNotePost' | 'backgroundTask';
                     jobId: string;
                 };
             };
@@ -32672,6 +32694,7 @@ export interface operations {
                 content: {
                     'application/json': {
                         count: number;
+                        countAcrossNetwork: number;
                     };
                 };
             };

From 74d4799ed5dc6d2f8cbe7c12538840c842a2f050 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 9 Oct 2025 13:23:34 -0400
Subject: [PATCH 096/107] fix rebase errors

---
 packages/backend/src/core/AntennaService.ts                 | 2 +-
 packages/backend/src/core/CollapsedQueueService.ts          | 6 +++---
 packages/backend/src/core/UserService.ts                    | 2 +-
 .../backend/src/core/activitypub/models/ApPersonService.ts  | 2 +-
 packages/backend/src/misc/collapsed-queue.ts                | 2 +-
 .../src/queue/processors/BackgroundTaskProcessorService.ts  | 2 +-
 packages/backend/test/misc/mock-resolver.ts                 | 3 ++-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index ca451256db..fcb3650c5c 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -18,7 +18,7 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
 import type { MiAntenna } from '@/models/Antenna.js';
 import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import { promiseMap } from '@/misc/promise-map.js';
 import { CacheService } from './CacheService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index e3e5229ca5..faf1cee524 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -9,14 +9,14 @@ import type Logger from '@/logger.js';
 import { CollapsedQueue } from '@/misc/collapsed-queue.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import { EnvService } from '@/core/EnvService.js';
+import { EnvService } from '@/global/EnvService.js';
 import { bindThis } from '@/decorators.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, FollowingsRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { AntennaService } from '@/core/AntennaService.js';
 import { CacheService } from '@/core/CacheService.js';
-import { TimeService } from '@/core/TimeService.js';
+import { TimeService } from '@/global/TimeService.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
diff --git a/packages/backend/src/core/UserService.ts b/packages/backend/src/core/UserService.ts
index 845c83effc..4e04183523 100644
--- a/packages/backend/src/core/UserService.ts
+++ b/packages/backend/src/core/UserService.ts
@@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { CollapsedQueueService } from '@/global/CollapsedQueueService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { TimeService } from '@/global/TimeService.js';
 
 @Injectable()
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 051972af19..bce48ddd40 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -46,7 +46,7 @@ import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { promiseMap } from '@/misc/promise-map.js';
 import { getApId, getApType, getNullableApId, isActor, isPost, isPropertyValue } from '../type.js';
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 7f7e7bb03b..d9e86dd4f5 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -5,7 +5,7 @@
 
 import promiseLimit from 'promise-limit';
 import type { TimeService, TimerHandle } from '@/global/TimeService.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import { bindThis } from '@/decorators.js';
 import { Serialized } from '@/types.js';
 
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 053673fa22..f4b9309991 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -30,7 +30,7 @@ import { ApLogService } from '@/core/ApLogService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { isRemoteUser } from '@/models/User.js';
 import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
-import { TimeService } from '@/core/TimeService.js';
+import { TimeService } from '@/global/TimeService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
diff --git a/packages/backend/test/misc/mock-resolver.ts b/packages/backend/test/misc/mock-resolver.ts
index ec535751f7..04233232d9 100644
--- a/packages/backend/test/misc/mock-resolver.ts
+++ b/packages/backend/test/misc/mock-resolver.ts
@@ -22,6 +22,7 @@ import type {
 	UsersRepository,
 } from '@/models/_.js';
 import type { CacheService } from '@/core/CacheService.js';
+import type { MiLocalUser } from '@/models/User.js';
 import { ApLogService } from '@/core/ApLogService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
@@ -31,7 +32,7 @@ import { bindThis } from '@/decorators.js';
 import { Resolver } from '@/core/activitypub/ApResolverService.js';
 import { DI } from '@/di-symbols.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import type { MiLocalUser } from '@/models/User.js';
+import { NativeTimeService } from '@/global/TimeService.js';
 
 type MockResponse = {
 	type: string;

From b89cbe8a43d5517d95af8dbc369c3c0ebfd17094 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 23 Oct 2025 11:29:52 -0400
Subject: [PATCH 097/107] fix job ID for background jobs

---
 packages/backend/src/core/QueueService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 344ea2ab40..c9fd4cbd3d 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -872,7 +872,7 @@ export class QueueService implements OnModuleInit {
 	@bindThis
 	public async createPostNoteJob(noteId: string, silent: boolean, type: 'create' | 'edit') {
 		const edit = type === 'edit';
-		const duplication = `${noteId}:${type}`;
+		const duplication = `${noteId}_${type}`;
 
 		return await this.createBackgroundTask({ type: 'post-note', noteId, silent, edit }, duplication);
 	}
@@ -949,7 +949,7 @@ export class QueueService implements OnModuleInit {
 
 				// https://docs.bullmq.io/guide/jobs/deduplication
 				deduplication: typeof(duplication) === 'string'
-					? { id: `${data.type}:${duplication}` }
+					? { id: `${data.type}_${duplication}` }
 					: duplication,
 			},
 		);

From 893b4ae260cc1928bc321fa93e2ebeabe4eafb8b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 23 Oct 2025 11:30:10 -0400
Subject: [PATCH 098/107] avoid extra join in
 BackgroundTaskProcessorService.processPostNote

---
 .../src/queue/processors/BackgroundTaskProcessorService.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index f4b9309991..53edd06a64 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -253,11 +253,12 @@ export class BackgroundTaskProcessorService {
 	private async processPostNote(task: PostNoteBackgroundTask): Promise<string> {
 		const note = await this.notesRepository.findOne({
 			where: { id: task.noteId },
-			relations: { user: true, renote: true, reply: true, channel: true },
+			relations: { renote: true, reply: true, channel: true },
 		});
 		if (!note) return `Skipping post-note task: note ${task.noteId} has been deleted`;
 		const user = await this.cacheService.findUserById(note.userId);
 		if (user.isSuspended) return `Skipping post-note task: note ${task.noteId}'s user ${note.userId} is suspended`;
+		note.user = user;
 
 		const mentionedUsers = await this.cacheService.getUsers(note.mentions);
 		const poll = await this.pollsRepository.findOneBy({ noteId: note.id });

From c32ebdd4cdcf73277d7f24fe3cdcca29ce8133a8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 6 Nov 2025 21:44:54 -0500
Subject: [PATCH 099/107] fix rebase errors

---
 packages/backend/src/core/NoteEditService.ts              | 8 ++++----
 .../src/server/api/endpoints/get-online-users-count.ts    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index f9bd39d580..3a0eeaaaf8 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -350,12 +350,12 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 
 			// Check for recursion
-			if (data.renote.id === oldnote.id) {
-				throw new IdentifiableError('33510210-8452-094c-6227-4a6c05d99f02', `edit failed for ${oldnote.id}: note cannot quote itself`);
+			if (data.renote.id === oldNote.id) {
+				throw new IdentifiableError('33510210-8452-094c-6227-4a6c05d99f02', `edit failed for ${oldNote.id}: note cannot quote itself`);
 			}
 			for (let nextRenoteId = data.renote.renoteId; nextRenoteId != null;) {
-				if (nextRenoteId === oldnote.id) {
-					throw new IdentifiableError('ea93b7c2-3d6c-4e10-946b-00d50b1a75cb', `edit failed for ${oldnote.id}: note cannot quote a quote of itself`);
+				if (nextRenoteId === oldNote.id) {
+					throw new IdentifiableError('ea93b7c2-3d6c-4e10-946b-00d50b1a75cb', `edit failed for ${oldNote.id}: note cannot quote a quote of itself`);
 				}
 
 				// TODO create something like threadId but for quotes, that way we don't need full recursion
diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
index 394f422da6..0d5663b367 100644
--- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts
+++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
@@ -75,6 +75,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 		});
 
-		this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>(1000 * 60); // 1 minute
+		this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>('onlineUsers', { lifetime: 1000 * 60 }); // 1 minute
 	}
 }

From 152714ca03954c2139f181382ac1bd70abb7ad5d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 7 Nov 2025 02:25:01 -0500
Subject: [PATCH 100/107] fix lots of rebase errors

---
 .../backend/src/core/NoteCreateService.ts     | 16 +-----------
 packages/backend/src/core/NoteEditService.ts  |  3 ++-
 packages/backend/src/core/ReactionService.ts  |  5 ++--
 .../src/core/activitypub/ApResolverService.ts |  2 +-
 .../activitypub/models/ApPersonService.ts     | 23 ++--------------
 .../BackgroundTaskProcessorService.ts         |  2 +-
 .../queue/processors/InboxProcessorService.ts | 26 ++-----------------
 packages/backend/test/unit/activitypub.ts     |  2 +-
 8 files changed, 12 insertions(+), 67 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 67bcd797db..da1d23100b 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -156,7 +156,6 @@ export type PureRenoteOption = Option & { renote: MiNote } & ({ text?: null } |
 @Injectable()
 export class NoteCreateService implements OnApplicationShutdown {
 	#shutdownController = new AbortController();
-	// private updateNotesCountQueue: CollapsedQueue<MiNote['id'], number>;
 
 	constructor(
 		@Inject(DI.config)
@@ -230,7 +229,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly collapsedQueueService: CollapsedQueueService,
 	) {
-		//this.updateNotesCountQueue = new CollapsedQueue(this.timeService, process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
 
 	@bindThis
@@ -1034,23 +1032,11 @@ export class NoteCreateService implements OnApplicationShutdown {
 		return false;
 	}
 
-	// Moved to CollapsedQueueService
-	/*
-	@bindThis
-	private collapseNotesCount(oldValue: number, newValue: number) {
-		return oldValue + newValue;
-	}
-
-	@bindThis
-	private async performUpdateNotesCount(id: MiNote['id'], incrBy: number) {
-		await this.instancesRepository.increment({ id: id }, 'notesCount', incrBy);
-	}
-	*/
+	// collapseNotesCount moved to CollapsedQueueService
 
 	@bindThis
 	public async dispose(): Promise<void> {
 		this.#shutdownController.abort();
-		// await this.updateNotesCountQueue.performAllNow();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 3a0eeaaaf8..d10196b557 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -222,7 +222,8 @@ export class NoteEditService implements OnApplicationShutdown {
 		private readonly timeService: TimeService,
 		private readonly noteVisibilityService: NoteVisibilityService,
 		private readonly collapsedQueueService: CollapsedQueueService,
-	) {}
+	) {
+	}
 
 	@bindThis
 	public async edit(user: MiUser, editid: MiNote['id'], data: Option, silent = false): Promise<MiNote> {
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 8fe3b04180..b038acc0e4 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -8,8 +8,8 @@ import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository, MiMeta } from '@/models/_.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { isLocalUser, isRemoteUser } from '@/models/User.js';
 import type { MiRemoteUser, MiUser } from '@/models/User.js';
+import { isLocalUser, isRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
 import { IdService } from '@/core/IdService.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
@@ -19,7 +19,6 @@ import { NotificationService } from '@/core/NotificationService.js';
 import PerUserReactionsChart from '@/core/chart/charts/per-user-reactions.js';
 import { emojiRegex } from '@/misc/emoji-regex.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
-import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { bindThis } from '@/decorators.js';
 import { UtilityService } from '@/core/UtilityService.js';
@@ -299,7 +298,7 @@ export class ReactionService implements OnModuleInit {
 			if (['public', 'home', 'followers'].includes(note.visibility)) {
 				dm.addFollowersRecipe();
 			} else if (note.visibility === 'specified') {
-				const visibleUsers = await this.cacheService.getUsers(note.visibleUserIds);
+				const visibleUsers = await this.cacheService.findUsersById(note.visibleUserIds);
 				for (const u of visibleUsers.values()) {
 					if (isRemoteUser(u)) {
 						dm.addDirectRecipe(u as MiRemoteUser);
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index d29ad9ba31..2db7208967 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -22,8 +22,8 @@ import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { toArray } from '@/misc/prelude/array.js';
 import { isPureRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
-import { trackPromise } from '@/misc/promise-tracker.js';
 import { promiseMap } from '@/misc/promise-map.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { AnyCollection, getApId, getNullableApId, IObjectWithId, isCollection, isCollectionOrOrderedCollection, isCollectionPage, isOrderedCollection, isOrderedCollectionPage } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index bce48ddd40..7a3f59fbd0 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -74,7 +74,6 @@ export class ApPersonService implements OnModuleInit {
 	private readonly publicKeyByUserIdCache: ManagedQuantumKVCache<MiUserPublickey>;
 
 	private driveFileEntityService: DriveFileEntityService;
-	private idService: IdService;
 	private federatedInstanceService: FederatedInstanceService;
 	private fetchInstanceMetadataService: FetchInstanceMetadataService;
 	private cacheService: CacheService;
@@ -88,6 +87,7 @@ export class ApPersonService implements OnModuleInit {
 	private instanceChart: InstanceChart;
 	private accountMoveService: AccountMoveService;
 	private logger: Logger;
+	private idService: IdService;
 
 	constructor(
 		private moduleRef: ModuleRef,
@@ -184,7 +184,6 @@ export class ApPersonService implements OnModuleInit {
 	@bindThis
 	onModuleInit(): void {
 		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
-		this.idService = this.moduleRef.get('IdService');
 		this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
 		this.fetchInstanceMetadataService = this.moduleRef.get('FetchInstanceMetadataService');
 		this.cacheService = this.moduleRef.get('CacheService');
@@ -197,6 +196,7 @@ export class ApPersonService implements OnModuleInit {
 		this.usersChart = this.moduleRef.get('UsersChart');
 		this.instanceChart = this.moduleRef.get('InstanceChart');
 		this.accountMoveService = this.moduleRef.get('AccountMoveService');
+		this.idService = this.moduleRef.get('IdService');
 	}
 
 	/**
@@ -997,25 +997,6 @@ export class ApPersonService implements OnModuleInit {
 		});
 	}
 
-	@bindThis
-	private async resolveUserForFeatured(userOrId: MiRemoteUser | MiUser['id']): Promise<(MiRemoteUser & { featured: string }) | null> {
-		const userId = typeof(userOrId) === 'object' ? userOrId.id : userOrId;
-		const user = typeof(userOrId) === 'object' ? userOrId : await this.cacheService.findRemoteUserById(userId);
-
-		if (user.isDeleted || user.isSuspended) {
-			this.logger.debug(`Not updating featured for ${userId}: user is deleted`);
-			return null;
-		}
-
-		if (!user.featured) {
-			this.logger.debug(`Not updating featured for ${userId}: no featured collection`);
-			return null;
-		}
-
-		// For some reason TS doesn't recognize the type check above.
-		return user as MiRemoteUser & { featured: string };
-	}
-
 	/**
 	 * リモート由来のアカウント移行処理を行います
 	 * @param src 移行元アカウント（リモートかつupdatePerson後である必要がある、というかこれ自体がupdatePersonで呼ばれる前提）
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 53edd06a64..18706c7158 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -260,7 +260,7 @@ export class BackgroundTaskProcessorService {
 		if (user.isSuspended) return `Skipping post-note task: note ${task.noteId}'s user ${note.userId} is suspended`;
 		note.user = user;
 
-		const mentionedUsers = await this.cacheService.getUsers(note.mentions);
+		const mentionedUsers = await this.cacheService.findUsersById(note.mentions);
 		const poll = await this.pollsRepository.findOneBy({ noteId: note.id });
 
 		if (task.edit) {
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 0495501567..f8542945df 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -299,30 +299,8 @@ export class InboxProcessorService implements OnApplicationShutdown {
 		return 'ok';
 	}
 
-	// Moved to CollapsedQueueService
-	/*
-	@bindThis
-	public collapseUpdateInstanceJobs(oldJob: UpdateInstanceJob, newJob: UpdateInstanceJob) {
-		const latestRequestReceivedAt = oldJob.latestRequestReceivedAt < newJob.latestRequestReceivedAt
-			? newJob.latestRequestReceivedAt
-			: oldJob.latestRequestReceivedAt;
-		const shouldUnsuspend = oldJob.shouldUnsuspend || newJob.shouldUnsuspend;
-		return {
-			latestRequestReceivedAt,
-			shouldUnsuspend,
-		};
-	}
-
-	@bindThis
-	public async performUpdateInstance(id: string, job: UpdateInstanceJob) {
-		await this.federatedInstanceService.update(id, {
-			latestRequestReceivedAt: this.timeService.date,
-			isNotResponding: false,
-			// もしサーバーが死んでるために配信が止まっていた場合には自動的に復活させてあげる
-			suspensionState: job.shouldUnsuspend ? 'none' : undefined,
-		});
-	}
-	*/
+	// collapseUpdateInstanceJobs moved to CollapsedQueueService
+	// performUpdateInstance moved to CollapsedQueueService
 
 	@bindThis
 	public async dispose(): Promise<void> {}
diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index 9413d715c8..e80beedeed 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -28,7 +28,7 @@ import { CacheManagementService } from '@/global/CacheManagementService.js';
 import { ApResolverService } from '@/core/activitypub/ApResolverService.js';
 import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
 import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
-import { MiMeta, MiNote, MiUser, MiUserKeypair, UserNotePiningsRepository, UserProfilesRepository, UserPublickeysRepository, UserKeypairsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
+import { MiMeta, MiNote, MiUser, MiUserKeypair, UserProfilesRepository, UserPublickeysRepository, UserKeypairsRepository, UsersRepository, NotesRepository, UserNotePiningsRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { DownloadService } from '@/core/DownloadService.js';

From be517b5fdcef2ed155443d45bebdf36ec05c7c1c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 13 Nov 2025 20:08:49 -0500
Subject: [PATCH 101/107] remove check-hibernation task, as it's been obsoleted
 by HibernateUsersProcessorService

---
 packages/backend/src/core/QueueService.ts              | 10 ----------
 .../queue/processors/BackgroundTaskProcessorService.ts | 10 ----------
 packages/backend/src/queue/types.ts                    |  1 -
 3 files changed, 21 deletions(-)

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index c9fd4cbd3d..3d1ffcceba 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -877,16 +877,6 @@ export class QueueService implements OnModuleInit {
 		return await this.createBackgroundTask({ type: 'post-note', noteId, silent, edit }, duplication);
 	}
 
-	@bindThis
-	public async createCheckHibernationJob(userId: string) {
-		return await this.createBackgroundTask(
-			{ type: 'check-hibernation', userId },
-
-			// This is a very heavy task, so only run once per day per user
-			{ id: `check-hibernation:${userId}`, ttl: 1000 * 60 * 60 * 24 },
-		);
-	}
-
 	@bindThis
 	public async createUpdateUserTagsJob(userId: string) {
 		return await this.createBackgroundTask({ type: 'update-user-tags', userId }, userId);
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 18706c7158..d25424b02f 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -91,8 +91,6 @@ export class BackgroundTaskProcessorService {
 			return await this.processPostInbox(job.data);
 		} else if (job.data.type === 'post-note') {
 			return await this.processPostNote(job.data);
-		} else if (job.data.type === 'check-hibernation') {
-			return await this.processCheckHibernation(job.data);
 		} else if (job.data.type === 'delete-file') {
 			return await this.processDeleteFile(job.data);
 		} else if (job.data.type === 'update-latest-note') {
@@ -272,14 +270,6 @@ export class BackgroundTaskProcessorService {
 		return 'ok';
 	}
 
-	private async processCheckHibernation(task: CheckHibernationBackgroundTask): Promise<string> {
-		const followers = await this.cacheService.getNonHibernatedFollowers(task.userId);
-		if (followers.length < 1) return `Skipping check-hibernation task: user ${task.userId} has no non-hibernated followers`;
-
-		await this.noteCreateService.checkHibernation(followers);
-		return 'ok';
-	}
-
 	private async processDeleteFile(task: DeleteFileBackgroundTask): Promise<string> {
 		const file = await this.driveFilesRepository.findOneBy({ id: task.fileId });
 		if (!file) return `Skipping delete-file task: file ${task.fileId} has been deleted`;
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index cb31e5a3e1..f37ff581a0 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -179,7 +179,6 @@ export type BackgroundTaskJobData =
 	PostDeliverBackgroundTask |
 	PostInboxBackgroundTask |
 	PostNoteBackgroundTask |
-	CheckHibernationBackgroundTask |
 	DeleteFileBackgroundTask |
 	UpdateLatestNoteBackgroundTask |
 	PostSuspendBackgroundTask |

From bbf2466fa73c6122ad89964c2c3df55c6d9674e0 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 14 Nov 2025 19:09:50 -0500
Subject: [PATCH 102/107] remove outdated TODO comments from NoteEdit.ts

---
 packages/backend/src/models/NoteEdit.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/backend/src/models/NoteEdit.ts b/packages/backend/src/models/NoteEdit.ts
index 9e2b516754..5b7132771d 100644
--- a/packages/backend/src/models/NoteEdit.ts
+++ b/packages/backend/src/models/NoteEdit.ts
@@ -28,7 +28,6 @@ export class NoteEdit {
 	@JoinColumn()
 	public note: MiNote | null;
 
-	// TODO data migration
 	@Column({
 		...id(),
 		comment: 'The ID of author.',
@@ -98,7 +97,6 @@ export class NoteEdit {
 	})
 	public updatedAt: Date;
 
-	// TODO rename migration
 	@Column('text', {
 		nullable: true,
 	})

From a9a03272046b4e106fa020be47f98cf44c645863 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 14 Nov 2025 19:10:06 -0500
Subject: [PATCH 103/107] rename packedNote to minimizedNote to avoid confusion

---
 packages/backend/src/core/QueueService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 3d1ffcceba..15260fe272 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -895,7 +895,7 @@ export class QueueService implements OnModuleInit {
 	@bindThis
 	public async createUpdateLatestNoteJob(note: MinimalNote) {
 		// Compact the note to avoid storing the entire thing in Redis, when all we need is minimal data for categorization
-		const packedNote: MinimalNote = {
+		const minimizedNote: MinimalNote = {
 			id: note.id,
 			visibility: note.visibility,
 			userId: note.userId,
@@ -907,7 +907,7 @@ export class QueueService implements OnModuleInit {
 			fileIds: note.fileIds.length > 0 ? ['1'] : [],
 		};
 
-		return await this.createBackgroundTask({ type: 'update-latest-note', note: packedNote }, note.id);
+		return await this.createBackgroundTask({ type: 'update-latest-note', note: minimizedNote }, note.id);
 	}
 
 	@bindThis

From 4776292cee92002c8caa4004e511a6ad8debdb8f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 14 Nov 2025 19:10:16 -0500
Subject: [PATCH 104/107] fix poll change detection

---
 packages/backend/src/core/NoteEditService.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index d10196b557..daf78c359c 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -477,12 +477,9 @@ export class NoteEditService implements OnApplicationShutdown {
 		const filesChanged = oldNote.fileIds.length || data.files?.length;
 
 		const oldPoll = await this.pollsRepository.findOneBy({ noteId: oldNote.id });
-
-		const oldPollData = oldPoll ? { choices: oldPoll.choices, multiple: oldPoll.multiple, expiresAt: oldPoll.expiresAt } : null;
-		const pollChanged =
-			(data.poll == null && oldPoll != null) ||
-			(data.poll != null && oldPoll == null) ||
-			(data.poll != null && oldPoll != null && JSON.stringify(data.poll) !== JSON.stringify(oldPollData));
+		const oldPollData = oldPoll ? { choices: oldPoll.choices, multiple: oldPoll.multiple, expiresAt: oldPoll.expiresAt?.toISOString() ?? null } : null;
+		const newPollData = data.poll ? { choices: data.poll.choices, multiple: data.poll.multiple, expiresAt: data.poll.expiresAt ?? null } : null;
+		const pollChanged = data.poll !== undefined && JSON.stringify(oldPollData) !== JSON.stringify(newPollData);
 
 		if (Object.keys(update).length > 0 || filesChanged || pollChanged) {
 			const exists = await this.noteEditsRepository.findOneBy({ noteId: oldNote.id });

From 7023aeee33c4fde6fb37db7d7a3fb7d5f6b4402b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 14 Nov 2025 19:10:30 -0500
Subject: [PATCH 105/107] fix missing concurrency limit when resolving note
 attachments

---
 packages/backend/src/core/activitypub/models/ApNoteService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 690110a7f7..e1c71c3b6d 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -758,7 +758,7 @@ export class ApNoteService implements OnModuleInit {
 		const results = await promiseMap(attachments.values(), async attach => {
 			attach.sensitive ??= note.sensitive;
 			return await this.resolveImage(actor, attach);
-		});
+		}, { limit: 2 });
 
 		// Process results
 		let hasFileError = false;

From 792d54b0ca201e11a3e4e9a4d5db58fdb0587283 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 14 Nov 2025 19:24:05 -0500
Subject: [PATCH 106/107] fix rebase error

---
 packages/backend/src/server/api/endpoints/i/update.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 90b83443e4..9804e5052b 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -39,7 +39,6 @@ import { trackPromise } from '@/misc/promise-tracker.js';
 import { QueueService } from '@/core/QueueService.js';
 import { ApiLoggerService } from '../../ApiLoggerService.js';
 import { ApiError } from '../../error.js';
-import { trackPromise } from '@/misc/promise-tracker.js';
 
 export const meta = {
 	tags: ['account'],

From 5365db6b20e8f45c2937289b9872d1ee15c85d7c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 14 Nov 2025 19:25:51 -0500
Subject: [PATCH 107/107] replace exception-swallowing with findOptional
 overloads

---
 packages/backend/src/core/RemoteUserResolveService.ts      | 4 ++--
 .../backend/src/core/activitypub/ApDbResolverService.ts    | 3 +--
 .../backend/src/core/activitypub/models/ApPersonService.ts | 7 +++----
 .../server/api/endpoints/federation/update-remote-user.ts  | 2 +-
 packages/backend/src/server/api/endpoints/users/show.ts    | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts
index 3d21cb92a9..d239fb637d 100644
--- a/packages/backend/src/core/RemoteUserResolveService.ts
+++ b/packages/backend/src/core/RemoteUserResolveService.ts
@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import { IsNull } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository } from '@/models/_.js';
-import type { MiLocalUser, MiRemoteUser } from '@/models/User.js';
+import type { MiUser, MiLocalUser, MiRemoteUser } from '@/models/User.js';
 import type { Config } from '@/config.js';
 import type Logger from '@/logger.js';
 import { UtilityService } from '@/core/UtilityService.js';
@@ -59,7 +59,7 @@ export class RemoteUserResolveService {
 		const acct = Acct.toString({ username, host }); // username+host -> acct (handle)
 
 		// Try fetch from DB
-		let user = await this.cacheService.findUserByAcct(acct).catch(() => null); // Error is expected if the user doesn't exist yet
+		let user: MiUser | null | undefined = await this.cacheService.findOptionalUserByAcct(acct);
 
 		// Opportunistically update remote users
 		if (user != null && isRemoteUser(user)) {
diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index a5259b1c4a..aba526b19b 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -92,10 +92,9 @@ export class ApDbResolverService implements OnApplicationShutdown {
 		key: MiUserPublickey;
 	} | null> {
 		const key = await this.apPersonService.findPublicKeyByKeyId(keyId);
-
 		if (key == null) return null;
 
-		const user = await this.cacheService.findUserById(key.userId).catch(() => null) as MiRemoteUser | null;
+		const user = await this.cacheService.findOptionalRemoteUserById(key.userId);
 		if (user == null) return null;
 		if (user.isDeleted) return null;
 
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 7a3f59fbd0..0ee4a75e2a 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -304,14 +304,14 @@ export class ApPersonService implements OnModuleInit {
 			withSuspended: opts?.withSuspended ?? true,
 		};
 
-		let userId;
+		let userId: string | null | undefined;
 
 		// Resolve URI -> User ID
 		const parsed = this.utilityService.parseUri(uri);
 		if (parsed.local) {
 			userId = parsed.type === 'users' ? parsed.id : null;
 		} else {
-			userId = await this.uriPersonCache.fetch(uri).catch(() => null);
+			userId = await this.uriPersonCache.fetchMaybe(uri);
 		}
 
 		// No match
@@ -319,8 +319,7 @@ export class ApPersonService implements OnModuleInit {
 			return null;
 		}
 
-		const user = await this.cacheService.findUserById(userId)
-			.catch(() => null) as MiLocalUser | MiRemoteUser | null;
+		const user = await this.cacheService.findOptionalUserById(userId) as MiLocalUser | MiRemoteUser | null;
 
 		if (user?.isDeleted && !_opts.withDeleted) {
 			return null;
diff --git a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
index aec1d54fbe..c93ac79036 100644
--- a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
+++ b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private readonly cacheService: CacheService,
 	) {
 		super(meta, paramDef, async (ps) => {
-			const user = await this.cacheService.findRemoteUserById(ps.userId).catch(() => null);
+			const user = await this.cacheService.findOptionalRemoteUserById(ps.userId);
 
 			if (!user) {
 				throw new ApiError(meta.errors.noSuchUser);
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index 1733c5e460..57ed7a1482 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -138,7 +138,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				if (ps.username) {
 					user = await this.remoteUserResolveService.resolveUser(ps.username, ps.host ?? null).catch(() => null);
 				} else if (ps.userId != null) {
-					user = await this.cacheService.findUserById(ps.userId).catch(() => null);
+					user = await this.cacheService.findOptionalUserById(ps.userId);
 				}
 
 				if (user == null && ps.host != null) {