From cd898e0b1ea04ee1b8b65b502c639227f6ffbef8 Mon Sep 17 00:00:00 2001
From: Esurio/1673beta <60435625+1673beta@users.noreply.github.com>
Date: Tue, 9 Jul 2024 00:01:29 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9D=9E=E3=83=AD=E3=82=B0=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E6=99=82=E3=81=AB=E8=A6=8B=E3=82=8C=E3=82=8B=E9=A0=85?=
 =?UTF-8?q?=E7=9B=AE=E3=82=92=E5=B0=91=E3=81=AA=E3=81=8F=20(#80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 非ログイン時にブロック/配送停止/サイレンスしたサーバーを非表示に

* feat: 「タイムラインを見てみる」を廃止

* Revert "feat: 「タイムラインを見てみる」を廃止"

This reverts commit c5fd4caab4189c0c90f414bf62761303e109d6e6.

* Update CHANGELOG
---
 CHANGELOG_engawa.md                                        | 3 ++-
 .../src/server/api/endpoints/federation/instances.ts       | 6 ++++++
 packages/frontend/src/pages/about.federation.vue           | 7 ++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG_engawa.md b/CHANGELOG_engawa.md
index de137c5d20..eec6f6ecb4 100644
--- a/CHANGELOG_engawa.md
+++ b/CHANGELOG_engawa.md
@@ -16,7 +16,7 @@
 
 -->
 
-## x.x.x (unreleased)
+## 0.4.1 (unreleased)
 
 ### Release Date
 
@@ -26,6 +26,7 @@
 ### Client
 - ダイスウィジェットを追加
 - 通知を全て削除できるボタンを追加
+- 非ログイン時にブロック/配送停止/サイレンスしているサーバーが見れないように
 
 ### Server
 - 管理者アカウントを別サーバーに移行できるように
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 36f4bf5aa6..310d80aaf6 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -98,6 +98,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				default: query.orderBy('instance.id', 'DESC'); break;
 			}
 
+			if (me == null) {
+				ps.blocked = false;
+				ps.suspended = false;
+				ps.silenced = false;
+			}
+
 			if (typeof ps.blocked === 'boolean') {
 				const meta = await this.metaService.fetch(true);
 				if (ps.blocked) {
diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue
index 24e96b4f4e..beb017cec2 100644
--- a/packages/frontend/src/pages/about.federation.vue
+++ b/packages/frontend/src/pages/about.federation.vue
@@ -17,9 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="federating">{{ i18n.ts.federating }}</option>
 				<option value="subscribing">{{ i18n.ts.subscribing }}</option>
 				<option value="publishing">{{ i18n.ts.publishing }}</option>
-				<option value="suspended">{{ i18n.ts.suspended }}</option>
-				<option value="silenced">{{ i18n.ts.silence }}</option>
-				<option value="blocked">{{ i18n.ts.blocked }}</option>
+				<option v-if="$i" value="suspended">{{ i18n.ts.suspended }}</option>
+				<option v-if="$i" value="silenced">{{ i18n.ts.silence }}</option>
+				<option v-if="$i" value="blocked">{{ i18n.ts.blocked }}</option>
 				<option value="notResponding">{{ i18n.ts.notResponding }}</option>
 			</MkSelect>
 			<MkSelect v-model="sort">
@@ -58,6 +58,7 @@ import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
 import FormSplit from '@/components/form/split.vue';
 import { i18n } from '@/i18n.js';
+import { $i } from '@/account.js';
 
 const host = ref('');
 const state = ref('federating');