From 7f07aedb8a8fdc892b5512f7a14622d7ab25eb66 Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Wed, 1 Apr 2026 15:39:40 -0700
Subject: [PATCH] Make repeaters blockable, and hide from the sidebar

---
 frontend/src/App.tsx                        |  2 +
 frontend/src/components/ContactInfoPane.tsx |  4 +-
 frontend/src/components/Sidebar.tsx         | 47 ++++++++++++++-------
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 47b5f09..84ac2ec 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -471,6 +471,8 @@ export function App() {
     favorites,
     legacySortOrder: appSettings?.sidebar_sort_order,
     isConversationNotificationsEnabled,
+    blockedKeys: appSettings?.blocked_keys ?? [],
+    blockedNames: appSettings?.blocked_names ?? [],
   };
   const conversationPaneProps = {
     activeConversation,
diff --git a/frontend/src/components/ContactInfoPane.tsx b/frontend/src/components/ContactInfoPane.tsx
index 8e5e1e1..2197031 100644
--- a/frontend/src/components/ContactInfoPane.tsx
+++ b/frontend/src/components/ContactInfoPane.tsx
@@ -398,8 +398,8 @@ export function ContactInfoPane({
               </button>
             </div>
 
-            {/* Block toggles (not applicable to repeaters) */}
-            {!isRepeater && (onToggleBlockedKey || onToggleBlockedName) && (
+            {/* Block toggles */}
+            {(onToggleBlockedKey || onToggleBlockedName) && (
               <div className="px-5 py-3 border-b border-border space-y-2">
                 {onToggleBlockedKey && (
                   <button
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index 6ba6e60..52710ac 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -110,6 +110,8 @@ interface SidebarProps {
   /** Legacy global sort order, used only to seed per-section local preferences. */
   legacySortOrder?: SortOrder;
   isConversationNotificationsEnabled?: (type: 'channel' | 'contact', id: string) => boolean;
+  blockedKeys?: string[];
+  blockedNames?: string[];
 }
 
 type InitialSectionSortState = {
@@ -153,7 +155,16 @@ export function Sidebar({
   favorites,
   legacySortOrder,
   isConversationNotificationsEnabled,
+  blockedKeys = [],
+  blockedNames = [],
 }: SidebarProps) {
+  const isContactBlocked = useCallback(
+    (c: Contact) =>
+      blockedKeys.includes(c.public_key.toLowerCase()) ||
+      (c.name != null && blockedNames.includes(c.name)),
+    [blockedKeys, blockedNames]
+  );
+
   const [searchQuery, setSearchQuery] = useState('');
   const initialSectionSortState = useMemo(loadInitialSectionSortOrders, []);
   const [sectionSortOrders, setSectionSortOrders] = useState(initialSectionSortState.orders);
@@ -399,36 +410,42 @@ export function Sidebar({
   );
 
   const filteredNonRepeaterContacts = useMemo(
-    () =>
-      query
-        ? sortedNonRepeaterContacts.filter(
+    () => {
+      const visible = sortedNonRepeaterContacts.filter((c) => !isContactBlocked(c));
+      return query
+        ? visible.filter(
             (c) =>
               c.name?.toLowerCase().includes(query) || c.public_key.toLowerCase().includes(query)
           )
-        : sortedNonRepeaterContacts,
-    [sortedNonRepeaterContacts, query]
+        : visible;
+    },
+    [sortedNonRepeaterContacts, query, isContactBlocked]
   );
 
   const filteredRooms = useMemo(
-    () =>
-      query
-        ? sortedRooms.filter(
+    () => {
+      const visible = sortedRooms.filter((c) => !isContactBlocked(c));
+      return query
+        ? visible.filter(
             (c) =>
               c.name?.toLowerCase().includes(query) || c.public_key.toLowerCase().includes(query)
           )
-        : sortedRooms,
-    [sortedRooms, query]
+        : visible;
+    },
+    [sortedRooms, query, isContactBlocked]
   );
 
   const filteredRepeaters = useMemo(
-    () =>
-      query
-        ? sortedRepeaters.filter(
+    () => {
+      const visible = sortedRepeaters.filter((c) => !isContactBlocked(c));
+      return query
+        ? visible.filter(
             (c) =>
               c.name?.toLowerCase().includes(query) || c.public_key.toLowerCase().includes(query)
           )
-        : sortedRepeaters,
-    [sortedRepeaters, query]
+        : visible;
+    },
+    [sortedRepeaters, query, isContactBlocked]
   );
 
   // Expand sections while searching; restore prior collapse state when search ends.