From 973b1837a6a02cee5cda90bddb4cdca5e52e540c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 May 2023 22:52:14 -0700
Subject: [PATCH] fix: show follow requests even if not locked

---
 locales/en-US.yml                             | 1 +
 packages/client/src/navbar.ts                 | 2 +-
 packages/client/src/pages/follow-requests.vue | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index ec24104b0c..b3944b1e57 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1088,6 +1088,7 @@ preventAiLearning: "Prevent AI bot scraping"
 preventAiLearningDescription: "Request third-party AI language models not to study\
   \ content you upload, such as posts and images."
 noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes with Calckey."
+silencedWarning: "This page is showing because these usera are from servers your admin silenced, so they may potentially be spam."
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing\
diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts
index 074e8896c1..3dd71a5557 100644
--- a/packages/client/src/navbar.ts
+++ b/packages/client/src/navbar.ts
@@ -34,7 +34,7 @@ export const navbarItemDef = reactive({
 	followRequests: {
 		title: "followRequests",
 		icon: "ph-hand-waving ph-bold ph-lg",
-		show: computed(() => $i?.isLocked),
+		show: computed(() => $i?.isLocked || $i?.hasPendingReceivedFollowRequest),
 		indicated: computed(() => $i?.hasPendingReceivedFollowRequest),
 		to: "/my/follow-requests",
 	},
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index 35279495be..18f797eb52 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -7,12 +7,19 @@
 					<div class="_fullinfo">
 						<img
 							src="/static-assets/badges/info.png"
+							aria-label="none"
 							class="_ghost"
 						/>
 						<div>{{ i18n.ts.noFollowRequests }}</div>
 					</div>
 				</template>
 				<template #default="{ items }">
+					<MkInfo
+						v-if="$i?.isLocked === false"
+						warn
+						class="info"
+						>{{ i18n.ts.silencedWarning }}
+					</MkInfo>
 					<div class="mk-follow-requests">
 						<div
 							v-for="req in items"
@@ -82,6 +89,7 @@ import { userPage, acct } from "@/filters/user";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import { $i } from "@/account";
 
 const paginationComponent = ref<InstanceType<typeof MkPagination>>();