From cb3106cdc6ed6598736aae2273f116a9c01cfeb8 Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:57:41 +0900
Subject: [PATCH] =?UTF-8?q?enhance(frontend):=20=E9=80=A3=E5=90=88?=
 =?UTF-8?q?=E3=81=AE=E3=80=8C=E9=80=A3=E5=90=88=E4=B8=AD=E3=80=8D,?=
 =?UTF-8?q?=E3=80=8C=E8=B3=BC=E8=AA=AD=E4=B8=AD=E3=80=8D,=E3=80=8C?=
 =?UTF-8?q?=E9=85=8D=E4=BF=A1=E4=B8=AD=E3=80=8D=E3=81=AB=E5=AF=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=82=8B=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E4=BF=A1=E5=81=9C=E6=AD=A2=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=82=92=E5=90=AB?=
 =?UTF-8?q?=E3=82=81=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#1432?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): 連合の「連合中」,「購読中」,「配信中」に対してブロックしているサーバー、配信停止しているサーバーを含めないように

* update CHANGELOG.md
---
 CHANGELOG.md                                     | 1 +
 packages/frontend/src/pages/about.federation.vue | 6 +++---
 packages/frontend/src/pages/admin/federation.vue | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f58bec42e6..527c0e0b6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
   (Cherry-picked from https://github.com/nafu-at/misskey/commit/b89c2af6945c6a9f9f10e83f54d2bcf0f240b0b4, https://github.com/nafu-at/misskey/commit/8a7d710c6acb83f50c83f050bd1423c764d60a99)
 - Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
 - Enhance: ブラウザのコンテキストメニューを使用できるように
+- Enhance: 連合の「連合中」,「購読中」,「配信中」に対してブロックしているサーバー、配信停止しているサーバーを含めないように
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue
index 24e96b4f4e..b3776c67e6 100644
--- a/packages/frontend/src/pages/about.federation.vue
+++ b/packages/frontend/src/pages/about.federation.vue
@@ -71,9 +71,9 @@ const pagination = {
 		sort: sort.value,
 		host: host.value !== '' ? host.value : null,
 		...(
-			state.value === 'federating' ? { federating: true } :
-			state.value === 'subscribing' ? { subscribing: true } :
-			state.value === 'publishing' ? { publishing: true } :
+			state.value === 'federating' ? { federating: true, suspended: false, blocked: false } :
+			state.value === 'subscribing' ? { subscribing: true, suspended: false, blocked: false } :
+			state.value === 'publishing' ? { publishing: true, suspended: false, blocked: false } :
 			state.value === 'suspended' ? { suspended: true } :
 			state.value === 'blocked' ? { blocked: true } :
 			state.value === 'silenced' ? { silenced: true } :
diff --git a/packages/frontend/src/pages/admin/federation.vue b/packages/frontend/src/pages/admin/federation.vue
index 0aaa398584..debf684c9b 100644
--- a/packages/frontend/src/pages/admin/federation.vue
+++ b/packages/frontend/src/pages/admin/federation.vue
@@ -80,9 +80,9 @@ const pagination = {
 		sort: sort.value,
 		host: host.value !== '' ? host.value : null,
 		...(
-			state.value === 'federating' ? { federating: true } :
-			state.value === 'subscribing' ? { subscribing: true } :
-			state.value === 'publishing' ? { publishing: true } :
+			state.value === 'federating' ? { federating: true, suspended: false, blocked: false } :
+			state.value === 'subscribing' ? { subscribing: true, suspended: false, blocked: false } :
+			state.value === 'publishing' ? { publishing: true, suspended: false, blocked: false } :
 			state.value === 'suspended' ? { suspended: true } :
 			state.value === 'blocked' ? { blocked: true } :
 			state.value === 'silenced' ? { silenced: true } :