From 872cefcfb80eb8f0185f5b28e9aed0a2a49fc544 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:15:37 +0000
Subject: [PATCH 01/48] [skip ci] Update CHANGELOG.md (prepend template)

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fa756c0f0..8f097d16fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.11.0
 
 ### Note

From 0e90589290de7948683131b356f91265c521d280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Nov 2024 21:19:12 +0900
Subject: [PATCH 02/48] Update CHANGELOG.md (typo)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f097d16fd..a0ea1127c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,7 @@
 - Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
 - Fix: Encode RSS urls with escape sequences before fetching allowing query parameters to be used
 - Fix: リンク切れを修正
-= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
+- Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/305)
 - Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
 - Fix: 画面幅が狭い環境でデザインが崩れる問題を修正  

From 04b221409cac8e54e9f392b1a50094799c866441 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 23 Nov 2024 04:44:33 +0900
Subject: [PATCH 03/48] fix(backend): use atomic command to improve security

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

diff --git a/packages/backend/src/core/WebAuthnService.ts b/packages/backend/src/core/WebAuthnService.ts
index ad53192f18..ed75e4f467 100644
--- a/packages/backend/src/core/WebAuthnService.ts
+++ b/packages/backend/src/core/WebAuthnService.ts
@@ -189,14 +189,12 @@ export class WebAuthnService {
 	 */
 	@bindThis
 	public async verifySignInWithPasskeyAuthentication(context: string, response: AuthenticationResponseJSON): Promise<MiUser['id'] | null> {
-		const challenge = await this.redisClient.get(`webauthn:challenge:${context}`);
+		const challenge = await this.redisClient.getdel(`webauthn:challenge:${context}`);
 
 		if (!challenge) {
 			throw new IdentifiableError('2d16e51c-007b-4edd-afd2-f7dd02c947f6', `challenge '${context}' not found`);
 		}
 
-		await this.redisClient.del(`webauthn:challenge:${context}`);
-
 		const key = await this.userSecurityKeysRepository.findOneBy({
 			id: response.id,
 		});

From d91a1be56201cba91d61265bc928f70ac21a2fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 23 Nov 2024 15:35:06 +0900
Subject: [PATCH 04/48] =?UTF-8?q?fix(frontend):=20=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=8C=E5=A4=89=E3=82=8F=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E9=9A=9B=E3=81=ABnavbar=E3=81=8C=E8=87=AA=E5=8B=95?=
 =?UTF-8?q?=E3=81=A7=E6=8A=98=E3=82=8A=E3=81=9F=E3=81=9F=E3=81=BE=E3=82=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#15042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 画面サイズが変わった際にnavbarが自動で折りたたまれない問題を修正

* Update Changelog

* fix
---
 CHANGELOG.md                                 |  2 +-
 packages/frontend/src/ui/_common_/navbar.vue | 22 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0ea1127c3..3ce54e4d1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 -
 
 ### Client
--
+- 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 
 ### Server
 -
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index 8fc76741e3..9724905e02 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</component>
 			</template>
 			<div :class="$style.divider"></div>
-			<MkA v-if="$i.isAdmin || $i.isModerator" v-tooltip.noDelay.right="i18n.ts.controlPanel" :class="$style.item" :activeClass="$style.active" to="/admin">
+			<MkA v-if="$i != null && ($i.isAdmin || $i.isModerator)" v-tooltip.noDelay.right="i18n.ts.controlPanel" :class="$style.item" :activeClass="$style.active" to="/admin">
 				<i :class="$style.itemIcon" class="ti ti-dashboard ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.controlPanel }}</span>
 			</MkA>
 			<button class="_button" :class="$style.item" @click="more">
@@ -48,10 +48,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkA>
 		</div>
 		<div :class="$style.bottom">
-			<button v-tooltip.noDelay.right="i18n.ts.note" class="_button" :class="[$style.post]" data-cy-open-post-form @click="os.post">
+			<button v-tooltip.noDelay.right="i18n.ts.note" class="_button" :class="[$style.post]" data-cy-open-post-form @click="() => { os.post(); }">
 				<i class="ti ti-pencil ti-fw" :class="$style.postIcon"></i><span :class="$style.postText">{{ i18n.ts.note }}</span>
 			</button>
-			<button v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="_button" :class="[$style.account]" @click="openAccountMenu">
+			<button v-if="$i != null" v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="_button" :class="[$style.account]" @click="openAccountMenu">
 				<MkAvatar :user="$i" :class="$style.avatar"/><MkAcct class="_nowrap" :class="$style.acct" :user="$i"/>
 			</button>
 		</div>
@@ -83,8 +83,12 @@ import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
+import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
 
-const iconOnly = ref(false);
+const forceIconOnly = ref(window.innerWidth <= 1279);
+const iconOnly = computed(() => {
+	return forceIconOnly.value || (defaultStore.reactiveState.menuDisplay.value === 'sideIcon');
+});
 
 const menu = computed(() => defaultStore.state.menu);
 const otherMenuItemIndicated = computed(() => {
@@ -95,14 +99,10 @@ const otherMenuItemIndicated = computed(() => {
 	return false;
 });
 
-const forceIconOnly = window.innerWidth <= 1279;
-
 function calcViewState() {
-	iconOnly.value = forceIconOnly || (defaultStore.state.menuDisplay === 'sideIcon');
+	forceIconOnly.value = window.innerWidth <= 1279;
 }
 
-calcViewState();
-
 window.addEventListener('resize', calcViewState);
 
 watch(defaultStore.reactiveState.menuDisplay, () => {
@@ -120,8 +120,10 @@ function openAccountMenu(ev: MouseEvent) {
 }
 
 function more(ev: MouseEvent) {
+	const target = getHTMLElementOrNull(ev.currentTarget ?? ev.target);
+	if (!target) return;
 	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
-		src: ev.currentTarget ?? ev.target,
+		src: target,
 	}, {
 		closed: () => dispose(),
 	});

From 00301ed04f144c57e2ed54b5103292ef573e8c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 23 Nov 2024 16:05:10 +0900
Subject: [PATCH 05/48] =?UTF-8?q?Update=20CHANGELOG.md=20(=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E6=96=B9=E3=82=92=E6=8F=83=E3=81=88=E3=82=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ce54e4d1d..762ecafbdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 -
 
 ### Client
-- 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
+- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 
 ### Server
 -

From a77ad7a16ba3f5c4845fe0716a72c7f01c285e9b 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, 23 Nov 2024 16:45:05 +0900
Subject: [PATCH 06/48] =?UTF-8?q?fix(backend):=20=E3=82=A2=E3=83=89?=
 =?UTF-8?q?=E3=83=AC=E3=82=B9=E5=85=A5=E5=8A=9B=E3=81=A7=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=AE=E3=83=97=E3=83=AD=E3=83=95?=
 =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=9F=E9=9A=9B=E3=80=81=E5=89=8D?=
 =?UTF-8?q?=E6=8F=90=E3=83=87=E3=83=BC=E3=82=BF=E3=81=8C=E8=B6=B3=E3=82=8A?=
 =?UTF-8?q?=E3=81=9A=E6=8F=8F=E7=94=BB=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=20(#15033)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する

* fix CHANGELOG.md
---
 CHANGELOG.md                                           | 2 +-
 packages/backend/src/server/web/ClientServerService.ts | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 762ecafbdb..7896a42883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 
 ### Server
--
+- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
 
 
 ## 2024.11.0
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 1b8873214b..e356e0d76c 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -585,7 +585,10 @@ export class ClientServerService {
 					reply.header('X-Robots-Tag', 'noai');
 				}
 
-				const _user = await this.userEntityService.pack(user);
+				const _user = await this.userEntityService.pack(user, null, {
+					schema: 'UserDetailed',
+					userProfile: profile,
+				});
 
 				return await reply.view('user', {
 					user, profile, me,

From ae1d0b08eb7d95a79d23d1f2c1d9d69cc0650e0a Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sat, 23 Nov 2024 17:42:55 +0900
Subject: [PATCH 07/48] ci: do not run chromatic on fork repositories (#15041)

---
 .github/workflows/storybook.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index c02f38ee0b..efcf0291d8 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -15,6 +15,8 @@ on:
 
 jobs:
   build:
+    # chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
+    if: github.repository == 'misskey-dev/misskey'
     runs-on: ubuntu-latest
 
     env:

From d176db517fd11b63e83daa7c1f45ecd25bd0750e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 24 Nov 2024 15:23:07 +0900
Subject: [PATCH 08/48] =?UTF-8?q?fix(backend/misskey-js):=20=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=9D=E4=BF=AE=E6=AD=A3=20(#15046)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/server/api/openapi/gen-spec.ts        |   2 +-
 packages/misskey-js/src/autogen/types.ts      | 110 +++++++++---------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index efa47a6986..3b20ec1321 100644
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -183,7 +183,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
 				},
 				...(endpoint.meta.limit ? {
 					'429': {
-						description: 'To many requests',
+						description: 'Too many requests',
 						content: {
 							'application/json': {
 								schema: {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 280abba727..42ca05e057 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -10593,7 +10593,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -11112,7 +11112,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -11179,7 +11179,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -11573,7 +11573,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -11633,7 +11633,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -11756,7 +11756,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -13351,7 +13351,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -14184,7 +14184,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -14531,7 +14531,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -14656,7 +14656,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -15151,7 +15151,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -15624,7 +15624,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -15684,7 +15684,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -15747,7 +15747,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -15806,7 +15806,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -15866,7 +15866,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -16373,7 +16373,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -16648,7 +16648,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -17908,7 +17908,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -17969,7 +17969,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18020,7 +18020,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18071,7 +18071,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18122,7 +18122,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18173,7 +18173,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18224,7 +18224,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18275,7 +18275,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18512,7 +18512,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18572,7 +18572,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18631,7 +18631,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18690,7 +18690,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18749,7 +18749,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18817,7 +18817,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -18885,7 +18885,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -19877,7 +19877,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -20114,7 +20114,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -20174,7 +20174,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -20544,7 +20544,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -21023,7 +21023,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -21191,7 +21191,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -21688,7 +21688,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -21746,7 +21746,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -21804,7 +21804,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -22464,7 +22464,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -22898,7 +22898,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23142,7 +23142,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23278,7 +23278,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23416,7 +23416,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23550,7 +23550,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23882,7 +23882,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23949,7 +23949,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -24279,7 +24279,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -24829,7 +24829,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -26108,7 +26108,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -27398,7 +27398,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -27512,7 +27512,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];

From eddf6a23197e1a14b20423c7da08206034d198aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 24 Nov 2024 15:23:21 +0900
Subject: [PATCH 09/48] =?UTF-8?q?fix(frontend):=20=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=83=89=E3=82=AD=E3=83=A5=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=81=A8Misskey=E9=96=A2=E9=80=A3=E3=83=AA=E3=82=BD?=
 =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=81=A8=E3=81=AE=E9=96=93=E3=81=ABdivider?=
 =?UTF-8?q?=E3=81=8C=E5=85=A5=E3=82=89=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#15044)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): サーバードキュメントとMisskey関連リソースとの間にdividerが入らないことがある問題を修正

* Update Changelog
---
 CHANGELOG.md                                | 1 +
 packages/frontend/src/ui/_common_/common.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7896a42883..b8eca4c355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Client
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
+- Fix: サーバー情報メニューに区切り線が不足していたのを修正
 
 ### Server
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index f908803f01..b31254196a 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -124,7 +124,7 @@ export function openInstanceMenu(ev: MouseEvent) {
 		});
 	}
 
-	if (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) {
+	if (instance.impressumUrl != null || instance.tosUrl != null || instance.privacyPolicyUrl != null) {
 		menuItems.push({ type: 'divider' });
 	}
 

From a0e91b5882379b31b379ec366ed09e7253c788bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 24 Nov 2024 20:43:47 +0900
Subject: [PATCH 10/48] =?UTF-8?q?fix(backend):=20=E8=B5=B7=E5=8B=95?=
 =?UTF-8?q?=E5=89=8D=E3=81=AE=E7=96=8E=E9=80=9A=E3=83=81=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=81=8C=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=AA=E3=81=8F?=
 =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#15043)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* check harder for connectibility

`allSettled` does not throw if a promise is rejected, so
`check_connect` never actually failed

* Update Changelog

---------

Co-authored-by: dakkar <dakkar@thenautilus.net>
---
 CHANGELOG.md                              | 2 ++
 packages/backend/scripts/check_connect.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8eca4c355..badcf1cebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 
 ### Server
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
+- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
 
 
 ## 2024.11.0
diff --git a/packages/backend/scripts/check_connect.js b/packages/backend/scripts/check_connect.js
index bb149444b5..96c4549ccb 100644
--- a/packages/backend/scripts/check_connect.js
+++ b/packages/backend/scripts/check_connect.js
@@ -53,4 +53,4 @@ const promises = Array
 		connectToPostgres()
 	]);
 
-await Promise.allSettled(promises);
+await Promise.all(promises);

From dd56623cded7cc7a355d1dc59e46e2d8f1ed3660 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sun, 24 Nov 2024 20:44:59 +0900
Subject: [PATCH 11/48] fix: unable to upload to local object storage (#15040)

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

diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index bb2a463354..37721d2bf1 100644
--- a/packages/backend/src/core/S3Service.ts
+++ b/packages/backend/src/core/S3Service.ts
@@ -28,7 +28,7 @@ export class S3Service {
 			? `${meta.objectStorageUseSSL ? 'https' : 'http'}://${meta.objectStorageEndpoint}`
 			: `${meta.objectStorageUseSSL ? 'https' : 'http'}://example.net`; // dummy url to select http(s) agent
 
-		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy);
+		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy, true);
 		const handlerOption: NodeHttpHandlerOptions = {};
 		if (meta.objectStorageUseSSL) {
 			handlerOption.httpsAgent = agent as https.Agent;

From 8076f78d06786dd60db121b588289be54731b13e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:18:00 +0000
Subject: [PATCH 12/48] Bump version to 2024.11.1-alpha.0

---
 CHANGELOG.md                     | 2 +-
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index badcf1cebb..8f2c36ffc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 2024.11.1
 
 ### General
 -
diff --git a/package.json b/package.json
index 60de6f4e15..b91f044ff7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0",
+	"version": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 7994dac1e4..6a2b45150d 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0",
+	"version": "2024.11.1-alpha.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 7d6c23f85f423b5e10ceadea7b9c0ba9c78f355e Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 26 Nov 2024 15:39:57 +0900
Subject: [PATCH 13/48] fix(cherrypick-js): build cherrypick-js with types

---
 packages/cherrypick-js/src/autogen/types.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
index e4a920869e..67211794a6 100644
--- a/packages/cherrypick-js/src/autogen/types.ts
+++ b/packages/cherrypick-js/src/autogen/types.ts
@@ -21936,7 +21936,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -21994,7 +21994,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -23137,7 +23137,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -24294,7 +24294,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -24352,7 +24352,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -24437,7 +24437,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -25981,7 +25981,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];
@@ -27818,7 +27818,7 @@ export type operations = {
           'application/json': components['schemas']['Error'];
         };
       };
-      /** @description To many requests */
+      /** @description Too many requests */
       429: {
         content: {
           'application/json': components['schemas']['Error'];

From 1557ce235b335ef7562237a1cef860bdcf5e3be6 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 26 Nov 2024 15:40:34 +0900
Subject: [PATCH 14/48] 4.14.0-alpha.0

---
 package.json                        | 2 +-
 packages/cherrypick-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 62074b2cdf..bf14ca30be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.14.0",
+	"version": "4.14.0-alpha.0",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
index b1b30d74c9..ff35ece1d8 100644
--- a/packages/cherrypick-js/package.json
+++ b/packages/cherrypick-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.14.0",
+	"version": "4.14.0-alpha.0",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",

From 398a3c1da8c9212e1999069cf68f795924da1fb4 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 26 Nov 2024 15:41:43 +0900
Subject: [PATCH 15/48] fix version

---
 package.json                        | 2 +-
 packages/cherrypick-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index bf14ca30be..ef6fe37dda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.14.0-alpha.0",
+	"version": "4.14.1-alpha.0",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
index ff35ece1d8..43f985cdf7 100644
--- a/packages/cherrypick-js/package.json
+++ b/packages/cherrypick-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.14.0-alpha.0",
+	"version": "4.14.1-alpha.0",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",

From 587469d67425d4a7c5838706f059ab903d5a59a9 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 26 Nov 2024 16:09:10 +0900
Subject: [PATCH 16/48] =?UTF-8?q?fix(frontend):=20=EB=85=B8=ED=8A=B8=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=9D=B4=EB=A6=84?=
 =?UTF-8?q?=EC=9D=B4=20=EC=A4=91=EB=B3=B5=EC=9C=BC=EB=A1=9C=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=90=A0=20=EC=88=98=20=EC=9E=88=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                             | 10 ++++++++++
 packages/frontend/src/components/MkNoteDetailed.vue |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index dde84ebf49..8043a403ec 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -23,6 +23,16 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 # 릴리스 노트
 이 문서는 CherryPick의 변경 사항만 포함합니다.
 
+## 4.x.x
+출시일: unreleased<br>
+기반 Misskey 버전: 2024.x.x<br>
+Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.
+
+### Client
+- Fix: 노트 상세 페이지에서 사용자 이름이 중복으로 표시될 수 있음
+
+---
+
 ## 4.14.0
 출시일: 2024/11/26<br>
 기반 Misskey 버전: 2024.11.0<br>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 41657adc0c..9440cbbe2c 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -87,9 +87,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkInstanceTicker v-if="showTicker" :instance="appearNote.user.instance" @click="showOnRemote"/>
 				</div>
 				<div :class="$style.noteHeaderUsernameAndBadgeRoles">
+					<!--
 					<div :class="$style.noteHeaderUsername">
 						<MkAcct :user="appearNote.user"/>
 					</div>
+					-->
 					<div v-if="appearNote.user.badgeRoles" :class="$style.noteHeaderBadgeRoles">
 						<img v-for="(role, i) in appearNote.user.badgeRoles" :key="i" v-tooltip="role.name" :class="$style.noteHeaderBadgeRole" :src="role.iconUrl!"/>
 					</div>

From 34c1b4e5b072e92265a88bca133fad3bb0c5731e Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 26 Nov 2024 16:29:25 +0900
Subject: [PATCH 17/48] =?UTF-8?q?fix(frontend):=20=EC=BB=A4=EC=8A=A4?=
 =?UTF-8?q?=ED=85=80=20=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=97=AD=ED=95=A0=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=EA=B0=80=20=EC=9B=90=EA=B2=A9=20=EC=84=9C?=
 =?UTF-8?q?=EB=B2=84=EC=9D=98=20=EC=9D=B4=EB=AA=A8=EC=A7=80=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=AC=20=EC=88=98=20=EC=97=86=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                                         | 1 +
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 packages/frontend/src/components/global/MkCustomEmoji.vue       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 8043a403ec..413d2689c0 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -30,6 +30,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 
 ### Client
 - Fix: 노트 상세 페이지에서 사용자 이름이 중복으로 표시될 수 있음
+- Fix: 커스텀 이모지 관리 역할이 있는 사용자가 원격 서버의 이모지를 가져올 수 없음
 
 ---
 
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 1b0571744a..77ddeb8098 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -120,7 +120,7 @@ async function toggleReaction(ev: MouseEvent) {
 }
 
 function stealReaction(ev: MouseEvent) {
-	if (!props.note.user.host && $i && !($i.isAdmin ?? $i.policies.canManageCustomEmojis)) return;
+	if (!props.note.user.host && $i && !($i.isAdmin || $i.policies.canManageCustomEmojis)) return;
 
 	os.popupMenu([{
 		type: 'label',
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 75782f1da0..6015a254db 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -109,7 +109,7 @@ function onClick(ev: MouseEvent) {
 		}] : []),
 		);
 
-		if (props.host && $i && ($i.isAdmin ?? $i.policies.canManageCustomEmojis)) {
+		if (props.host && $i && ($i.isAdmin || $i.policies.canManageCustomEmojis)) {
 			menuItems.push({
 				text: i18n.ts.import,
 				icon: 'ti ti-plus',

From dd9f947453c11c19641681ccd61ab3a37f45198c Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:57:15 +0900
Subject: [PATCH 18/48] fix

---
 packages/frontend/src/pages/admin/settings.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 44bf317003..5a0f38b390 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -253,9 +253,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkFolder>
 					<template #icon><i class="ti ti-exclamation-circle"></i></template>
 					<template #label>{{ i18n.ts.abuseReports }}</template>
+					<template v-if="emailToReceiveAbuseReportForm.modified.value" #footer>
+						<MkFormFooter :form="emailToReceiveAbuseReportForm"/>
+					</template>
 
 					<div class="_gaps_m">
 						<MkInput v-model="emailToReceiveAbuseReportForm.state.emailToReceiveAbuseReport" type="email">
+							<span v-if="emailToReceiveAbuseReportForm.modifiedStates.emailToReceiveAbuseReport" class="_modified">{{ i18n.ts.modified }}</span>
 							<template #prefix><i class="ti ti-mail"></i></template>
 							<template #label>{{ i18n.ts.emailToReceiveAbuseReport }}</template>
 							<template #caption>{{ i18n.ts.emailToReceiveAbuseReportCaption }}</template>

From 180c7f9b8dd4a749268002325c58e618953eb02e Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Wed, 27 Nov 2024 12:15:57 +0900
Subject: [PATCH 19/48] fix span

---
 packages/frontend/src/pages/admin/settings.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 5a0f38b390..154a0be47c 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -259,9 +259,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 					<div class="_gaps_m">
 						<MkInput v-model="emailToReceiveAbuseReportForm.state.emailToReceiveAbuseReport" type="email">
-							<span v-if="emailToReceiveAbuseReportForm.modifiedStates.emailToReceiveAbuseReport" class="_modified">{{ i18n.ts.modified }}</span>
 							<template #prefix><i class="ti ti-mail"></i></template>
-							<template #label>{{ i18n.ts.emailToReceiveAbuseReport }}</template>
+							<template #label>{{ i18n.ts.emailToReceiveAbuseReport }} <span v-if="emailToReceiveAbuseReportForm.modifiedStates.emailToReceiveAbuseReport" class="_modified">{{ i18n.ts.modified }}</span></template>
 							<template #caption>{{ i18n.ts.emailToReceiveAbuseReportCaption }}</template>
 						</MkInput>
 					</div>

From f23d02ff680447075a0bab13385f5988d3c8a44e Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Fri, 29 Nov 2024 11:07:55 +0900
Subject: [PATCH 20/48] Update CHANGELOG_CHERRYPICK.md

---
 CHANGELOG_CHERRYPICK.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 413d2689c0..7696ea117a 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -31,6 +31,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 ### Client
 - Fix: 노트 상세 페이지에서 사용자 이름이 중복으로 표시될 수 있음
 - Fix: 커스텀 이모지 관리 역할이 있는 사용자가 원격 서버의 이모지를 가져올 수 없음
+- Fix: 신고 알림을 받을 이메일 주소 설정을 저장할 수 없음 (kokonect-link/cherrypick#540)
 
 ---
 

From fa271cf84e7797358703d4cda0e8f48b26bdbd87 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 30 Nov 2024 13:20:49 +0900
Subject: [PATCH 21/48] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index f2becfd8f5..1a86e34969 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -384,6 +384,7 @@ const patrons = [
 	'こまつぶり',
 	'まゆつな空高',
 	'asata',
+	'ruru',
 ];
 
 const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));

From 7bb2759e057438ed4038d58ed1729fefa1e91b38 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 09:40:01 +0900
Subject: [PATCH 22/48] chore

---
 packages/frontend/src/ui/_common_/navbar-for-mobile.vue | 2 +-
 packages/frontend/src/ui/_common_/navbar.vue            | 2 +-
 packages/frontend/src/ui/classic.header.vue             | 2 +-
 packages/frontend/src/ui/classic.sidebar.vue            | 2 +-
 packages/frontend/src/ui/friendly/navbar-for-mobile.vue | 2 +-
 packages/frontend/src/ui/friendly/navbar.vue            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index a63f3a5497..d69e80cbfc 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -77,7 +77,7 @@ const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
 const bannerDisplay = ref('');
 
-if ($i.isAdmin ?? $i.isModerator) {
+if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
 		state: 'unresolved',
 		limit: 1,
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index d841fb737f..2c8098c092 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -108,7 +108,7 @@ const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
 const bannerDisplay = ref('');
 
-if ($i.isAdmin ?? $i.isModerator) {
+if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
 		state: 'unresolved',
 		limit: 1,
diff --git a/packages/frontend/src/ui/classic.header.vue b/packages/frontend/src/ui/classic.header.vue
index 5dad914202..1d86d372d3 100644
--- a/packages/frontend/src/ui/classic.header.vue
+++ b/packages/frontend/src/ui/classic.header.vue
@@ -76,7 +76,7 @@ const otherNavItemIndicated = computed<boolean>(() => {
 const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
 
-if ($i.isAdmin ?? $i.isModerator) {
+if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
 		state: 'unresolved',
 		limit: 1,
diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue
index 0f9f304816..6b01194345 100644
--- a/packages/frontend/src/ui/classic.sidebar.vue
+++ b/packages/frontend/src/ui/classic.sidebar.vue
@@ -85,7 +85,7 @@ const settingsWindowed = ref(false);
 const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
 
-if ($i.isAdmin ?? $i.isModerator) {
+if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
 		state: 'unresolved',
 		limit: 1,
diff --git a/packages/frontend/src/ui/friendly/navbar-for-mobile.vue b/packages/frontend/src/ui/friendly/navbar-for-mobile.vue
index 73cece291f..d86aa153bb 100644
--- a/packages/frontend/src/ui/friendly/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/friendly/navbar-for-mobile.vue
@@ -79,7 +79,7 @@ const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
 const bannerDisplay = ref('');
 
-if ($i.isAdmin ?? $i.isModerator) {
+if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
 		state: 'unresolved',
 		limit: 1,
diff --git a/packages/frontend/src/ui/friendly/navbar.vue b/packages/frontend/src/ui/friendly/navbar.vue
index 594a886d23..7c7914da53 100644
--- a/packages/frontend/src/ui/friendly/navbar.vue
+++ b/packages/frontend/src/ui/friendly/navbar.vue
@@ -115,7 +115,7 @@ const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
 const bannerDisplay = ref('');
 
-if ($i.isAdmin ?? $i.isModerator) {
+if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
 		state: 'unresolved',
 		limit: 1,

From 9d2b4d5ffc15c35541ea72b29ea778f0e138a0fa Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 09:42:46 +0900
Subject: [PATCH 23/48] =?UTF-8?q?fix(frontend):=20=EB=84=A4=EB=B9=84?=
 =?UTF-8?q?=EA=B2=8C=EC=9D=B4=EC=85=98=20=EB=B0=94=EC=97=90=20=EB=B0=B0?=
 =?UTF-8?q?=EB=84=88=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=84=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EC=9D=8C=20(kokonect-link/cherrypick#545)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                                 | 1 +
 packages/frontend/src/ui/_common_/navbar-for-mobile.vue | 2 +-
 packages/frontend/src/ui/_common_/navbar.vue            | 2 +-
 packages/frontend/src/ui/friendly/navbar-for-mobile.vue | 2 +-
 packages/frontend/src/ui/friendly/navbar.vue            | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 7696ea117a..7d71369baf 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -59,6 +59,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024110](CHANG
 - Fix: 아바타 장식에서 가이드라인이 표시되지 않음
 - Fix: 설정 페이지에서 글자수가 긴 일부 항목의 디자인이 잘못 표시될 수 있음
 - Fix: 서브 노트의 동작 버튼이 정상적으로 작동하지 않을 수 있음 (kokonect-link/cherrypick#536)
+- Fix: 네비게이션 바에 배너 이미지가 표시되지 않을 수 있음 (kokonect-link/cherrypick#545)
 
 ### Server
 - Fix: 그룹 초대 알림을 수락하거나 거절하면 알림 목록을 볼 수 없음
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index d69e80cbfc..ccbf5a1cfc 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -75,7 +75,7 @@ const otherMenuItemIndicated = computed(() => {
 });
 const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
-const bannerDisplay = ref('');
+const bannerDisplay = ref(defaultStore.state.bannerDisplay);
 
 if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index 2c8098c092..ccc65a8873 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -106,7 +106,7 @@ const otherMenuItemIndicated = computed(() => {
 });
 const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
-const bannerDisplay = ref('');
+const bannerDisplay = ref(defaultStore.state.bannerDisplay);
 
 if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
diff --git a/packages/frontend/src/ui/friendly/navbar-for-mobile.vue b/packages/frontend/src/ui/friendly/navbar-for-mobile.vue
index d86aa153bb..94301c6c84 100644
--- a/packages/frontend/src/ui/friendly/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/friendly/navbar-for-mobile.vue
@@ -77,7 +77,7 @@ const otherMenuItemIndicated = computed(() => {
 });
 const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
-const bannerDisplay = ref('');
+const bannerDisplay = ref(defaultStore.state.bannerDisplay);
 
 if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {
diff --git a/packages/frontend/src/ui/friendly/navbar.vue b/packages/frontend/src/ui/friendly/navbar.vue
index 7c7914da53..580173ed38 100644
--- a/packages/frontend/src/ui/friendly/navbar.vue
+++ b/packages/frontend/src/ui/friendly/navbar.vue
@@ -113,7 +113,7 @@ const otherMenuItemIndicated = computed(() => {
 });
 const controlPanelIndicated = ref(false);
 const releasesCherryPick = ref(null);
-const bannerDisplay = ref('');
+const bannerDisplay = ref(defaultStore.state.bannerDisplay);
 
 if ($i && ($i.isAdmin ?? $i.isModerator)) {
 	misskeyApi('admin/abuse-user-reports', {

From 7710cb3023cf050beba17af056749c0e98cc13c9 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 09:49:43 +0900
Subject: [PATCH 24/48] chore

---
 packages/frontend/src/pages/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index cd1b38839d..233654a6cb 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -188,7 +188,7 @@ const alwaysShowCw = ref(defaultStore.state.alwaysShowCw);
 
 watch(src, () => {
 	queue.value = 0;
-	queueUpdated(queue);
+	queueUpdated(queue.value);
 });
 
 watch(enableWidgetsArea, (x) => {

From afbce36da9d4302f853df60c2cef6c67abd87dea Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 09:59:38 +0900
Subject: [PATCH 25/48] =?UTF-8?q?fix(frontend):=20=EA=B3=A0=EC=A0=95?=
 =?UTF-8?q?=EB=90=9C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=83=80=EC=9E=84?=
 =?UTF-8?q?=EB=9D=BC=EC=9D=B8=EC=9D=84=20=EC=82=AC=EC=9A=A9=ED=95=A0=20?=
 =?UTF-8?q?=EC=88=98=20=EC=97=86=EC=9D=8C=20(kokonect-link/cherrypick#546)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                  | 1 +
 packages/frontend/src/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 7d71369baf..9f844dde20 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -60,6 +60,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024110](CHANG
 - Fix: 설정 페이지에서 글자수가 긴 일부 항목의 디자인이 잘못 표시될 수 있음
 - Fix: 서브 노트의 동작 버튼이 정상적으로 작동하지 않을 수 있음 (kokonect-link/cherrypick#536)
 - Fix: 네비게이션 바에 배너 이미지가 표시되지 않을 수 있음 (kokonect-link/cherrypick#545)
+- Fix: 고정된 리스트 타임라인을 사용할 수 없음 (kokonect-link/cherrypick#546)
 
 ### Server
 - Fix: 그룹 초대 알림을 수락하거나 거절하면 알림 목록을 볼 수 없음
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 233654a6cb..b4d264d832 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</transition>
 
 				<div :class="$style.tl">
-					<div v-if="!isAvailableBasicTimeline(src)" :class="$style.disabled">
+					<div v-if="!isAvailableBasicTimeline(src) && !src.startsWith('list:')" :class="$style.disabled">
 						<p :class="$style.disabledTitle">
 							<i class="ti ti-circle-minus"></i>
 							{{ i18n.ts._disabledTimeline.title }}

From de7388c5f88ee5c40f6e3eaccc2c57307989014b Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 10:01:11 +0900
Subject: [PATCH 26/48] 4.14.1-alpha.1

---
 package.json                        | 2 +-
 packages/cherrypick-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ef6fe37dda..5bbbe5abb1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.14.1-alpha.0",
+	"version": "4.14.1-alpha.1",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
index 43f985cdf7..aed78ad169 100644
--- a/packages/cherrypick-js/package.json
+++ b/packages/cherrypick-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.14.1-alpha.0",
+	"version": "4.14.1-alpha.1",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",

From d4ab6800783999292c6a12a63c72791a2f7f9bcb Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 10:08:01 +0900
Subject: [PATCH 27/48] =?UTF-8?q?fix(frontend):=20=EB=B2=84=EB=B8=94=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=84=EB=9D=BC=EC=9D=B8=EC=9D=B4=20=EB=B9=84?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=20=EC=83=81=ED=83=9C=EB=A9=B4=20?=
 =?UTF-8?q?=EB=B2=84=EB=B8=94=20=ED=83=80=EC=9E=84=EB=9D=BC=EC=9D=B8?=
 =?UTF-8?q?=EC=9D=98=20=ED=98=B8=EC=8A=A4=ED=8A=B8=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=A0=20=EC=88=98=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/admin/moderation.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 52bca3e346..71e2cba410 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -151,7 +151,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #label>{{ i18n.ts.bubbleTimeline }}</template>
 
 						<div class="_gaps">
-							<MkTextarea v-if="bubbleTimelineEnabled" v-model="bubbleTimeline">
+							<MkTextarea v-model="bubbleTimeline">
 								<template #caption>{{ i18n.ts.bubbleInstancesDescription }}</template>
 							</MkTextarea>
 							<MkButton primary @click="save_bubbleTimeline">{{ i18n.ts.save }}</MkButton>
@@ -196,7 +196,6 @@ const blockedHosts = ref<string>('');
 const silencedHosts = ref<string>('');
 const mediaSilencedHosts = ref<string>('');
 const trustedLinkUrlPatterns = ref<string>('');
-const bubbleTimelineEnabled = ref<boolean>(false);
 const bubbleTimeline = ref<string>('');
 
 async function init() {
@@ -214,7 +213,6 @@ async function init() {
 	silencedHosts.value = meta.silencedHosts?.join('\n') ?? '';
 	mediaSilencedHosts.value = meta.mediaSilencedHosts.join('\n');
 	trustedLinkUrlPatterns.value = meta.trustedLinkUrlPatterns.join('\n');
-	bubbleTimelineEnabled.value = meta.policies.btlAvailable;
 	bubbleTimeline.value = meta.bubbleInstances.join('\n');
 }
 

From d415d091f1a02c434b6b577b084d72bf9b7f0bc8 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 10:37:05 +0900
Subject: [PATCH 28/48] =?UTF-8?q?enhance(frontend/backend):=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=EB=90=9C=20=EB=85=B8=ED=8A=B8=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=EC=97=90=20=EC=8B=A4=ED=8C=A8=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EC=97=90=EA=B2=8C=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20([penginn-net/kokonect@a0e47980](https://github.com?=
 =?UTF-8?q?/penginn-net/kokonect/commit/a0e47980470b49e79e84ff3b7ccaf2b450?=
 =?UTF-8?q?2928c8))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                       |  1 +
 locales/en-US.yml                             |  7 +++++
 locales/index.d.ts                            | 26 +++++++++++++++++++
 locales/ja-JP.yml                             |  8 ++++++
 locales/ko-KR.yml                             |  7 +++++
 .../entities/NotificationEntityService.ts     |  3 +++
 packages/backend/src/models/Notification.ts   |  5 ++++
 .../src/models/json-schema/notification.ts    | 14 ++++++++++
 .../ScheduleNotePostProcessorService.ts       | 21 +++++++++++++++
 packages/backend/src/types.ts                 |  1 +
 .../cherrypick-js/etc/cherrypick-js.api.md    |  2 +-
 packages/cherrypick-js/src/autogen/types.ts   | 16 +++++++++---
 packages/cherrypick-js/src/consts.ts          |  2 +-
 packages/frontend-shared/js/const.ts          |  1 +
 .../src/components/MkNotification.vue         | 13 +++++++++-
 .../sw/src/scripts/create-notification.ts     |  6 +++++
 16 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 9f844dde20..0f3bc4889e 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -47,6 +47,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024110](CHANG
   - 기간은 최소 `1`일부터 최대 `30`일까지 설정할 수 있습니다.
     - `0`일로 설정하면 최소 기간인 `1`일로 설정되며, `30`일을 초과하는 값을 입력하면 최대 기간인 `30`일로 설정됩니다.
   - 여기서 설정된 기간은 `초대제로 전환` 옵션과 `공개 노트 허용` 옵션 모두에 적용됩니다.
+- Enhance: 예약된 노트 게시에 실패할 경우 사용자에게 알림 ([penginn-net/kokonect@a0e47980](https://github.com/penginn-net/kokonect/commit/a0e47980470b49e79e84ff3b7ccaf2b4502928c8))
 
 ### Client
 - Enhance: 미디어 그리드 레이아옷 조정
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 62cd96f7d3..ba3e03c9f1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -2820,12 +2820,19 @@ _notification:
     achievementEarned: "Achievement unlocked"
     exportCompleted: "The export has been completed"
     login: "Sign In"
+    scheduleNote: "Scheduled note posting failed"
     test: "Notification test"
     app: "Notifications from linked apps"
   _actions:
     followBack: "followed you back"
     reply: "Reply"
     renote: "Renote"
+  _scheduleNote:
+    unknown: "The cause is unknown"
+    renoteTargetNotFound: "Renote target note not found"
+    channelTargetNotFound: "Channel not found"
+    replyTargetNotFound: "Reply target note not found"
+    invalidFilesCount: "No attachments"
 _deck:
   alwaysShowMainColumn: "Always show main column"
   columnAlign: "Align columns"
diff --git a/locales/index.d.ts b/locales/index.d.ts
index d40d9ce00a..f51e33c99e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10989,6 +10989,10 @@ export interface Locale extends ILocale {
              * ログイン
              */
             "login": string;
+            /**
+             * 予約投稿に失敗
+             */
+            "scheduleNote": string;
             /**
              * 通知のテスト
              */
@@ -11012,6 +11016,28 @@ export interface Locale extends ILocale {
              */
             "renote": string;
         };
+        "_scheduleNote": {
+            /**
+             * 原因は不明です
+             */
+            "unknown": string;
+            /**
+             * 引用元がありません
+             */
+            "renoteTargetNotFound": string;
+            /**
+             * 対象のチャンネルがありません
+             */
+            "channelTargetNotFound": string;
+            /**
+             * 返信先がありません
+             */
+            "replyTargetNotFound": string;
+            /**
+             * 添付ファイルがありません
+             */
+            "invalidFilesCount": string;
+        };
     };
     "_deck": {
         /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 65f25c70c5..de88b1326f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2895,6 +2895,7 @@ _notification:
     achievementEarned: "実績の獲得"
     exportCompleted: "エクスポートが完了した"
     login: "ログイン"
+    scheduleNote: "予約投稿に失敗"
     test: "通知のテスト"
     app: "連携アプリからの通知"
 
@@ -2903,6 +2904,13 @@ _notification:
     reply: "返信"
     renote: "リノート"
 
+  _scheduleNote:
+    unknown: "原因は不明です"
+    renoteTargetNotFound: "引用元がありません"
+    channelTargetNotFound: "対象のチャンネルがありません"
+    replyTargetNotFound: "返信先がありません"
+    invalidFilesCount: "添付ファイルがありません"
+
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
   columnAlign: "カラムの寄せ"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 2b879ff1cd..f850aabf4e 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -2823,12 +2823,19 @@ _notification:
     achievementEarned: "도전 과제 획득"
     exportCompleted: "내보내기를 완료함"
     login: "로그인"
+    scheduleNote: "게시가 예약된 노트의 게시가 실패함"
     test: "알림 테스트"
     app: "연동된 앱을 통한 알림"
   _actions:
     followBack: "팔로우"
     reply: "답글"
     renote: "리노트"
+  _scheduleNote:
+    unknown: "알 수 없는 오류가 발생했어요"
+    renoteTargetNotFound: "인용할 대상이 없어요"
+    channelTargetNotFound: "해당 채널이 존재하지 않아요"
+    replyTargetNotFound: "답장할 대상이 없어요"
+    invalidFilesCount: "첨부 파일이 없어요"
 _deck:
   alwaysShowMainColumn: "메인 칼럼 항상 표시"
   columnAlign: "칼럼 정렬"
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index 93c3ccee25..3c41db0cdb 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -202,6 +202,9 @@ export class NotificationEntityService implements OnModuleInit {
 			...(notification.type === 'login' ? {
 				ip: notification.userIp,
 			} : {}),
+			...(notification.type === 'scheduleNote' ? {
+				errorType: notification.errorType,
+			} : {}),
 			...(notification.type === 'app' ? {
 				body: notification.customBody,
 				header: notification.customHeader,
diff --git a/packages/backend/src/models/Notification.ts b/packages/backend/src/models/Notification.ts
index 3bca987892..4df6c19908 100644
--- a/packages/backend/src/models/Notification.ts
+++ b/packages/backend/src/models/Notification.ts
@@ -98,6 +98,11 @@ export type MiNotification = {
 	id: string;
 	createdAt: string;
 	userIp: string;
+} | {
+	type: 'scheduleNote';
+	id: string;
+	createdAt: string;
+	errorType: string;
 } | {
 	type: 'app';
 	id: string;
diff --git a/packages/backend/src/models/json-schema/notification.ts b/packages/backend/src/models/json-schema/notification.ts
index c7ea635589..53e9d179ad 100644
--- a/packages/backend/src/models/json-schema/notification.ts
+++ b/packages/backend/src/models/json-schema/notification.ts
@@ -336,6 +336,20 @@ export const packedNotificationSchema = {
 				optional: false, nullable: false,
 			},
 		},
+	}, {
+		type: 'object',
+		properties: {
+			...baseSchema.properties,
+			type: {
+				type: 'string',
+				optional: false, nullable: false,
+				enum: ['scheduleNote'],
+			},
+			errorType: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+		},
 	}, {
 		type: 'object',
 		properties: {
diff --git a/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts b/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
index 6b5b9db71b..055ca409c7 100644
--- a/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
+++ b/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
@@ -9,6 +9,7 @@ import { bindThis } from '@/decorators.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
 import type { ChannelsRepository, DriveFilesRepository, MiDriveFile, NoteScheduleRepository, NotesRepository, UsersRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
+import { NotificationService } from '@/core/NotificationService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';
 import type { ScheduleNotePostJobData } from '../types.js';
@@ -32,6 +33,7 @@ export class ScheduleNotePostProcessorService {
 
 			private noteCreateService: NoteCreateService,
 			private queueLoggerService: QueueLoggerService,
+			private notificationService: NotificationService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('schedule-note-post');
 	}
@@ -72,6 +74,25 @@ export class ScheduleNotePostProcessorService {
 					//キューに積んだときは有った物が消滅してたら予約投稿をキャンセルする
 					this.logger.warn('cancel schedule note');
 					await this.noteScheduleRepository.remove(data);
+
+					if (data.userId && me) {	//ユーザーが特定できる場合に失敗を通知
+						let errorType = 'unknown';
+						if (note.renote && !renote) {
+							errorType = 'renoteTargetNotFound';
+						}
+						if (note.reply && !reply) {
+							errorType = 'replyTargetNotFound';
+						}
+						if (note.channel && !channel) {
+							errorType = 'channelTargetNotFound';
+						}
+						if (note.files.length !== files.length) {
+							errorType = 'invalidFilesCount';
+						}
+						this.notificationService.createNotification(data.userId, 'scheduleNote', {
+							errorType,
+						});
+					}
 					return;
 				}
 				await this.noteCreateService.create(me, {
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 65d50bcf6d..70ac83ffe8 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -38,6 +38,7 @@ export const notificationTypes = [
 	'achievementEarned',
 	'exportCompleted',
 	'login',
+	'scheduleNote',
 	'app',
 	'test',
 ] as const;
diff --git a/packages/cherrypick-js/etc/cherrypick-js.api.md b/packages/cherrypick-js/etc/cherrypick-js.api.md
index cca82bfd38..7605d0956f 100644
--- a/packages/cherrypick-js/etc/cherrypick-js.api.md
+++ b/packages/cherrypick-js/etc/cherrypick-js.api.md
@@ -3004,7 +3004,7 @@ type Notification_2 = components['schemas']['Notification'];
 type NotificationsCreateRequest = operations['notifications___create']['requestBody']['content']['application/json'];
 
 // @public (undocumented)
-export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "achievementEarned"];
+export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "achievementEarned", "scheduleNote"];
 
 // @public (undocumented)
 export function nyaize(text: string): string;
diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
index 67211794a6..a573b6afa8 100644
--- a/packages/cherrypick-js/src/autogen/types.ts
+++ b/packages/cherrypick-js/src/autogen/types.ts
@@ -4715,6 +4715,14 @@ export type components = {
       /** @enum {string} */
       type: 'login';
       ip: string;
+    } | {
+      /** Format: id */
+      id: string;
+      /** Format: date-time */
+      createdAt: string;
+      /** @enum {string} */
+      type: 'scheduleNote';
+      errorType: string;
     } | ({
       /** Format: id */
       id: string;
@@ -19667,8 +19675,8 @@ export type operations = {
           untilId?: string;
           /** @default true */
           markAsRead?: boolean;
-          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'pollVote')[];
-          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'pollVote')[];
+          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'scheduleNote' | 'app' | 'test' | 'pollVote')[];
+          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'scheduleNote' | 'app' | 'test' | 'pollVote')[];
         };
       };
     };
@@ -19735,8 +19743,8 @@ export type operations = {
           untilId?: string;
           /** @default true */
           markAsRead?: boolean;
-          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'note:grouped' | 'pollVote')[];
-          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'note:grouped' | 'pollVote')[];
+          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'scheduleNote' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'note:grouped' | 'pollVote')[];
+          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'scheduleNote' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'note:grouped' | 'pollVote')[];
         };
       };
     };
diff --git a/packages/cherrypick-js/src/consts.ts b/packages/cherrypick-js/src/consts.ts
index 90847da702..04daacd1d6 100644
--- a/packages/cherrypick-js/src/consts.ts
+++ b/packages/cherrypick-js/src/consts.ts
@@ -16,7 +16,7 @@ import type {
 	UserLite,
 } from './autogen/models.js';
 
-export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned'] as const;
+export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned', 'scheduleNote'] as const;
 
 export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
 
diff --git a/packages/frontend-shared/js/const.ts b/packages/frontend-shared/js/const.ts
index af3d886727..6ae8cd7a79 100644
--- a/packages/frontend-shared/js/const.ts
+++ b/packages/frontend-shared/js/const.ts
@@ -70,6 +70,7 @@ export const notificationTypes = [
 	'achievementEarned',
 	'exportCompleted',
 	'login',
+	'scheduleNote',
 	'test',
 	'app',
 ] as const;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 0787d2085e..61ca9aa67a 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -12,6 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'note:grouped'" :class="[$style.icon, $style.icon_noteGroup]"><i class="ti ti-pencil" style="line-height: 1;"></i></div>
+		<div v-else-if="notification.type === 'scheduleNote'" :class="[$style.icon, $style.icon_scheduleNote]"><i class="ti ti-alert-triangle" style="line-height: 1;"></i></div>
 		<img v-else-if="notification.type === 'test'" :class="$style.icon" :src="infoImageUrl"/>
 		<MkAvatar v-else-if="'user' in notification" :class="$style.icon" :user="notification.user" link preview/>
 		<img v-else-if="'icon' in notification && notification.icon != null" :class="[$style.icon, $style.icon_app]" :src="notification.icon" alt=""/>
@@ -64,6 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
 			<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
 			<span v-else-if="notification.type === 'login'">{{ i18n.ts._notification.login }}</span>
+			<span v-else-if="notification.type === 'scheduleNote'">{{ i18n.ts._notification._types.scheduleNote }}</span>
 			<span v-else-if="notification.type === 'test'">{{ i18n.ts._notification.testNotification }}</span>
 			<span v-else-if="notification.type === 'exportCompleted'">{{ i18n.tsx._notification.exportOfXCompleted({ x: exportEntityName[notification.exportedEntity] }) }}</span>
 			<MkA v-else-if="notification.type === 'follow' || notification.type === 'mention' || notification.type === 'reply' || notification.type === 'renote' || notification.type === 'quote' || notification.type === 'reaction' || notification.type === 'receiveFollowRequest' || notification.type === 'followRequestAccepted'" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
@@ -141,6 +143,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkButton :class="$style.followRequestCommandButton" rounded danger @click="rejectGroupInvitation()"><i class="ti ti-x"/> {{ i18n.ts.reject }}</MkButton>
 				</div>
 			</template>
+			<span v-else-if="notification.type === 'scheduleNote'" :class="$style.text">{{ i18n.ts._notification._scheduleNote[notification.errorType] }}</span>
 			<span v-else-if="notification.type === 'test'" :class="$style.text">{{ i18n.ts._notification.notificationWillBeDisplayedLikeThis }}</span>
 			<span v-else-if="notification.type === 'app'" :class="$style.text">
 				<Mfm :text="notification.body" :nowrap="false"/>
@@ -285,7 +288,8 @@ const rejectGroupInvitation = () => {
 .icon_reactionGroup,
 .icon_reactionGroupHeart,
 .icon_renoteGroup,
-.icon_noteGroup {
+.icon_noteGroup,
+.icon_scheduleNote {
 	display: grid;
 	align-items: center;
 	justify-items: center;
@@ -312,6 +316,13 @@ const rejectGroupInvitation = () => {
 	background: var(--eventRenote);
 }
 
+.icon_scheduleNote {
+	width: 100%;
+	height: 100%;
+	color: var(--warn);
+	background: var(--eventOther);
+}
+
 .icon_app {
 	border-radius: 6px;
 }
diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts
index 61ad2878c4..b77856b8f1 100644
--- a/packages/sw/src/scripts/create-notification.ts
+++ b/packages/sw/src/scripts/create-notification.ts
@@ -262,6 +262,12 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
 						data,
 					}];
 
+				case 'scheduleNote':
+					return [i18n.ts._notification._types.scheduleNote, {
+						body: data.body.errorType,
+						data,
+					}];
+
 				case 'app':
 					return [data.body.header ?? data.body.body, {
 						body: data.body.header ? data.body.body : '',

From 398dfb4efd4bad84fe025d5380f461f2cbc95ebd Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 3 Dec 2024 10:45:06 +0900
Subject: [PATCH 29/48] Update CHANGELOG_CHERRYPICK.md

---
 CHANGELOG_CHERRYPICK.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 0f3bc4889e..3f7be78b6d 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -28,10 +28,16 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 기반 Misskey 버전: 2024.x.x<br>
 Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.
 
+### General
+- Enhance: 예약된 노트 게시에 실패할 경우 사용자에게 알림 ([penginn-net/kokonect@a0e47980](https://github.com/penginn-net/kokonect/commit/a0e47980470b49e79e84ff3b7ccaf2b4502928c8))
+
 ### Client
 - Fix: 노트 상세 페이지에서 사용자 이름이 중복으로 표시될 수 있음
 - Fix: 커스텀 이모지 관리 역할이 있는 사용자가 원격 서버의 이모지를 가져올 수 없음
 - Fix: 신고 알림을 받을 이메일 주소 설정을 저장할 수 없음 (kokonect-link/cherrypick#540)
+- Fix: 네비게이션 바에 배너 이미지가 표시되지 않을 수 있음 (kokonect-link/cherrypick#545)
+- Fix: 고정된 리스트 타임라인을 사용할 수 없음 (kokonect-link/cherrypick#546)
+- Fix: 버블 타임라인이 비활성화 상태면 버블 타임라인의 호스트 목록을 수정할 수 없음 (kokonect-link/cherrypick#544)
 
 ---
 
@@ -47,7 +53,6 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024110](CHANG
   - 기간은 최소 `1`일부터 최대 `30`일까지 설정할 수 있습니다.
     - `0`일로 설정하면 최소 기간인 `1`일로 설정되며, `30`일을 초과하는 값을 입력하면 최대 기간인 `30`일로 설정됩니다.
   - 여기서 설정된 기간은 `초대제로 전환` 옵션과 `공개 노트 허용` 옵션 모두에 적용됩니다.
-- Enhance: 예약된 노트 게시에 실패할 경우 사용자에게 알림 ([penginn-net/kokonect@a0e47980](https://github.com/penginn-net/kokonect/commit/a0e47980470b49e79e84ff3b7ccaf2b4502928c8))
 
 ### Client
 - Enhance: 미디어 그리드 레이아옷 조정
@@ -60,8 +65,6 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024110](CHANG
 - Fix: 아바타 장식에서 가이드라인이 표시되지 않음
 - Fix: 설정 페이지에서 글자수가 긴 일부 항목의 디자인이 잘못 표시될 수 있음
 - Fix: 서브 노트의 동작 버튼이 정상적으로 작동하지 않을 수 있음 (kokonect-link/cherrypick#536)
-- Fix: 네비게이션 바에 배너 이미지가 표시되지 않을 수 있음 (kokonect-link/cherrypick#545)
-- Fix: 고정된 리스트 타임라인을 사용할 수 없음 (kokonect-link/cherrypick#546)
 
 ### Server
 - Fix: 그룹 초대 알림을 수락하거나 거절하면 알림 목록을 볼 수 없음

From 020c191e2c7457c8eaa6b7bbbd7892de32b9de24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:29:40 +0900
Subject: [PATCH 30/48] =?UTF-8?q?fix(frontend):=20MiAuth=E8=AA=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#15106)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/miauth.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/miauth.vue b/packages/frontend/src/pages/miauth.vue
index e85d2c29c1..7fb6653c13 100644
--- a/packages/frontend/src/pages/miauth.vue
+++ b/packages/frontend/src/pages/miauth.vue
@@ -117,5 +117,6 @@ definePageMetadata(() => ({
 	border-radius: var(--MI-radius);
 	background-color: var(--MI_THEME-panel);
 	overflow-x: scroll;
+	white-space: nowrap;
 }
 </style>

From 074b7b0bee82ea692ba675bf4b35734b540b7752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:36:03 +0900
Subject: [PATCH 31/48] =?UTF-8?q?fix(frontend):=20=E5=85=AC=E9=96=8B?=
 =?UTF-8?q?=E7=AF=84=E5=9B=B2=E3=81=8C=E3=83=9B=E3=83=BC=E3=83=A0=E3=81=AE?=
 =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE=E5=9F=8B=E3=82=81=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=81=8C=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BE=E3=82=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1510?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Resolve frontend/backend contradiction for home visibility embeds

This now uses the same check from `packages/frontend/src/scripts/get-note-menu.ts`

* Update Changelog

---------

Co-authored-by: CenTdemeern1 <timo.herngreen@gmail.com>
---
 CHANGELOG.md                                           | 2 ++
 packages/backend/src/server/web/ClientServerService.ts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f2c36ffc3..595252d3e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 ### Client
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 - Fix: サーバー情報メニューに区切り線が不足していたのを修正
+- Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
 
 ### Server
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index e356e0d76c..1a75096c4e 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -871,7 +871,7 @@ export class ClientServerService {
 			});
 
 			if (note == null) return;
-			if (note.visibility !== 'public') return;
+			if (['specified', 'followers'].includes(note.visibility)) return;
 			if (note.userHost != null) return;
 
 			const _note = await this.noteEntityService.pack(note, null, { detail: true });

From e8bf6285cb023bd2031e85de3a3eb495bf4afb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:42:12 +0900
Subject: [PATCH 32/48] =?UTF-8?q?fix(frontend):=20=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=8C=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=81=97=E3=81=8B=E8=A6=8B=E3=82=8C=E3=81=AA=E3=81=84=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=81=AB=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=B3=E3=82=BB=E3=83=AB=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=9D=E3=81=AE=E5=BE=8C=E3=81=AE=E5=8B=95?=
 =?UTF-8?q?=E7=B7=9A=E3=81=8C=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#15101)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): ノートがログインしているユーザーしか見れない場合にログインをキャンセルすると一切の処理が停止する問題を修正

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                         | 1 +
 packages/frontend/src/pages/note.vue | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 595252d3e4..6b9ae480af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 ### Client
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 - Fix: サーバー情報メニューに区切り線が不足していたのを修正
+- Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
 - Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
 
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 3e1d04bd6d..5cf8f56776 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -50,6 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import { host } from '@@/js/config.js';
 import type { Paging } from '@/components/MkPagination.vue';
 import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 import MkNotes from '@/components/MkNotes.vue';
@@ -140,7 +141,12 @@ function fetchNote() {
 	}).catch(err => {
 		if (err.id === '8e75455b-738c-471d-9f80-62693f33372e') {
 			pleaseLogin({
+				path: '/',
 				message: i18n.ts.thisContentsAreMarkedAsSigninRequiredByAuthor,
+				openOnRemote: {
+					type: 'lookup',
+					url: `https://${host}/notes/${props.noteId}`,
+				},
 			});
 		}
 		error.value = err;

From 234d91a8846f3ad204bb019f8a7693992593690f Mon Sep 17 00:00:00 2001
From: FineArchs <133759614+FineArchs@users.noreply.github.com>
Date: Mon, 16 Dec 2024 08:55:34 +0900
Subject: [PATCH 33/48] =?UTF-8?q?misskey-js:=20APIClient=E3=81=ABURL?=
 =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=81=AE/=E3=82=92=E9=99=A4=E5=8E=BB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=20(#15132)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/misskey-js/src/api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/misskey-js/src/api.ts b/packages/misskey-js/src/api.ts
index ed1282957f..e663d712a7 100644
--- a/packages/misskey-js/src/api.ts
+++ b/packages/misskey-js/src/api.ts
@@ -44,7 +44,7 @@ export class APIClient {
 		credential?: APIClient['credential'];
 		fetch?: APIClient['fetch'] | null | undefined;
 	}) {
-		this.origin = opts.origin;
+		this.origin = opts.origin.replace(/\/$/, '');
 		this.credential = opts.credential;
 		// ネイティブ関数をそのまま変数に代入して使おうとするとChromiumではIllegal invocationエラーが発生するため、
 		// 環境で実装されているfetchを使う場合は無名関数でラップして使用する

From 5a2b29a3b4c8acda1851f09af771fbba97f380c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 16 Dec 2024 08:57:37 +0900
Subject: [PATCH 34/48] =?UTF-8?q?enhance(frontend):=20PC=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E3=81=A7=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E3=81=8C?=
 =?UTF-8?q?=E8=A4=87=E6=95=B0=E5=88=97=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#15129)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* チャンネル一覧の列を最大3列にした (Otaku-Social#13)

* fix

* fix

* fix

* :art:

* fix

* :art:

* Update Changelog

* Update Changelog

* 要らない_marginを消す

---------

Co-authored-by: tmorio <morikapusan@morikapu-denki.com>
---
 CHANGELOG.md                                  |  2 ++
 .../src/components/MkChannelPreview.vue       |  2 ++
 packages/frontend/src/pages/channels.vue      | 35 +++++++++++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b9ae480af..4293c94376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 -
 
 ### Client
+- Enhance: PC画面でチャンネルが複数列で表示されるように  
+  (Cherry-picked from https://github.com/Otaku-Social/maniakey/pull/13)
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 - Fix: サーバー情報メニューに区切り線が不足していたのを修正
 - Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
diff --git a/packages/frontend/src/components/MkChannelPreview.vue b/packages/frontend/src/components/MkChannelPreview.vue
index c470042b79..f79989d882 100644
--- a/packages/frontend/src/components/MkChannelPreview.vue
+++ b/packages/frontend/src/components/MkChannelPreview.vue
@@ -125,7 +125,9 @@ const bannerStyle = computed(() => {
 			position: absolute;
 			top: 16px;
 			left: 16px;
+			max-width: calc(100% - 32px);
 			padding: 12px 16px;
+			box-sizing: border-box;
 			background: rgba(0, 0, 0, 0.7);
 			color: #fff;
 			font-size: 1.2em;
diff --git a/packages/frontend/src/pages/channels.vue b/packages/frontend/src/pages/channels.vue
index bde1650754..6830c1ace4 100644
--- a/packages/frontend/src/pages/channels.vue
+++ b/packages/frontend/src/pages/channels.vue
@@ -6,9 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :contentMax="700">
+	<MkSpacer :contentMax="1200">
 		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
-			<div v-if="tab === 'search'" key="search">
+			<div v-if="tab === 'search'" key="search" :class="$style.searchRoot">
 				<div class="_gaps">
 					<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
 						<template #prefix><i class="ti ti-search"></i></template>
@@ -27,23 +27,31 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div v-if="tab === 'featured'" key="featured">
 				<MkPagination v-slot="{items}" :pagination="featuredPagination">
-					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+					<div :class="$style.root">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
+					</div>
 				</MkPagination>
 			</div>
 			<div v-else-if="tab === 'favorites'" key="favorites">
 				<MkPagination v-slot="{items}" :pagination="favoritesPagination">
-					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+					<div :class="$style.root">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
+					</div>
 				</MkPagination>
 			</div>
 			<div v-else-if="tab === 'following'" key="following">
 				<MkPagination v-slot="{items}" :pagination="followingPagination">
-					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+					<div :class="$style.root">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
+					</div>
 				</MkPagination>
 			</div>
 			<div v-else-if="tab === 'owned'" key="owned">
 				<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
 				<MkPagination v-slot="{items}" :pagination="ownedPagination">
-					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+					<div :class="$style.root">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
+					</div>
 				</MkPagination>
 			</div>
 		</MkHorizontalSwipe>
@@ -85,6 +93,7 @@ onMounted(() => {
 
 const featuredPagination = {
 	endpoint: 'channels/featured' as const,
+	limit: 10,
 	noPaging: true,
 };
 const favoritesPagination = {
@@ -157,3 +166,17 @@ definePageMetadata(() => ({
 	icon: 'ti ti-device-tv',
 }));
 </script>
+
+<style lang="scss" module>
+.searchRoot {
+	width: 100%;
+	max-width: 700px;
+	margin: 0 auto;
+}
+
+.root {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
+	gap: var(--MI-margin);
+}
+</style>

From 3e0fcaeca89b9adf42a89f82e30fb2ad3cc6d5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:02:38 +0900
Subject: [PATCH 35/48] =?UTF-8?q?fix(frontend):=20=E7=B5=B5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=A7=E7=B5=B5?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#15128)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 絵文字管理画面で絵文字が表示されないことがある問題を修正

* Update Changelog

* optimize
---
 CHANGELOG.md                                          | 1 +
 packages/frontend/src/pages/custom-emojis-manager.vue | 5 +++--
 packages/frontend/src/pages/emoji-edit-dialog.vue     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4293c94376..ee82834de7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
 - Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
+- Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正
 
 ### Server
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index cae3f3ede9..789a63eb90 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #default="{items}">
 							<div class="ldhfsamy">
 								<button v-for="emoji in items" :key="emoji.id" class="emoji _panel _button" :class="{ selected: selectedEmojis.includes(emoji.id) }" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
-									<img :src="`/emoji/${emoji.name}.webp`" class="img" :alt="emoji.name"/>
+									<img :src="emoji.url" class="img" :alt="emoji.name"/>
 									<div class="body">
 										<div class="name _monospace">{{ emoji.name }}</div>
 										<div class="info">{{ emoji.category }}</div>
@@ -57,7 +57,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #default="{items}">
 							<div class="ldhfsamy">
 								<div v-for="emoji in items" :key="emoji.id" class="emoji _panel _button" @click="remoteMenu(emoji, $event)">
-									<img :src="`/emoji/${emoji.name}@${emoji.host}.webp`" class="img" :alt="emoji.name"/>
+									<img :src="getProxiedImageUrl(emoji.url, 'emoji')" class="img" :alt="emoji.name"/>
 									<div class="body">
 										<div class="name _monospace">{{ emoji.name }}</div>
 										<div class="info">{{ emoji.host }}</div>
@@ -83,6 +83,7 @@ import FormSplit from '@/components/form/split.vue';
 import { selectFile } from '@/scripts/select-file.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
+import { getProxiedImageUrl } from '@/scripts/media-proxy.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index 3765319b25..da3315cff5 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -118,7 +118,7 @@ watch(roleIdsThatCanBeUsedThisEmojiAsReaction, async () => {
 	rolesThatCanBeUsedThisEmojiAsReaction.value = (await Promise.all(roleIdsThatCanBeUsedThisEmojiAsReaction.value.map((id) => misskeyApi('admin/roles/show', { roleId: id }).catch(() => null)))).filter(x => x != null);
 }, { immediate: true });
 
-const imgUrl = computed(() => file.value ? file.value.url : props.emoji ? `/emoji/${props.emoji.name}.webp` : null);
+const imgUrl = computed(() => file.value ? file.value.url : props.emoji ? props.emoji.url : null);
 
 async function changeImage(ev: Event) {
 	file.value = await selectFile(ev.currentTarget ?? ev.target, null);

From 08040924265cb9f8f4016ecc258c656449813c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:03:46 +0900
Subject: [PATCH 36/48] =?UTF-8?q?fix(frontend):=20serverContext=E3=81=AE?=
 =?UTF-8?q?=E5=9E=8B=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#15131)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): serverContextの型エラーを修正

* add comment
---
 packages/frontend/src/pages/clip.vue       |  5 +++--
 packages/frontend/src/pages/note.vue       |  6 ++++--
 packages/frontend/src/pages/user/index.vue |  5 +++--
 packages/frontend/src/server-context.ts    | 12 +++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index 891d59d605..c925bac4d9 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -46,9 +46,10 @@ import { clipsCache } from '@/cache.js';
 import { isSupportShare } from '@/scripts/navigator.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { genEmbedCode } from '@/scripts/get-embed-code.js';
-import { getServerContext } from '@/server-context.js';
+import { assertServerContext, serverContext } from '@/server-context.js';
 
-const CTX_CLIP = getServerContext('clip');
+// contextは非ログイン状態の情報しかないためログイン時は利用できない
+const CTX_CLIP = $i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
 
 const props = defineProps<{
 	clipId: string,
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 5cf8f56776..6eca04db8d 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -63,9 +63,11 @@ import { dateString } from '@/filters/date.js';
 import MkClipPreview from '@/components/MkClipPreview.vue';
 import { defaultStore } from '@/store.js';
 import { pleaseLogin } from '@/scripts/please-login.js';
-import { getServerContext } from '@/server-context.js';
+import { serverContext, assertServerContext } from '@/server-context.js';
+import { $i } from '@/account.js';
 
-const CTX_NOTE = getServerContext('note');
+// contextは非ログイン状態の情報しかないためログイン時は利用できない
+const CTX_NOTE = $i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
 
 const props = defineProps<{
 	noteId: string;
diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index d862387401..c5cda79935 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -39,7 +39,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/account.js';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
-import { getServerContext } from '@/server-context.js';
+import { serverContext, assertServerContext } from '@/server-context.js';
 
 const XHome = defineAsyncComponent(() => import('./home.vue'));
 const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue'));
@@ -53,7 +53,8 @@ const XFlashs = defineAsyncComponent(() => import('./flashs.vue'));
 const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
 const XRaw = defineAsyncComponent(() => import('./raw.vue'));
 
-const CTX_USER = getServerContext('user');
+// contextは非ログイン状態の情報しかないためログイン時は利用できない
+const CTX_USER = $i && assertServerContext(serverContext, 'user') ? serverContext.user : null;
 
 const props = withDefaults(defineProps<{
 	acct: string;
diff --git a/packages/frontend/src/server-context.ts b/packages/frontend/src/server-context.ts
index aa44a10290..e79d3fa314 100644
--- a/packages/frontend/src/server-context.ts
+++ b/packages/frontend/src/server-context.ts
@@ -2,22 +2,20 @@
  * SPDX-FileCopyrightText: syuilo and misskey-project
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 import * as Misskey from 'misskey-js';
-import { $i } from '@/account.js';
 
 const providedContextEl = document.getElementById('misskey_clientCtx');
 
 export type ServerContext = {
 	clip?: Misskey.entities.Clip;
 	note?: Misskey.entities.Note;
-	user?: Misskey.entities.UserLite;
+	user?: Misskey.entities.UserDetailed;
 } | null;
 
 export const serverContext: ServerContext = (providedContextEl && providedContextEl.textContent) ? JSON.parse(providedContextEl.textContent) : null;
 
-export function getServerContext<K extends keyof NonNullable<ServerContext>>(entity: K): Required<Pick<NonNullable<ServerContext>, K>> | null {
-	// contextは非ログイン状態の情報しかないためログイン時は利用できない
-	if ($i) return null;
-
-	return serverContext ? (serverContext[entity] ?? null) : null;
+export function assertServerContext<K extends keyof NonNullable<ServerContext>>(ctx: ServerContext, entity: K): ctx is Required<Pick<NonNullable<ServerContext>, K>> {
+	if (ctx == null) return false;
+	return entity in ctx && ctx[entity] != null;
 }

From f123be38b93339f405468c8ed1aaa39d340b7791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:05:33 +0900
Subject: [PATCH 37/48] =?UTF-8?q?enhance(frontend):=20=E7=85=A7=E4=BC=9A?=
 =?UTF-8?q?=E3=81=AE=E9=9A=9B=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=20(#15147)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance: 照会の失敗理由を表示するように

* Update Changelog

* fix

* fix test

* lookupErrors-> remoteLookupErrors
---
 CHANGELOG.md                                  |  1 +
 locales/index.d.ts                            | 59 +++++++++++++++++
 locales/ja-JP.yml                             | 19 ++++++
 .../src/core/activitypub/ApResolverService.ts | 25 +++----
 .../src/server/api/endpoints/ap/show.ts       | 65 ++++++++++++++++++-
 .../backend/test-federation/test/note.test.ts |  6 +-
 packages/frontend/src/scripts/lookup.ts       | 38 ++++++++++-
 7 files changed, 193 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee82834de7..fd56700e1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 ### Client
 - Enhance: PC画面でチャンネルが複数列で表示されるように  
   (Cherry-picked from https://github.com/Otaku-Social/maniakey/pull/13)
+- Enhance: 照会に失敗した場合、その理由を表示するように
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
 - Fix: サーバー情報メニューに区切り線が不足していたのを修正
 - Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 0ae188f1f7..63878d3d47 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10601,6 +10601,65 @@ export interface Locale extends ILocale {
          */
         "sent": string;
     };
+    "_remoteLookupErrors": {
+        "_federationNotAllowed": {
+            /**
+             * このサーバーとは通信できません
+             */
+            "title": string;
+            /**
+             * このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。
+             * サーバー管理者にお問い合わせください。
+             */
+            "description": string;
+        };
+        "_uriInvalid": {
+            /**
+             * URIが不正です
+             */
+            "title": string;
+            /**
+             * 入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。
+             */
+            "description": string;
+        };
+        "_requestFailed": {
+            /**
+             * リクエストに失敗しました
+             */
+            "title": string;
+            /**
+             * このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。
+             */
+            "description": string;
+        };
+        "_responseInvalid": {
+            /**
+             * レスポンスが不正です
+             */
+            "title": string;
+            /**
+             * このサーバーと通信することはできましたが、得られたデータが不正なものでした。
+             */
+            "description": string;
+        };
+        "_responseInvalidIdHostNotMatch": {
+            /**
+             * 入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。
+             */
+            "description": string;
+        };
+        "_noSuchObject": {
+            /**
+             * 見つかりません
+             */
+            "title": string;
+            /**
+             * 要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。
+             */
+            "description": string;
+        };
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 1b59708d85..d78bd4ee65 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2826,3 +2826,22 @@ _selfXssPrevention:
 _followRequest:
   recieved: "受け取った申請"
   sent: "送った申請"
+
+_remoteLookupErrors:
+  _federationNotAllowed:
+    title: "このサーバーとは通信できません"
+    description: "このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。\nサーバー管理者にお問い合わせください。"
+  _uriInvalid:
+    title: "URIが不正です"
+    description: "入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。"
+  _requestFailed:
+    title: "リクエストに失敗しました"
+    description: "このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。"
+  _responseInvalid:
+    title: "レスポンスが不正です"
+    description: "このサーバーと通信することはできましたが、得られたデータが不正なものでした。"
+  _responseInvalidIdHostNotMatch:
+    description: "入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。"
+  _noSuchObject:
+    title: "見つかりません"
+    description: "要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。"
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index b0b35274ea..52cc569140 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -20,6 +20,7 @@ import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
 import { ApRequestService } from './ApRequestService.js';
 import type { IObject, ICollection, IOrderedCollection } from './type.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 export class Resolver {
 	private history: Set<string>;
@@ -66,7 +67,7 @@ export class Resolver {
 		if (isCollectionOrOrderedCollection(collection)) {
 			return collection;
 		} else {
-			throw new Error(`unrecognized collection type: ${collection.type}`);
+			throw new IdentifiableError('f100eccf-f347-43fb-9b45-96a0831fb635', `unrecognized collection type: ${collection.type}`);
 		}
 	}
 
@@ -80,15 +81,15 @@ export class Resolver {
 			// URLs with fragment parts cannot be resolved correctly because
 			// the fragment part does not get transmitted over HTTP(S).
 			// Avoid strange behaviour by not trying to resolve these at all.
-			throw new Error(`cannot resolve URL with fragment: ${value}`);
+			throw new IdentifiableError('b94fd5b1-0e3b-4678-9df2-dad4cd515ab2', `cannot resolve URL with fragment: ${value}`);
 		}
 
 		if (this.history.has(value)) {
-			throw new Error('cannot resolve already resolved one');
+			throw new IdentifiableError('0dc86cf6-7cd6-4e56-b1e6-5903d62d7ea5', 'cannot resolve already resolved one');
 		}
 
 		if (this.history.size > this.recursionLimit) {
-			throw new Error(`hit recursion limit: ${this.utilityService.extractDbHost(value)}`);
+			throw new IdentifiableError('d592da9f-822f-4d91-83d7-4ceefabcf3d2', `hit recursion limit: ${this.utilityService.extractDbHost(value)}`);
 		}
 
 		this.history.add(value);
@@ -99,7 +100,7 @@ export class Resolver {
 		}
 
 		if (!this.utilityService.isFederationAllowedHost(host)) {
-			throw new Error('Instance is blocked');
+			throw new IdentifiableError('09d79f9e-64f1-4316-9cfa-e75c4d091574', 'Instance is blocked');
 		}
 
 		if (this.config.signToActivityPubGet && !this.user) {
@@ -115,7 +116,7 @@ export class Resolver {
 				!(object['@context'] as unknown[]).includes('https://www.w3.org/ns/activitystreams') :
 				object['@context'] !== 'https://www.w3.org/ns/activitystreams'
 		) {
-			throw new Error('invalid response');
+			throw new IdentifiableError('72180409-793c-4973-868e-5a118eb5519b', 'invalid response');
 		}
 
 		// HttpRequestService / ApRequestService have already checked that
@@ -123,11 +124,11 @@ export class Resolver {
 		// object after redirects; here we double-check that no redirects
 		// bounced between hosts
 		if (object.id == null) {
-			throw new Error('invalid AP object: missing id');
+			throw new IdentifiableError('ad2dc287-75c1-44c4-839d-3d2e64576675', 'invalid AP object: missing id');
 		}
 
 		if (this.utilityService.punyHost(object.id) !== this.utilityService.punyHost(value)) {
-			throw new Error(`invalid AP object ${value}: id ${object.id} has different host`);
+			throw new IdentifiableError('fd93c2fa-69a8-440f-880b-bf178e0ec877', `invalid AP object ${value}: id ${object.id} has different host`);
 		}
 
 		return object;
@@ -136,7 +137,7 @@ export class Resolver {
 	@bindThis
 	private resolveLocal(url: string): Promise<IObject> {
 		const parsed = this.apDbResolverService.parseUri(url);
-		if (!parsed.local) throw new Error('resolveLocal: not local');
+		if (!parsed.local) throw new IdentifiableError('02b40cd0-fa92-4b0c-acc9-fb2ada952ab8', 'resolveLocal: not local');
 
 		switch (parsed.type) {
 			case 'notes':
@@ -165,7 +166,7 @@ export class Resolver {
 			case 'follows':
 				return this.followRequestsRepository.findOneBy({ id: parsed.id })
 					.then(async followRequest => {
-						if (followRequest == null) throw new Error('resolveLocal: invalid follow request ID');
+						if (followRequest == null) throw new IdentifiableError('a9d946e5-d276-47f8-95fb-f04230289bb0', 'resolveLocal: invalid follow request ID');
 						const [follower, followee] = await Promise.all([
 							this.usersRepository.findOneBy({
 								id: followRequest.followerId,
@@ -177,12 +178,12 @@ export class Resolver {
 							}),
 						]);
 						if (follower == null || followee == null) {
-							throw new Error('resolveLocal: follower or followee does not exist');
+							throw new IdentifiableError('06ae3170-1796-4d93-a697-2611ea6d83b6', 'resolveLocal: follower or followee does not exist');
 						}
 						return this.apRendererService.addContext(this.apRendererService.renderFollow(follower as MiLocalUser | MiRemoteUser, followee as MiLocalUser | MiRemoteUser, url));
 					});
 			default:
-				throw new Error(`resolveLocal: type ${parsed.type} unhandled`);
+				throw new IdentifiableError('7a5d2fc0-94bc-4db6-b8b8-1bf24a2e23d0', `resolveLocal: type ${parsed.type} unhandled`);
 		}
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 24d5a7b0f1..5c2e82da88 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -19,6 +19,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { ApiError } from '../../error.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 export const meta = {
 	tags: ['federation'],
@@ -32,6 +33,31 @@ export const meta = {
 	},
 
 	errors: {
+		federationNotAllowed: {
+			message: 'Federation for this host is not allowed.',
+			code: 'FEDERATION_NOT_ALLOWED',
+			id: '974b799e-1a29-4889-b706-18d4dd93e266',
+		},
+		uriInvalid: {
+			message: 'URI is invalid.',
+			code: 'URI_INVALID',
+			id: '1a5eab56-e47b-48c2-8d5e-217b897d70db',
+		},
+		requestFailed: {
+			message: 'Request failed.',
+			code: 'REQUEST_FAILED',
+			id: '81b539cf-4f57-4b29-bc98-032c33c0792e',
+		},
+		responseInvalid: {
+			message: 'Response from remote server is invalid.',
+			code: 'RESPONSE_INVALID',
+			id: '70193c39-54f3-4813-82f0-70a680f7495b',
+		},
+		responseInvalidIdHostNotMatch: {
+			message: 'Requested URI and response URI host does not match.',
+			code: 'RESPONSE_INVALID_ID_HOST_NOT_MATCH',
+			id: 'a2c9c61a-cb72-43ab-a964-3ca5fddb410a',
+		},
 		noSuchObject: {
 			message: 'No such object.',
 			code: 'NO_SUCH_OBJECT',
@@ -110,7 +136,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	 */
 	@bindThis
 	private async fetchAny(uri: string, me: MiLocalUser | null | undefined): Promise<SchemaType<typeof meta['res']> | null> {
-		if (!this.utilityService.isFederationAllowedUri(uri)) return null;
+		if (!this.utilityService.isFederationAllowedUri(uri)) {
+			throw new ApiError(meta.errors.federationNotAllowed);
+		}
 
 		let local = await this.mergePack(me, ...await Promise.all([
 			this.apDbResolverService.getUserFromApId(uri),
@@ -125,7 +153,40 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		// リモートから一旦オブジェクトフェッチ
 		const resolver = this.apResolverService.createResolver();
-		const object = await resolver.resolve(uri) as any;
+		const object = await resolver.resolve(uri).catch((err) => {
+			if (err instanceof IdentifiableError) {
+				switch (err.id) {
+					// resolve
+					case 'b94fd5b1-0e3b-4678-9df2-dad4cd515ab2':
+						throw new ApiError(meta.errors.uriInvalid);
+					case '0dc86cf6-7cd6-4e56-b1e6-5903d62d7ea5':
+					case 'd592da9f-822f-4d91-83d7-4ceefabcf3d2':
+						throw new ApiError(meta.errors.requestFailed);
+					case '09d79f9e-64f1-4316-9cfa-e75c4d091574':
+						throw new ApiError(meta.errors.federationNotAllowed);
+					case '72180409-793c-4973-868e-5a118eb5519b':
+					case 'ad2dc287-75c1-44c4-839d-3d2e64576675':
+						throw new ApiError(meta.errors.responseInvalid);
+					case 'fd93c2fa-69a8-440f-880b-bf178e0ec877':
+						throw new ApiError(meta.errors.responseInvalidIdHostNotMatch);
+
+					// resolveLocal
+					case '02b40cd0-fa92-4b0c-acc9-fb2ada952ab8':
+						throw new ApiError(meta.errors.uriInvalid);
+					case 'a9d946e5-d276-47f8-95fb-f04230289bb0':
+					case '06ae3170-1796-4d93-a697-2611ea6d83b6':
+						throw new ApiError(meta.errors.noSuchObject);
+					case '7a5d2fc0-94bc-4db6-b8b8-1bf24a2e23d0':
+						throw new ApiError(meta.errors.responseInvalid);
+				}
+			}
+
+			throw new ApiError(meta.errors.requestFailed);
+		});
+
+		if (object.id == null) {
+			throw new ApiError(meta.errors.responseInvalid);
+		}
 
 		// /@user のような正規id以外で取得できるURIが指定されていた場合、ここで初めて正規URIが確定する
 		// これはDBに存在する可能性があるため再度DB検索
diff --git a/packages/backend/test-federation/test/note.test.ts b/packages/backend/test-federation/test/note.test.ts
index bacc4cc54f..220c22e198 100644
--- a/packages/backend/test-federation/test/note.test.ts
+++ b/packages/backend/test-federation/test/note.test.ts
@@ -131,11 +131,7 @@ describe('Note', () => {
 			rejects(
 				async () => await bob.client.request('ap/show', { uri: `https://a.test/notes/${note.id}` }),
 				(err: any) => {
-					/**
-					 * FIXME: this error is not handled
-					 * @see https://github.com/misskey-dev/misskey/issues/12736
-					 */
-					strictEqual(err.code, 'INTERNAL_ERROR');
+					strictEqual(err.code, 'REQUEST_FAILED');
 					return true;
 				},
 			);
diff --git a/packages/frontend/src/scripts/lookup.ts b/packages/frontend/src/scripts/lookup.ts
index a261ec0669..ddcbfe1a8d 100644
--- a/packages/frontend/src/scripts/lookup.ts
+++ b/packages/frontend/src/scripts/lookup.ts
@@ -33,7 +33,43 @@ export async function lookup(router?: Router) {
 			uri: query,
 		});
 
-		os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+		os.promiseDialog(promise, null, (err) => {
+			let title = i18n.ts.somethingHappened;
+			let text = err.message + '\n' + err.id;
+
+			switch (err.id) {
+				case '974b799e-1a29-4889-b706-18d4dd93e266':
+					title = i18n.ts._remoteLookupErrors._federationNotAllowed.title;
+					text = i18n.ts._remoteLookupErrors._federationNotAllowed.description;
+					break;
+				case '1a5eab56-e47b-48c2-8d5e-217b897d70db':
+					title = i18n.ts._remoteLookupErrors._uriInvalid.title;
+					text = i18n.ts._remoteLookupErrors._uriInvalid.description;
+					break;
+				case '81b539cf-4f57-4b29-bc98-032c33c0792e':
+					title = i18n.ts._remoteLookupErrors._requestFailed.title;
+					text = i18n.ts._remoteLookupErrors._requestFailed.description;
+					break;
+				case '70193c39-54f3-4813-82f0-70a680f7495b':
+					title = i18n.ts._remoteLookupErrors._responseInvalid.title;
+					text = i18n.ts._remoteLookupErrors._responseInvalid.description;
+					break;
+				case 'a2c9c61a-cb72-43ab-a964-3ca5fddb410a':
+					title = i18n.ts._remoteLookupErrors._responseInvalid.title;
+					text = i18n.ts._remoteLookupErrors._responseInvalidIdHostNotMatch.description;
+					break;
+				case 'dc94d745-1262-4e63-a17d-fecaa57efc82':
+					title = i18n.ts._remoteLookupErrors._noSuchObject.title;
+					text = i18n.ts._remoteLookupErrors._noSuchObject.description;
+					break;
+			}
+
+			os.alert({
+				type: 'error',
+				title,
+				text,
+			});
+		}, i18n.ts.fetchingAsApObject);
 
 		const res = await promise;
 

From 3c81926f71f04b43455dd6a5e6302eb2c35f58ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 22 Dec 2024 13:36:17 +0900
Subject: [PATCH 38/48] =?UTF-8?q?fix(frontend):=20serverContext=E3=81=AE?=
 =?UTF-8?q?=E5=80=A4=E3=82=92=E5=88=A9=E7=94=A8=E3=81=99=E3=82=8B=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E3=81=8C=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#15166)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/clip.vue       | 2 +-
 packages/frontend/src/pages/note.vue       | 2 +-
 packages/frontend/src/pages/user/index.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index c925bac4d9..224bc51599 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -49,7 +49,7 @@ import { genEmbedCode } from '@/scripts/get-embed-code.js';
 import { assertServerContext, serverContext } from '@/server-context.js';
 
 // contextは非ログイン状態の情報しかないためログイン時は利用できない
-const CTX_CLIP = $i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
+const CTX_CLIP = !$i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
 
 const props = defineProps<{
 	clipId: string,
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 6eca04db8d..e6b4a0b222 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -67,7 +67,7 @@ import { serverContext, assertServerContext } from '@/server-context.js';
 import { $i } from '@/account.js';
 
 // contextは非ログイン状態の情報しかないためログイン時は利用できない
-const CTX_NOTE = $i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
+const CTX_NOTE = !$i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
 
 const props = defineProps<{
 	noteId: string;
diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index c5cda79935..4787db5dbe 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -54,7 +54,7 @@ const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
 const XRaw = defineAsyncComponent(() => import('./raw.vue'));
 
 // contextは非ログイン状態の情報しかないためログイン時は利用できない
-const CTX_USER = $i && assertServerContext(serverContext, 'user') ? serverContext.user : null;
+const CTX_USER = !$i && assertServerContext(serverContext, 'user') ? serverContext.user : null;
 
 const props = withDefaults(defineProps<{
 	acct: string;

From 6e4b1de2376018ac55206547fa511259fe1c0e71 Mon Sep 17 00:00:00 2001
From: pen <121443048+penginn-net@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:01:46 +0900
Subject: [PATCH 39/48] Merge pull request #551

* Libretranslate

*  pnpm run build-cherrypick-js-with-types

* fix type(bool => string)

* fix nullable

* fix polls-translate

* fix
---
 compose.local-db.yml                          |  6 +++
 compose_example.yml                           |  6 +++
 .../migration/1734793052000-LibreTranslate.js | 18 ++++++++
 packages/backend/src/models/Meta.ts           | 12 ++++++
 .../src/server/api/endpoints/admin/meta.ts    | 10 +++++
 .../server/api/endpoints/admin/update-meta.ts | 10 +++++
 .../api/endpoints/notes/polls/translate.ts    | 42 +++++++++++++++++++
 .../server/api/endpoints/notes/translate.ts   | 33 +++++++++++++++
 .../server/api/endpoints/users/translate.ts   | 34 +++++++++++++++
 packages/cherrypick-js/src/autogen/types.ts   |  4 ++
 .../src/pages/admin/external-services.vue     | 19 +++++++++
 11 files changed, 194 insertions(+)
 create mode 100644 packages/backend/migration/1734793052000-LibreTranslate.js

diff --git a/compose.local-db.yml b/compose.local-db.yml
index 3835cb23db..f0efdacc7b 100644
--- a/compose.local-db.yml
+++ b/compose.local-db.yml
@@ -38,3 +38,9 @@ services:
 #    volumes:
 #      - ./meili_data:/meili_data
 
+#  translator:
+#    restart: always
+#    image:  libretranslate/libretranslate:latest
+#    healthcheck:
+#    test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
+
diff --git a/compose_example.yml b/compose_example.yml
index 011a397124..11eadeae00 100644
--- a/compose_example.yml
+++ b/compose_example.yml
@@ -92,6 +92,12 @@ services:
 #    volumes:
 #      - ./meili_data:/meili_data
 
+#  translator:
+#    restart: always
+#    image:  libretranslate/libretranslate:latest
+#    healthcheck:
+#    test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
+
 networks:
   internal_network:
     internal: true
diff --git a/packages/backend/migration/1734793052000-LibreTranslate.js b/packages/backend/migration/1734793052000-LibreTranslate.js
new file mode 100644
index 0000000000..6714defc84
--- /dev/null
+++ b/packages/backend/migration/1734793052000-LibreTranslate.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class LibreTranslate1734793052000 {
+    name = 'LibreTranslate1734793052000'
+
+    async up(queryRunner) {
+      await queryRunner.query(`ALTER TABLE "meta" ADD "libreTranslateEndPoint" character varying(1024)`);
+      await queryRunner.query(`ALTER TABLE "meta" ADD "libreTranslateApiKey" character varying(1024)`);
+    }
+
+    async down(queryRunner) {
+      await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "libreTranslateEndPoint"`);
+      await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "libreTranslateApiKey"`);
+    }
+}
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 50d8a7e5cb..a44a38ff96 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -389,6 +389,18 @@ export class MiMeta {
 	})
 	public ctav3Location: string | null;
 
+	@Column('varchar', {
+		length: 1024,
+		nullable: true,
+	})
+	public libreTranslateEndPoint: string | null;
+
+	@Column('varchar', {
+		length: 1024,
+		nullable: true,
+	})
+	public libreTranslateApiKey: string | null;
+
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 74cb16dc0e..791391d374 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -468,6 +468,14 @@ export const meta = {
 				type: 'boolean',
 				optional: false, nullable: false,
 			},
+			libreTranslateEndPoint: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			libreTranslateApiKey: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
 			defaultDarkTheme: {
 				type: 'string',
 				optional: false, nullable: true,
@@ -763,6 +771,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				remoteObjectStorageS3ForcePathStyle: instance.remoteObjectStorageS3ForcePathStyle,
 				deeplAuthKey: instance.deeplAuthKey,
 				deeplIsPro: instance.deeplIsPro,
+				libreTranslateEndPoint: instance.libreTranslateEndPoint,
+				libreTranslateApiKey: instance.libreTranslateApiKey,
 				ctav3SaKey: instance.ctav3SaKey,
 				ctav3ProjectId: instance.ctav3ProjectId,
 				ctav3Location: instance.ctav3Location,
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index 5666754af9..efaa69dfff 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -107,6 +107,8 @@ export const paramDef = {
 		ctav3Location: { type: 'string', nullable: true },
 		ctav3Model: { type: 'string', nullable: true },
 		ctav3Glossary: { type: 'string', nullable: true },
+		libreTranslateEndPoint: { type: 'string', nullable: true },
+		libreTranslateApiKey: { type: 'string', nullable: true },
 		enableEmail: { type: 'boolean' },
 		email: { type: 'string', nullable: true },
 		smtpSecure: { type: 'boolean' },
@@ -657,6 +659,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.ctav3Glossary = ps.ctav3Glossary;
 			}
 
+			if (ps.libreTranslateEndPoint !== undefined) {
+				set.libreTranslateEndPoint = ps.libreTranslateEndPoint;
+			}
+
+			if (ps.libreTranslateApiKey !== undefined) {
+				set.libreTranslateApiKey = ps.libreTranslateApiKey;
+			}
+
 			if (ps.enableIpLogging !== undefined) {
 				set.enableIpLogging = ps.enableIpLogging;
 			}
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/translate.ts b/packages/backend/src/server/api/endpoints/notes/polls/translate.ts
index e30ec2a156..3509cd6480 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/translate.ts
@@ -83,6 +83,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				'deepl',
 				'google_no_api',
 				'ctav3',
+				'Libretranslate',
 			];
 
 			if (this.serverSettings.translatorType == null || !translatorServices.includes(this.serverSettings.translatorType)) {
@@ -119,6 +120,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				else if (this.serverSettings.ctav3ProjectId == null) return Promise.resolve(204);
 				else if (this.serverSettings.ctav3Location == null) return Promise.resolve(204);
 				translationResult = await this.apiCloudTranslationAdvanced(poll.choices, targetLang, this.serverSettings.ctav3SaKey, this.serverSettings.ctav3ProjectId, this.serverSettings.ctav3Location, this.serverSettings.ctav3Model, this.serverSettings.ctav3Glossary, this.serverSettings.translatorType);
+			} else if (this.serverSettings.translatorType === 'Libretranslate') {
+				const endPoint = this.serverSettings.libreTranslateEndPoint;
+				if (endPoint === null) throw new Error('libreTranslateEndPoint is null');
+				translationResult = await this.translateLibretranslate(poll.choices, targetLang, endPoint, this.serverSettings.libreTranslateApiKey);
 			} else {
 				throw new Error('Unsupported translator type');
 			}
@@ -217,4 +222,41 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			translator: provider,
 		};
 	}
+
+	private async translateLibretranslate(texts: string[], targetLang: string, endpoint: string, apiKey:string | null ) {
+		const translations = [];
+		const target = targetLang.split('-')[0];
+		for (const text of texts) {
+			const res = await this.httpRequestService.send(endpoint + '/translate', {
+				method: 'POST',
+				body: JSON.stringify({
+					q: text,
+					source: 'auto',
+					format: 'text',
+					target: target,
+					...(apiKey ? { api_key: apiKey } : { }),
+				}),
+				headers: { 'Content-Type': 'application/json' },
+			});
+
+			const json = (await res.json()) as {
+				translatedText: string,
+				detectedLanguage: {
+					confidence: number,
+					language: string,
+				}
+				error: string,
+			};
+			translations.push({
+				translatedText: json.translatedText || '',
+				sourceLang: json.detectedLanguage.language || '',
+			});
+		}
+
+		return {
+			sourceLang: translations[0]?.sourceLang || '',
+			text: translations.map(choice => choice.translatedText),
+			translator: 'Libretranslate',
+		};
+	}
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 1b10507e42..23abaf1127 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -100,6 +100,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				'deepl',
 				'google_no_api',
 				'ctav3',
+				'Libretranslate',
 			];
 
 			if (this.serverSettings.translatorType == null || !translatorServices.includes(this.serverSettings.translatorType)) {
@@ -131,6 +132,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				else if (this.serverSettings.ctav3ProjectId == null) return Promise.resolve(204);
 				else if (this.serverSettings.ctav3Location == null) return Promise.resolve(204);
 				translationResult = await this.apiCloudTranslationAdvanced((note.cw ? note.cw + '\n' : '') + note.text, targetLang, this.serverSettings.ctav3SaKey, this.serverSettings.ctav3ProjectId, this.serverSettings.ctav3Location, this.serverSettings.ctav3Model, this.serverSettings.ctav3Glossary, this.serverSettings.translatorType);
+			} else if (this.serverSettings.translatorType === 'Libretranslate') {
+				const endPoint = this.serverSettings.libreTranslateEndPoint;
+				if (endPoint === null) throw new Error('libreTranslateEndPoint is null');
+				translationResult = await this.translateLibretranslate((note.cw ? note.cw + '\n' : '') + note.text, targetLang, endPoint, this.serverSettings.libreTranslateApiKey);
 			} else {
 				throw new Error('Unsupported translator type');
 			}
@@ -221,4 +226,32 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			translator: provider,
 		};
 	}
+	private async translateLibretranslate(text: string, targetLang: string, endpoint: string, apiKey:string | null ) {
+		const res = await this.httpRequestService.send(endpoint + '/translate', {
+			method: 'POST',
+			body: JSON.stringify({
+				q: text,
+				source: 'auto',
+				format: 'text',
+				target: targetLang.split('-')[0],
+				...(apiKey ? { api_key: apiKey } : { }),
+			}),
+			headers: { 'Content-Type': 'application/json' },
+		});
+
+		const json = (await res.json()) as {
+			translatedText: string,
+			detectedLanguage: {
+				confidence: number,
+				language: string,
+			}
+			error: string,
+		};
+
+		return {
+			sourceLang: json.detectedLanguage.language,
+			text: json.translatedText,
+			translator: 'Libretranslate',
+		};
+	}
 }
diff --git a/packages/backend/src/server/api/endpoints/users/translate.ts b/packages/backend/src/server/api/endpoints/users/translate.ts
index 02de4238d6..8f878ec4d2 100644
--- a/packages/backend/src/server/api/endpoints/users/translate.ts
+++ b/packages/backend/src/server/api/endpoints/users/translate.ts
@@ -89,6 +89,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				'deepl',
 				'google_no_api',
 				'ctav3',
+				'Libretranslate',
 			];
 
 			if (this.serverSettings.translatorType == null || !translatorServices.includes(this.serverSettings.translatorType)) {
@@ -120,6 +121,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				else if (this.serverSettings.ctav3ProjectId == null) return Promise.resolve(204);
 				else if (this.serverSettings.ctav3Location == null) return Promise.resolve(204);
 				translationResult = await this.apiCloudTranslationAdvanced(target.description, targetLang, this.serverSettings.ctav3SaKey, this.serverSettings.ctav3ProjectId, this.serverSettings.ctav3Location, this.serverSettings.ctav3Model, this.serverSettings.ctav3Glossary, this.serverSettings.translatorType);
+			} else if (this.serverSettings.translatorType === 'Libretranslate') {
+				const endPoint = this.serverSettings.libreTranslateEndPoint;
+				if (endPoint === null) throw new Error('libreTranslateEndPoint is null');
+				translationResult = await this.translateLibretranslate(target.description, targetLang, endPoint, this.serverSettings.libreTranslateApiKey);
 			} else {
 				throw new Error('Unsupported translator type');
 			}
@@ -210,4 +215,33 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			translator: provider,
 		};
 	}
+
+	private async translateLibretranslate(text: string, targetLang: string, endpoint: string, apiKey:string | null ) {
+		const res = await this.httpRequestService.send(endpoint + '/translate', {
+			method: 'POST',
+			body: JSON.stringify({
+				q: text,
+				source: 'auto',
+				format: 'text',
+				target: targetLang.split('-')[0],
+				...(apiKey ? { api_key: apiKey } : { }),
+			}),
+			headers: { 'Content-Type': 'application/json' },
+		});
+
+		const json = (await res.json()) as {
+			translatedText: string,
+			detectedLanguage: {
+				confidence: number,
+				language: string,
+			}
+			error: string,
+		};
+
+		return {
+			sourceLang: json.detectedLanguage.language,
+			text: json.translatedText,
+			translator: 'Libretranslate',
+		};
+	}
 }
diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
index a573b6afa8..af80d30769 100644
--- a/packages/cherrypick-js/src/autogen/types.ts
+++ b/packages/cherrypick-js/src/autogen/types.ts
@@ -5622,6 +5622,8 @@ export type operations = {
             backgroundImageUrl: string | null;
             deeplAuthKey: string | null;
             deeplIsPro: boolean;
+            libreTranslateEndPoint: string | null;
+            libreTranslateApiKey: string | null;
             defaultDarkTheme: string | null;
             defaultLightTheme: string | null;
             description: string | null;
@@ -10401,6 +10403,8 @@ export type operations = {
           ctav3Location?: string | null;
           ctav3Model?: string | null;
           ctav3Glossary?: string | null;
+          libreTranslateEndPoint?: string | null;
+          libreTranslateApiKey?: string | null;
           enableEmail?: boolean;
           email?: string | null;
           smtpSecure?: boolean;
diff --git a/packages/frontend/src/pages/admin/external-services.vue b/packages/frontend/src/pages/admin/external-services.vue
index e841d2f668..e94229c61c 100644
--- a/packages/frontend/src/pages/admin/external-services.vue
+++ b/packages/frontend/src/pages/admin/external-services.vue
@@ -32,6 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<option value="deepl">DeepL</option>
 						<option value="google_no_api">Google Translate(without API)</option>
 						<option value="ctav3">Cloud Translation - Advanced(v3)</option>
+						<option value="Libretranslate">Libretranslate</option>
 					</MkRadios>
 
 					<template v-if="provider === 'deepl'">
@@ -64,6 +65,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</MkInput>
 					</template>
 
+					<template v-else-if="provider === 'Libretranslate'">
+						<div class="_gaps_m">
+							<MkInput v-model="libreTranslateEndPoint">
+								<template #prefix><i class="ti ti-server"></i></template>
+								<template #label>Api Endpoint</template>
+							</MkInput>
+							<MkInput v-model="libreTranslateApiKey">
+								<template #prefix><i class="ti ti-key"></i></template>
+								<template #label>ApiKey</template>
+							</MkInput>
+						</div>
+					</template>
 					<MkButton primary rounded @click="save_deepl"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
 				</div>
 			</MkFolder>
@@ -95,6 +108,8 @@ const ctav3ProjectId = ref<string>('');
 const ctav3Location = ref<string>('');
 const ctav3Model = ref<string>('');
 const ctav3Glossary = ref<string>('');
+const libreTranslateEndPoint = ref<string>('');
+const libreTranslateApiKey = ref<string>('');
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');
@@ -106,6 +121,8 @@ async function init() {
 	ctav3Location.value = meta.ctav3Location;
 	ctav3Model.value = meta.ctav3Model;
 	ctav3Glossary.value = meta.ctav3Glossary;
+	libreTranslateEndPoint.value = meta.libreTranslateEndPoint;
+	libreTranslateApiKey.value = meta.libreTranslateApiKey;
 }
 
 function save_deepl() {
@@ -118,6 +135,8 @@ function save_deepl() {
 		ctav3Location: ctav3Location.value,
 		ctav3Model: ctav3Model.value,
 		ctav3Glossary: ctav3Glossary.value,
+		libreTranslateEndPoint: libreTranslateEndPoint.value,
+		libreTranslateApiKey: libreTranslateApiKey.value,
 	}).then(() => {
 		fetchInstance(true);
 	});

From 23f47b93b3419a3885e2d40ed729f185521b9b0e Mon Sep 17 00:00:00 2001
From: Esurio/1673beta <60435625+1673beta@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:07:09 +0900
Subject: [PATCH 40/48] Merge pull request #553

* fix: unable to see user page

* Update index.vue
---
 packages/frontend/src/pages/user/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index b99ed9e661..d671de04ee 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -37,6 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
 import * as Misskey from 'cherrypick-js';
 import * as os from '@/os.js';
+import { $i } from '@/account.js';
 import { acct as getAcct } from '@/filters/user.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';

From 24b3750b910975a08a62f3acd61045ac7102dcb8 Mon Sep 17 00:00:00 2001
From: Esurio/1673beta <60435625+1673beta@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:10:56 +0900
Subject: [PATCH 41/48] Merge pull request #554

* feat: custome search engine

* fix import

* Rollback elements
---
 locales/en-US.yml                             |  14 +++
 locales/index.d.ts                            | 113 ++++++++++++++++++
 locales/ja-JP.yml                             |  15 +++
 packages/frontend/src/components/MkGoogle.vue |  37 +++++-
 .../frontend/src/pages/settings/general.vue   |  23 ++++
 packages/frontend/src/store.ts                |  12 ++
 6 files changed, 212 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index ba3e03c9f1..1356d2d11a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -3170,3 +3170,17 @@ _scheduledNoteDelete:
 _getQRCode:
   title: "Scan QR Code"
   description: "Can scan or share the QR code below."
+
+_searchSite:
+  title: "Search Engine"
+  description: "Change search engine that used in search MFM."
+  google: "Google"
+  bing: "Bing"
+  yahoo: "Yahoo"
+  baidu: "Baidu"
+  naver: "NAVER"
+  duckduckgo: "DuckDuckGo"
+  other: "Other"
+  otherDescription: "Use Other search engine"
+  query: "Query"
+  queryDescription: "Input query scheme for search engine. For example, If https://www.ecosia.org/search?q=test, input 'q'."
diff --git a/locales/index.d.ts b/locales/index.d.ts
index f51e33c99e..a0f48de8ed 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12115,6 +12115,65 @@ export interface Locale extends ILocale {
          */
         "sent": string;
     };
+    "_remoteLookupErrors": {
+        "_federationNotAllowed": {
+            /**
+             * このサーバーとは通信できません
+             */
+            "title": string;
+            /**
+             * このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。
+             * サーバー管理者にお問い合わせください。
+             */
+            "description": string;
+        };
+        "_uriInvalid": {
+            /**
+             * URIが不正です
+             */
+            "title": string;
+            /**
+             * 入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。
+             */
+            "description": string;
+        };
+        "_requestFailed": {
+            /**
+             * リクエストに失敗しました
+             */
+            "title": string;
+            /**
+             * このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。
+             */
+            "description": string;
+        };
+        "_responseInvalid": {
+            /**
+             * レスポンスが不正です
+             */
+            "title": string;
+            /**
+             * このサーバーと通信することはできましたが、得られたデータが不正なものでした。
+             */
+            "description": string;
+        };
+        "_responseInvalidIdHostNotMatch": {
+            /**
+             * 入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。
+             */
+            "description": string;
+        };
+        "_noSuchObject": {
+            /**
+             * 見つかりません
+             */
+            "title": string;
+            /**
+             * 要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。
+             */
+            "description": string;
+        };
+    };
     "_abuse": {
         "_resolver": {
             /**
@@ -12303,6 +12362,60 @@ export interface Locale extends ILocale {
          */
         "description": string;
     };
+    "_searchSite": {
+        /**
+         * 検索エンジン
+         */
+        "title": string;
+        /**
+         * MFMの検索構文で検索できるサイトを変更します。
+         */
+        "description": string;
+        /**
+         * Google
+         */
+        "google": string;
+        /**
+         * Bing
+         */
+        "bing": string;
+        /**
+         * Yahoo
+         */
+        "yahoo": string;
+        /**
+         * Baidu
+         */
+        "baidu": string;
+        /**
+         * NAVER
+         */
+        "naver": string;
+        /**
+         * DuckDuckGo
+         */
+        "duckduckgo": string;
+        /**
+         * その他
+         */
+        "other": string;
+        /**
+         * その他の検索エンジン
+         */
+        "otherSearchEngine": string;
+        /**
+         * その他の検索エンジンを使用します。
+         */
+        "otherDescription": string;
+        /**
+         * 検索クエリ
+         */
+        "query": string;
+        /**
+         * 検索エンジンが使用するクエリを入力します。(例: https://www.ecosia.org/search?q=test の場合qを入れる)
+         */
+        "queryDescription": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0b743e50e5..4366cca5ad 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -3297,3 +3297,18 @@ _scheduledNoteDelete:
 _getQRCode:
   title: "QRコードをスキャンする"
   description: "以下のQRコードをスキャンまたは共有できます。"
+
+_searchSite:
+  title: "検索エンジン"
+  description: "MFMの検索構文で検索できるサイトを変更します。"
+  google: "Google"
+  bing: "Bing"
+  yahoo: "Yahoo"
+  baidu: "Baidu"
+  naver: "NAVER"
+  duckduckgo: "DuckDuckGo"
+  other: "その他"
+  otherSearchEngine: "その他の検索エンジン"
+  otherDescription: "その他の検索エンジンを使用します。"
+  query: "検索クエリ"
+  queryDescription: "検索エンジンが使用するクエリを入力します。(例: https://www.ecosia.org/search?q=test の場合qを入れる)"
diff --git a/packages/frontend/src/components/MkGoogle.vue b/packages/frontend/src/components/MkGoogle.vue
index da7bcde4d8..232fba3bc6 100644
--- a/packages/frontend/src/components/MkGoogle.vue
+++ b/packages/frontend/src/components/MkGoogle.vue
@@ -13,6 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { ref } from 'vue';
 import { i18n } from '@/i18n.js';
+import { defaultStore } from '@/store.js';
 
 const props = defineProps<{
 	q: string;
@@ -22,8 +23,40 @@ const query = ref(props.q);
 
 const search = () => {
 	const sp = new URLSearchParams();
-	sp.append('q', query.value);
-	window.open(`https://www.google.com/search?${sp.toString()}`, '_blank', 'noopener');
+	let url = '';
+	switch (defaultStore.state.searchEngine) {
+		case 'google':
+			sp.append('q', query.value);
+			url = `https://www.google.com/search?${sp.toString()}`;
+			break;
+		case 'bing':
+			sp.append('q', query.value);
+			url = `https://www.bing.com/search?${sp.toString()}`;
+			break;
+		case 'yahoo':
+			sp.append('p', query.value);
+			url = `https://search.yahoo.com/search?${sp.toString()}`;
+			break;
+		case 'baidu':
+			// see detail: https://www.jademond.com/magazine/baidu-search-url-parameters/
+			sp.append('wd', query.value);
+			url = `https://www.baidu.com/s?${sp.toString()}`;
+			break;
+		case 'naver':
+			sp.append('query', query.value);
+			url = `https://search.naver.com/search.naver?${sp.toString()}`;
+			break;
+		case 'duckduckgo':
+			sp.append('q', query.value);
+			url = `https://duckduckgo.com/?${sp.toString()}`;
+			break;
+		case 'other':
+			sp.append(defaultStore.state.searchEngineUrlQuery, query.value);
+			url = `${defaultStore.state.searchEngineUrl}${sp.toString()}`;
+			break;
+	}
+
+	window.open(url, '_blank', 'noopener');
 };
 </script>
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index e041ce1f09..e9f0fc3d7d 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -152,6 +152,25 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="S">{{ i18n.ts._hemisphere.S }}</option>
 				<template #caption>{{ i18n.ts._hemisphere.caption }}</template>
 			</MkRadios>
+			<MkSelect v-model="searchEngine">
+				<template #label>{{ i18n.ts._searchSite.title }}</template>
+				<template #caption>{{ i18n.ts._searchSite.description }}</template>
+				<option value="google">{{ i18n.ts._searchSite.google }}</option>
+				<option value="bing">{{ i18n.ts._searchSite.bing }}</option>
+				<option value="yahoo">{{ i18n.ts._searchSite.yahoo }}</option>
+				<option value="baidu">{{ i18n.ts._searchSite.baidu }}</option>
+				<option value="naver">{{ i18n.ts._searchSite.naver }}</option>
+				<option value="duckduckgo">{{ i18n.ts._searchSite.duckduckgo }}</option>
+				<option value="other">{{ i18n.ts._searchSite.other }}</option>
+			</MkSelect>
+			<MkInput v-if="defaultStore.state.searchEngine == 'other'" v-model="searchEngineUrl">
+				<template #label>{{ i18n.ts._searchSite.otherSearchEngine }}</template>
+				<template #caption>{{ i18n.ts._searchSite.otherDescription }}</template>
+			</MkInput>
+			<MkInput v-if="defaultStore.state.searchEngine == 'other'" v-model="searchEngineUrlQuery">
+				<template #label>{{ i18n.ts._searchSite.query }}</template>
+				<template #caption>{{ i18n.ts._searchSite.queryDescription }}</template>
+			</MkInput>
 			<MkFolder>
 				<template #label>{{ i18n.ts.additionalEmojiDictionary }}</template>
 				<div class="_buttons">
@@ -191,6 +210,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { globalEvents } from '@/events.js';
 import { $i } from '@/account.js';
+import MkInput from '@/components/MkInput.vue';
 
 const lang = ref(miLocalStorage.getItem('lang'));
 const dataSaver = ref(defaultStore.state.dataSaver);
@@ -223,6 +243,9 @@ const useAutoTranslate = computed(defaultStore.makeGetterSetter('useAutoTranslat
 const welcomeBackToast = computed(defaultStore.makeGetterSetter('welcomeBackToast'));
 const disableNyaize = computed(defaultStore.makeGetterSetter('disableNyaize'));
 const externalNavigationWarning = computed(defaultStore.makeGetterSetter('externalNavigationWarning'));
+const searchEngine = computed(defaultStore.makeGetterSetter('searchEngine'));
+const searchEngineUrl = computed(defaultStore.makeGetterSetter('searchEngineUrl'));
+const searchEngineUrlQuery = computed(defaultStore.makeGetterSetter('searchEngineUrlQuery'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 348b9479b2..01de5aa3a6 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -582,6 +582,18 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+	searchEngine: {
+		where: 'device',
+		default: 'google' as 'google' | 'bing' | 'yahoo' | 'baidu'| 'naver' | 'duckduckgo' | 'other',
+	},
+	searchEngineUrl: {
+		where: 'device',
+		default: 'https://www.ecosia.org/search?',
+	},
+	searchEngineUrlQuery: {
+		where: 'device',
+		default: 'q',
+	},
 
 	// - Settings/Appearance
 	collapseReplies: {

From 4d6078204fb4a35fcf678df23579ffed3db27366 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Wed, 1 Jan 2025 22:15:25 +0900
Subject: [PATCH 42/48] chore

---
 compose.local-db.yml                                      | 2 +-
 compose_example.yml                                       | 2 +-
 locales/en-US.yml                                         | 1 -
 .../backend/src/core/activitypub/ApResolverService.ts     | 2 +-
 packages/backend/src/models/Meta.ts                       | 8 ++++----
 packages/backend/src/server/api/endpoints/admin/meta.ts   | 4 ++--
 packages/backend/src/server/api/endpoints/ap/show.ts      | 2 +-
 packages/frontend/src/pages/settings/general.vue          | 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/compose.local-db.yml b/compose.local-db.yml
index f0efdacc7b..4d69c20d7f 100644
--- a/compose.local-db.yml
+++ b/compose.local-db.yml
@@ -40,7 +40,7 @@ services:
 
 #  translator:
 #    restart: always
-#    image:  libretranslate/libretranslate:latest
+#    image: libretranslate/libretranslate:latest
 #    healthcheck:
 #    test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
 
diff --git a/compose_example.yml b/compose_example.yml
index 11eadeae00..8b2cbed657 100644
--- a/compose_example.yml
+++ b/compose_example.yml
@@ -94,7 +94,7 @@ services:
 
 #  translator:
 #    restart: always
-#    image:  libretranslate/libretranslate:latest
+#    image: libretranslate/libretranslate:latest
 #    healthcheck:
 #    test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
 
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 1356d2d11a..7cf62fd704 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -3170,7 +3170,6 @@ _scheduledNoteDelete:
 _getQRCode:
   title: "Scan QR Code"
   description: "Can scan or share the QR code below."
-
 _searchSite:
   title: "Search Engine"
   description: "Change search engine that used in search MFM."
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index 52cc569140..46c29a034a 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -15,12 +15,12 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { isCollectionOrOrderedCollection } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
 import { ApRequestService } from './ApRequestService.js';
 import type { IObject, ICollection, IOrderedCollection } from './type.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 export class Resolver {
 	private history: Set<string>;
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index a44a38ff96..00e8af82b7 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -393,25 +393,25 @@ export class MiMeta {
 		length: 1024,
 		nullable: true,
 	})
-	public libreTranslateEndPoint: string | null;
+	public ctav3Model: string | null;
 
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
 	})
-	public libreTranslateApiKey: string | null;
+	public ctav3Glossary: string | null;
 
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
 	})
-	public ctav3Model: string | null;
+	public libreTranslateEndPoint: string | null;
 
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
 	})
-	public ctav3Glossary: string | null;
+	public libreTranslateApiKey: string | null;
 
 	@Column('varchar', {
 		length: 1024,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 791391d374..5170c49c86 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -771,13 +771,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				remoteObjectStorageS3ForcePathStyle: instance.remoteObjectStorageS3ForcePathStyle,
 				deeplAuthKey: instance.deeplAuthKey,
 				deeplIsPro: instance.deeplIsPro,
-				libreTranslateEndPoint: instance.libreTranslateEndPoint,
-				libreTranslateApiKey: instance.libreTranslateApiKey,
 				ctav3SaKey: instance.ctav3SaKey,
 				ctav3ProjectId: instance.ctav3ProjectId,
 				ctav3Location: instance.ctav3Location,
 				ctav3Model: instance.ctav3Model,
 				ctav3Glossary: instance.ctav3Glossary,
+				libreTranslateEndPoint: instance.libreTranslateEndPoint,
+				libreTranslateApiKey: instance.libreTranslateApiKey,
 				enableIpLogging: instance.enableIpLogging,
 				enableActiveEmailValidation: instance.enableActiveEmailValidation,
 				enableVerifymailApi: instance.enableVerifymailApi,
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 5c2e82da88..793daf3891 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -18,8 +18,8 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
-import { ApiError } from '../../error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index e9f0fc3d7d..3badeaf6bb 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -201,6 +201,7 @@ import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/MkLink.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
+import MkInput from '@/components/MkInput.vue';
 import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -210,7 +211,6 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { globalEvents } from '@/events.js';
 import { $i } from '@/account.js';
-import MkInput from '@/components/MkInput.vue';
 
 const lang = ref(miLocalStorage.getItem('lang'));
 const dataSaver = ref(defaultStore.state.dataSaver);

From 1f4ae7ee64483ef986f0b549039cb1786ded3034 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 2 Jan 2025 01:25:50 +0900
Subject: [PATCH 43/48] enhance 24b3750b

---
 locales/en-US.yml                             | 14 +++-----
 locales/index.d.ts                            | 32 ++-----------------
 locales/ja-JP.yml                             | 11 ++-----
 locales/ko-KR.yml                             |  7 ++++
 packages/frontend/src/components/MkGoogle.vue |  4 +++
 .../frontend/src/pages/settings/general.vue   | 15 +++++----
 packages/frontend/src/store.ts                |  2 +-
 7 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 7cf62fd704..c4753f2c2b 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -3172,14 +3172,8 @@ _getQRCode:
   description: "Can scan or share the QR code below."
 _searchSite:
   title: "Search Engine"
-  description: "Change search engine that used in search MFM."
-  google: "Google"
-  bing: "Bing"
-  yahoo: "Yahoo"
-  baidu: "Baidu"
-  naver: "NAVER"
-  duckduckgo: "DuckDuckGo"
-  other: "Other"
-  otherDescription: "Use Other search engine"
+  description: "Change search engine that used in search MFC."
+  otherSearchEngine: "Other search engines"
+  otherDescription: "Use other search engine"
   query: "Query"
-  queryDescription: "Input query scheme for search engine. For example, If https://www.ecosia.org/search?q=test, input 'q'."
+  queryDescription: "Input query scheme for search engine. For example, if https://www.google.com/search?q=test, input 'q'."
diff --git a/locales/index.d.ts b/locales/index.d.ts
index a0f48de8ed..d37608a5f7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12368,37 +12368,9 @@ export interface Locale extends ILocale {
          */
         "title": string;
         /**
-         * MFMの検索構文で検索できるサイトを変更します。
+         * MFCの検索構文で検索できるサイトを変更します。
          */
         "description": string;
-        /**
-         * Google
-         */
-        "google": string;
-        /**
-         * Bing
-         */
-        "bing": string;
-        /**
-         * Yahoo
-         */
-        "yahoo": string;
-        /**
-         * Baidu
-         */
-        "baidu": string;
-        /**
-         * NAVER
-         */
-        "naver": string;
-        /**
-         * DuckDuckGo
-         */
-        "duckduckgo": string;
-        /**
-         * その他
-         */
-        "other": string;
         /**
          * その他の検索エンジン
          */
@@ -12412,7 +12384,7 @@ export interface Locale extends ILocale {
          */
         "query": string;
         /**
-         * 検索エンジンが使用するクエリを入力します。(例: https://www.ecosia.org/search?q=test の場合qを入れる)
+         * 検索エンジンが使用するクエリを入力します。(例: https://www.google.com/search?q=test の場合qを入れる)
          */
         "queryDescription": string;
     };
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4366cca5ad..bed15fb492 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -3300,15 +3300,8 @@ _getQRCode:
 
 _searchSite:
   title: "検索エンジン"
-  description: "MFMの検索構文で検索できるサイトを変更します。"
-  google: "Google"
-  bing: "Bing"
-  yahoo: "Yahoo"
-  baidu: "Baidu"
-  naver: "NAVER"
-  duckduckgo: "DuckDuckGo"
-  other: "その他"
+  description: "MFCの検索構文で検索できるサイトを変更します。"
   otherSearchEngine: "その他の検索エンジン"
   otherDescription: "その他の検索エンジンを使用します。"
   query: "検索クエリ"
-  queryDescription: "検索エンジンが使用するクエリを入力します。(例: https://www.ecosia.org/search?q=test の場合qを入れる)"
+  queryDescription: "検索エンジンが使用するクエリを入力します。(例: https://www.google.com/search?q=test の場合qを入れる)"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index f850aabf4e..668c0e9b1b 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -3177,3 +3177,10 @@ _scheduledNoteDelete:
 _getQRCode:
   title: "QR 코드 스캔하기"
   description: "아래 QR 코드를 스캔하거나 공유할 수 있어요."
+_searchSite:
+  title: "검색 엔진"
+  description: "MFC의 검색 구문을 사용했을 때 사용되는 검색 엔진을 변경해요."
+  otherSearchEngine: "사용자 지정 검색 엔진"
+  otherDescription: "검색 엔진을 직접 지정할 수 있어요."
+  query: "검색 쿼리"
+  queryDescription: "검색 엔진이 사용할 쿼리를 입력해 주세요. (예: https://www.google.com/search?q=test 의 경우 q를 입력)"
diff --git a/packages/frontend/src/components/MkGoogle.vue b/packages/frontend/src/components/MkGoogle.vue
index 232fba3bc6..4fb12172b4 100644
--- a/packages/frontend/src/components/MkGoogle.vue
+++ b/packages/frontend/src/components/MkGoogle.vue
@@ -46,6 +46,10 @@ const search = () => {
 			sp.append('query', query.value);
 			url = `https://search.naver.com/search.naver?${sp.toString()}`;
 			break;
+		case 'daum':
+			sp.append('q', query.value);
+			url = `https://search.daum.net/search?${sp.toString()}`;
+			break;
 		case 'duckduckgo':
 			sp.append('q', query.value);
 			url = `https://duckduckgo.com/?${sp.toString()}`;
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 3badeaf6bb..88a8ae094f 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -155,13 +155,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkSelect v-model="searchEngine">
 				<template #label>{{ i18n.ts._searchSite.title }}</template>
 				<template #caption>{{ i18n.ts._searchSite.description }}</template>
-				<option value="google">{{ i18n.ts._searchSite.google }}</option>
-				<option value="bing">{{ i18n.ts._searchSite.bing }}</option>
-				<option value="yahoo">{{ i18n.ts._searchSite.yahoo }}</option>
-				<option value="baidu">{{ i18n.ts._searchSite.baidu }}</option>
-				<option value="naver">{{ i18n.ts._searchSite.naver }}</option>
-				<option value="duckduckgo">{{ i18n.ts._searchSite.duckduckgo }}</option>
-				<option value="other">{{ i18n.ts._searchSite.other }}</option>
+				<option value="google">Google</option>
+				<option value="bing">Bing</option>
+				<option value="yahoo">Yahoo</option>
+				<option value="baidu">Baidu</option>
+				<option value="naver">NAVER</option>
+				<option value="daum">Daum</option>
+				<option value="duckduckgo">DuckDuckGo</option>
+				<option value="other">{{ i18n.ts.other }}</option>
 			</MkSelect>
 			<MkInput v-if="defaultStore.state.searchEngine == 'other'" v-model="searchEngineUrl">
 				<template #label>{{ i18n.ts._searchSite.otherSearchEngine }}</template>
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 01de5aa3a6..61a10f5ec8 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -584,7 +584,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	searchEngine: {
 		where: 'device',
-		default: 'google' as 'google' | 'bing' | 'yahoo' | 'baidu'| 'naver' | 'duckduckgo' | 'other',
+		default: 'google' as 'google' | 'bing' | 'yahoo' | 'baidu' | 'naver' | 'daum' | 'duckduckgo' | 'other',
 	},
 	searchEngineUrl: {
 		where: 'device',

From 2fd31f5f7bf3fc2da4dd47c99cccb751952e338f Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 2 Jan 2025 01:25:57 +0900
Subject: [PATCH 44/48] Update CHANGELOG_CHERRYPICK.md

---
 CHANGELOG_CHERRYPICK.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 3f7be78b6d..e6b651200d 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -29,6 +29,11 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.
 
 ### General
+- Feat: 번역 서비스 추가 지원 (kokonect-link/cherrypick#551)
+  - [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate) 지원 추가
+    - 외부 서비스를 이용하는 번역 서비스는 요금제에 따른 API 제한이 적용되므로, 자체 호스팅으로 구동할 수 있는 번역 API를 사용할 수 있음
+- Feat: 검색 엔진 사용자화 (kokonect-link/cherrypick#554)
+  - MFC 구문 중 `[검색]`, `[search]`, `[検索]`를 사용했을 때, 사용할 검색 엔진을 지정할 수 있음
 - Enhance: 예약된 노트 게시에 실패할 경우 사용자에게 알림 ([penginn-net/kokonect@a0e47980](https://github.com/penginn-net/kokonect/commit/a0e47980470b49e79e84ff3b7ccaf2b4502928c8))
 
 ### Client

From e90574a8c70ce7891e5012764f72c02f84e6f3b3 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 2 Jan 2025 01:42:03 +0900
Subject: [PATCH 45/48] =?UTF-8?q?fix(frontend):=20=ED=8A=B9=EC=A0=95=20?=
 =?UTF-8?q?=ED=99=98=EA=B2=BD=EC=97=90=EC=84=9C=20=EB=A6=AC=EC=95=A1?=
 =?UTF-8?q?=EC=85=98=EC=9D=84=20=EB=B3=80=EA=B2=BD=ED=95=A0=20=EC=88=98=20?=
 =?UTF-8?q?=EC=97=86=EC=9D=84=20=EC=88=98=20=EC=9E=88=EC=9D=8C=20(kokonect?=
 =?UTF-8?q?-link/cherrypick#549)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                                         | 1 +
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index e6b651200d..f38667f481 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -43,6 +43,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 - Fix: 네비게이션 바에 배너 이미지가 표시되지 않을 수 있음 (kokonect-link/cherrypick#545)
 - Fix: 고정된 리스트 타임라인을 사용할 수 없음 (kokonect-link/cherrypick#546)
 - Fix: 버블 타임라인이 비활성화 상태면 버블 타임라인의 호스트 목록을 수정할 수 없음 (kokonect-link/cherrypick#544)
+- Fix: 특정 환경에서 리액션을 변경할 수 없을 수 있음 (kokonect-link/cherrypick#549)
 
 ---
 
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 77ddeb8098..bd68554c3f 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -97,7 +97,7 @@ async function toggleReaction(ev: MouseEvent) {
 			if (oldReaction !== props.reaction) {
 				misskeyApi('notes/reactions/create', {
 					noteId: props.note.id,
-					reaction: `:${reactionName.value}:`,
+					reaction: props.reaction,
 				});
 			}
 		});

From 7ae34e3aac286c2f522a71b4a389ea5e6998d41a Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 2 Jan 2025 01:46:10 +0900
Subject: [PATCH 46/48] 4.14.1-alpha.2

---
 package.json                        | 2 +-
 packages/cherrypick-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5bbbe5abb1..8eda1dc0cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.14.1-alpha.1",
+	"version": "4.14.1-alpha.2",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
index aed78ad169..6367611e04 100644
--- a/packages/cherrypick-js/package.json
+++ b/packages/cherrypick-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.14.1-alpha.1",
+	"version": "4.14.1-alpha.2",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",

From b4152c24a4be96dad6008ee254d625d09da2b20d Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 2 Jan 2025 20:25:08 +0900
Subject: [PATCH 47/48] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 08f989051a..d30d8c11e6 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -230,7 +230,19 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js';
 import { $i } from '@/account.js';
 
-const patronsWithIconWithCherryPick = [];
+const patronsWithIconWithCherryPick = [{
+	name: 'Etone Sabasappugawa',
+	icon: 'https://s3.kokonect.link/cherrypick/patreons/b3bd97949b664c81857cc7286552c65e.png',
+}, {
+	name: 'okin',
+	icon: 'https://s3.kokonect.link/cherrypick/patreons/c185756cf04d483b9c7687d98ce1103c.png',
+}, {
+	name: 'Kitty',
+	icon: 'https://s3.kokonect.link/cherrypick/patreons/5f8e4bac9cf34984bc59875f6d8d5c1d.gif',
+}, {
+	name: 'breadguy',
+	icon: 'https://s3.kokonect.link/cherrypick/patreons/04cd46fba69c4953949cd1cc15d8c691.jpg',
+}];
 
 const patronsWithIconWithMisskey = [{
 	name: 'カイヤン',

From a88fce4e35fadf2e5a9852d6ae01896e0b811d63 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 2 Jan 2025 20:25:13 +0900
Subject: [PATCH 48/48] 4.14.1

---
 CHANGELOG_CHERRYPICK.md             | 8 ++++----
 package.json                        | 2 +-
 packages/cherrypick-js/package.json | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index f38667f481..f75bf3d4ab 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -23,10 +23,10 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 # 릴리스 노트
 이 문서는 CherryPick의 변경 사항만 포함합니다.
 
-## 4.x.x
-출시일: unreleased<br>
-기반 Misskey 버전: 2024.x.x<br>
-Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.
+## 4.14.1
+출시일: 2025/1/2<br>
+기반 Misskey 버전: 2024.11.1-alpha.0<br>
+Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024111](CHANGELOG.md#2024111) 문서를 참고하십시오.
 
 ### General
 - Feat: 번역 서비스 추가 지원 (kokonect-link/cherrypick#551)
diff --git a/package.json b/package.json
index 8eda1dc0cb..492a75d39f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.14.1-alpha.2",
+	"version": "4.14.1",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
index 6367611e04..d2d01d474a 100644
--- a/packages/cherrypick-js/package.json
+++ b/packages/cherrypick-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.14.1-alpha.2",
+	"version": "4.14.1",
 	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",