From 2a05512a9c2ab0e485f4bf50141eab2b6ccae22c Mon Sep 17 00:00:00 2001 From: Alessio Date: Mon, 2 Dec 2024 20:31:41 -0800 Subject: [PATCH] Don't send empty search queries from search bar --- internal/webserver/handler_search_test.go | 4 ++-- internal/webserver/tpl/includes/base.tpl | 20 ++++++++++++++++++- .../webserver/tpl/includes/nav_sidebar.tpl | 2 +- internal/webserver/tpl/list_of_lists.tpl | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/internal/webserver/handler_search_test.go b/internal/webserver/handler_search_test.go index 0f2c356..2bcae20 100644 --- a/internal/webserver/handler_search_test.go +++ b/internal/webserver/handler_search_test.go @@ -34,7 +34,7 @@ func TestSearch(t *testing.T) { require.NoError(err) title_node := cascadia.Query(root, selector("title")) assert.Equal(title_node.FirstChild.Data, "Search | Offline Twitter") - assert.Contains(cascadia.Query(root, selector("#search-bar")).Attr, html.Attribute{Key: "value", Val: search_txt}) + assert.Contains(cascadia.Query(root, selector("#searchBar")).Attr, html.Attribute{Key: "value", Val: search_txt}) tweet_nodes := cascadia.QueryAll(root, selector(".timeline > .tweet")) assert.Len(tweet_nodes, 1) @@ -101,7 +101,7 @@ func TestSearchUsers(t *testing.T) { require.NoError(err) user_elements := cascadia.QueryAll(root, selector(".users-list .user")) assert.Len(user_elements, 2) - assert.Contains(cascadia.Query(root, selector("#search-bar")).Attr, html.Attribute{Key: "value", Val: "no"}) + assert.Contains(cascadia.Query(root, selector("#searchBar")).Attr, html.Attribute{Key: "value", Val: "no"}) } // Search bar pasted link redirects diff --git a/internal/webserver/tpl/includes/base.tpl b/internal/webserver/tpl/includes/base.tpl index 3f0c50d..07eabe9 100644 --- a/internal/webserver/tpl/includes/base.tpl +++ b/internal/webserver/tpl/includes/base.tpl @@ -21,6 +21,23 @@ }); } + +
@@ -28,10 +45,11 @@
-
diff --git a/internal/webserver/tpl/includes/nav_sidebar.tpl b/internal/webserver/tpl/includes/nav_sidebar.tpl index 526a1c6..573ed75 100644 --- a/internal/webserver/tpl/includes/nav_sidebar.tpl +++ b/internal/webserver/tpl/includes/nav_sidebar.tpl @@ -13,7 +13,7 @@ - +
  • diff --git a/internal/webserver/tpl/list_of_lists.tpl b/internal/webserver/tpl/list_of_lists.tpl index 16c24a5..fecb242 100644 --- a/internal/webserver/tpl/list_of_lists.tpl +++ b/internal/webserver/tpl/list_of_lists.tpl @@ -11,7 +11,7 @@ - +