From b16f5a781e2f65855c4fad8dc31a413701e55df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Sat, 18 Jan 2025 08:35:47 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20localOnly=E3=81=AA=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AE=E6=99=82=E3=81=AF=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=9D=E3=81=AE=E3=82=82=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E8=B5=B7=E5=8B=95=E3=81=97=E3=81=AA=E3=81=84=20(#15020)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): localOnlyなノートの時は配送処理そのものを起動しない

* fix CHANGELOG.md

* fix CHANGELOG.md
---
 CHANGELOG.md                                   | 1 +
 packages/backend/src/core/NoteCreateService.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 109883195d..28bfe64ecd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
 - Fix: `/api/pages/update`にて`name`を指定せずにリクエストするとエラーが発生する問題を修正
 - Fix: AIセンシティブ判定が arm64 環境で動作しない問題を修正
 - Fix: 非Misskey系のソフトウェアからHTML`<ruby>`タグを含むノートを受信した場合、MFMの読み仮名（ルビ）文法に変換して表示
+- Fix: 連合OFFで投稿されたノートに対する冗長な処理を抑止 ( #15018 )
 
 ### Misskey.js
 - Feat: allow setting `binaryType` of WebSocket connection
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 7624172468..8a79908e82 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -658,7 +658,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			nm.notify();
 
 			//#region AP deliver
-			if (this.userEntityService.isLocalUser(user)) {
+			if (!data.localOnly && this.userEntityService.isLocalUser(user)) {
 				(async () => {
 					const noteActivity = await this.renderNoteOrRenoteActivity(data, note);
 					const dm = this.apDeliverManagerService.createDeliverManager(user, noteActivity);