fix: Local-only activity deliver to remote

related: misskey-dev#11306
ZerglingGo · Jul 17, 2023 · f07d5c4 · f07d5c4
1 parent 9fc3e19
commit f07d5c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
@@ -619,6 +619,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (this.userEntityService.isLocalUser(user)) {
 				(async () => {
 					const noteActivity = await this.renderNoteOrRenoteActivity(data, note);
+
+					// Skip deliver if local only notes
+					if (noteActivity === null) {
+						return;
+					}
+
 					const dm = this.apDeliverManagerService.createDeliverManager(user, noteActivity);
 
 					// メンションされたリモートユーザーに配送

diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -54,6 +54,9 @@ export class InboxProcessorService {
 	public async process(job: Bull.Job<InboxJobData>): Promise<string> {
 		const signature = job.data.signature;	// HTTP-signature
 		const activity = job.data.activity;
+		if (activity === null) {
+			return 'Empty activity data';
+		}
 
 		//#region Log
 		const info = Object.assign({}, activity);

diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
@@ -18,7 +18,7 @@ export type DeliverJobData = {
 };
 
 export type InboxJobData = {
-	activity: IActivity;
+	activity: IActivity | null;
 	signature: httpSignature.IParsedSignature;
 };