From f76a22c3faac526f24d131afaf044c7aa68e7eb2 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 12 Sep 2023 15:12:34 +0800
Subject: [PATCH] Better handling of subscription type searches

---
 .../templates/homeFeed/LibraryFilterMenu.tsx  | 29 ++++++++++++++-----
 .../templates/homeFeed/LibraryHeader.tsx      |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx b/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
index 6ab19f3eb..71a6c0c4c 100644
--- a/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
+++ b/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
@@ -5,6 +5,7 @@ import { Button } from '../../elements/Button'
 import { Circle } from 'phosphor-react'
 import {
   Subscription,
+  SubscriptionType,
   useGetSubscriptionsQuery,
 } from '../../../lib/networking/queries/useGetSubscriptionsQuery'
 import { useGetLabelsQuery } from '../../../lib/networking/queries/useGetLabelsQuery'
@@ -200,14 +201,26 @@ function Subscriptions(
             {...props}
           />
           {(props.subscriptions ?? []).map((item) => {
-            return (
-              <FilterButton
-                key={item.id}
-                filterTerm={`subscription:\"${item.name}\"`}
-                text={item.name}
-                {...props}
-              />
-            )
+            switch (item.type) {
+              case SubscriptionType.NEWSLETTER:
+                return (
+                  <FilterButton
+                    key={item.id}
+                    filterTerm={`in:inbox subscription:\"${item.name}\"`}
+                    text={item.name}
+                    {...props}
+                  />
+                )
+              case SubscriptionType.RSS:
+                return (
+                  <FilterButton
+                    key={item.id}
+                    filterTerm={`in:inbox rss:\"${item.url}\"`}
+                    text={item.name}
+                    {...props}
+                  />
+                )
+            }
           })}
           <EditButton
             title="Edit Subscriptions"
diff --git a/packages/web/components/templates/homeFeed/LibraryHeader.tsx b/packages/web/components/templates/homeFeed/LibraryHeader.tsx
index 2a32acee4..d720822c0 100644
--- a/packages/web/components/templates/homeFeed/LibraryHeader.tsx
+++ b/packages/web/components/templates/homeFeed/LibraryHeader.tsx
@@ -237,7 +237,7 @@ export function SearchBox(props: SearchBoxProps): JSX.Element {
   const [searchTerm, setSearchTerm] = useState(props.searchTerm ?? '')
   const [isAddAction, setIsAddAction] = useState(false)
   const IS_URL_REGEX =
-    /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/
+    /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/
 
   useEffect(() => {
     setSearchTerm(props.searchTerm ?? '')