diff --git a/public/translations/ar/default.json b/public/translations/ar/default.json index c303f9a9..d1efbc9c 100644 --- a/public/translations/ar/default.json +++ b/public/translations/ar/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "تم حذف هذه الرد من قبل مؤلفه", "this_reply_was_removed": "تمت إزالة هذه الرد من قبل مشرفي المنتدى", "not_mod_of_any_board": "أنت لست مشرفًا في أي لوحة.", - "filters_and_highlights": "الفلاتر والإبرازات" + "filters_and_highlights": "الفلاتر والإبرازات", + "search_results_for": "نتائج البحث عن" } \ No newline at end of file diff --git a/public/translations/bn/default.json b/public/translations/bn/default.json index db35d423..83602f2a 100644 --- a/public/translations/bn/default.json +++ b/public/translations/bn/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "এই প্রতিক্রিয়া তার লেখক দ্বারা মুছে ফেলা হয়েছে", "this_reply_was_removed": "এই প্রতিক্রিয়া বোর্ড পরিচালকদের দ্বারা সরানো হয়েছে", "not_mod_of_any_board": "আপনি কোনও বোর্ডের মড নন।", - "filters_and_highlights": "ফিল্টার এবং হাইলাইট" + "filters_and_highlights": "ফিল্টার এবং হাইলাইট", + "search_results_for": "অনুসন্ধান ফলাফল" } \ No newline at end of file diff --git a/public/translations/cs/default.json b/public/translations/cs/default.json index 8342b63c..513d6992 100644 --- a/public/translations/cs/default.json +++ b/public/translations/cs/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Tato odpověď byla smazána autorem", "this_reply_was_removed": "Tato odpověď byla odstraněna moderátory fóra", "not_mod_of_any_board": "Nejste moderátor žádné desky.", - "filters_and_highlights": "Filtry a zvýraznění" + "filters_and_highlights": "Filtry a zvýraznění", + "search_results_for": "Výsledky hledání pro" } \ No newline at end of file diff --git a/public/translations/da/default.json b/public/translations/da/default.json index 3011fcd0..3def0138 100644 --- a/public/translations/da/default.json +++ b/public/translations/da/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Dette svar blev slettet af forfatteren", "this_reply_was_removed": "Dette svar blev fjernet af forummoderatorer", "not_mod_of_any_board": "Du er ikke moderator for nogen tavler.", - "filters_and_highlights": "Filtre og fremhævninger" + "filters_and_highlights": "Filtre og fremhævninger", + "search_results_for": "Søgeresultater for" } \ No newline at end of file diff --git a/public/translations/de/default.json b/public/translations/de/default.json index aa677e1e..9750d5a4 100644 --- a/public/translations/de/default.json +++ b/public/translations/de/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Diese Antwort wurde vom Autor gelöscht", "this_reply_was_removed": "Diese Antwort wurde von den Forenmoderatoren entfernt", "not_mod_of_any_board": "Du bist kein Moderator eines Boards.", - "filters_and_highlights": "Filter & Highlights" + "filters_and_highlights": "Filter & Highlights", + "search_results_for": "Suchergebnisse für" } \ No newline at end of file diff --git a/public/translations/el/default.json b/public/translations/el/default.json index 7ba81d49..0a1c369c 100644 --- a/public/translations/el/default.json +++ b/public/translations/el/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Αυτή η απάντηση διαγράφηκε από τον συγγραφέα της", "this_reply_was_removed": "Η απάντηση αυτή αφαιρέθηκε από τους διαχειριστές του φόρουμ", "not_mod_of_any_board": "Δεν είστε διαχειριστής σε καμία κοινότητα.", - "filters_and_highlights": "Φίλτρα και επισημάνσεις" + "filters_and_highlights": "Φίλτρα και επισημάνσεις", + "search_results_for": "Αποτελέσματα αναζήτησης για" } \ No newline at end of file diff --git a/public/translations/en/default.json b/public/translations/en/default.json index 5e2b97ba..f17a13c5 100644 --- a/public/translations/en/default.json +++ b/public/translations/en/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "This reply was deleted by its author", "this_reply_was_removed": "This reply was removed by board moderators", "not_mod_of_any_board": "You are not a mod of any board.", - "filters_and_highlights": "Filters & Highlights" + "filters_and_highlights": "Filters & Highlights", + "search_results_for": "Search results for" } \ No newline at end of file diff --git a/public/translations/es/default.json b/public/translations/es/default.json index ac2e4202..ea303d00 100644 --- a/public/translations/es/default.json +++ b/public/translations/es/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Esta respuesta fue eliminada por su autor", "this_reply_was_removed": "Esta respuesta fue eliminada por los moderadores del foro", "not_mod_of_any_board": "No eres moderador de ningún tablero.", - "filters_and_highlights": "Filtros y resaltar" + "filters_and_highlights": "Filtros y resaltar", + "search_results_for": "Resultados de búsqueda para" } \ No newline at end of file diff --git a/public/translations/fa/default.json b/public/translations/fa/default.json index d49a7da3..fb331102 100644 --- a/public/translations/fa/default.json +++ b/public/translations/fa/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "این پاسخ توسط نویسنده‌اش حذف شد", "this_reply_was_removed": "این پاسخ توسط مدیران انجمن حذف شد", "not_mod_of_any_board": "شما هیچ تابلو مدیر نیستید.", - "filters_and_highlights": "فیلترها و هایلایت‌ها" + "filters_and_highlights": "فیلترها و هایلایت‌ها", + "search_results_for": "نتایج جستجو برای" } \ No newline at end of file diff --git a/public/translations/fi/default.json b/public/translations/fi/default.json index 529bcb6c..2e66654c 100644 --- a/public/translations/fi/default.json +++ b/public/translations/fi/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Tämä vastaus poistettiin sen kirjoittajalta", "this_reply_was_removed": "Tämä vastaus poistettiin foorumin moderaattoreiden toimesta", "not_mod_of_any_board": "Et ole moderaattori missään taulussa.", - "filters_and_highlights": "Suodattimet ja korostukset" + "filters_and_highlights": "Suodattimet ja korostukset", + "search_results_for": "Hakutulokset hakusanalle" } \ No newline at end of file diff --git a/public/translations/fil/default.json b/public/translations/fil/default.json index 2b38665d..d233af04 100644 --- a/public/translations/fil/default.json +++ b/public/translations/fil/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Ang tugon na ito ay tinanggal ng may-akda nito", "this_reply_was_removed": "Ang sagot na ito ay tinanggal ng mga moderator ng board", "not_mod_of_any_board": "Hindi ka mod ng anumang board.", - "filters_and_highlights": "Mga filter at highlight" + "filters_and_highlights": "Mga filter at highlight", + "search_results_for": "Mga resulta ng paghahanap para sa" } \ No newline at end of file diff --git a/public/translations/fr/default.json b/public/translations/fr/default.json index 2a823f4f..98b51f6a 100644 --- a/public/translations/fr/default.json +++ b/public/translations/fr/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Cette réponse a été supprimée par son auteur", "this_reply_was_removed": "Cette réponse a été supprimée par les modérateurs du forum", "not_mod_of_any_board": "Vous n'êtes pas modérateur de n'aucun forum.", - "filters_and_highlights": "Filtres et mises en évidence" + "filters_and_highlights": "Filtres et mises en évidence", + "search_results_for": "Résultats de recherche pour" } \ No newline at end of file diff --git a/public/translations/he/default.json b/public/translations/he/default.json index fd493968..337312cc 100644 --- a/public/translations/he/default.json +++ b/public/translations/he/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "תשובה זו נמחקה על ידי המחבר שלה", "this_reply_was_removed": "תשובה זו הוסרה על ידי מנהלי הפורום", "not_mod_of_any_board": "אתה לא מוד בכל לוח.", - "filters_and_highlights": "סינונים והדגשות" + "filters_and_highlights": "סינונים והדגשות", + "search_results_for": "תוצאות חיפוש עבור" } \ No newline at end of file diff --git a/public/translations/hi/default.json b/public/translations/hi/default.json index 2b659d1c..423665e1 100644 --- a/public/translations/hi/default.json +++ b/public/translations/hi/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "इस उत्तर को इसके लेखक द्वारा हटा दिया गया था", "this_reply_was_removed": "यह उत्तर बोर्ड मॉडरेटर द्वारा हटा दिया गया था", "not_mod_of_any_board": "आप किसी बोर्ड के मॉड नहीं हैं।", - "filters_and_highlights": "फ़िल्टर और हाइलाइट्स" + "filters_and_highlights": "फ़िल्टर और हाइलाइट्स", + "search_results_for": "के लिए खोज परिणाम" } \ No newline at end of file diff --git a/public/translations/hu/default.json b/public/translations/hu/default.json index 325ebb3d..76500163 100644 --- a/public/translations/hu/default.json +++ b/public/translations/hu/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Ez a válasz törölve lett a szerzője által", "this_reply_was_removed": "Ez a válasz törlésre került a fórum moderátorai által", "not_mod_of_any_board": "Nem vagy moderátor egyetlen táblán sem.", - "filters_and_highlights": "Szűrők és kiemelések" + "filters_and_highlights": "Szűrők és kiemelések", + "search_results_for": "Keresési eredmények" } \ No newline at end of file diff --git a/public/translations/id/default.json b/public/translations/id/default.json index 6e344b03..8e6ba818 100644 --- a/public/translations/id/default.json +++ b/public/translations/id/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Balasan ini dihapus oleh penulisnya", "this_reply_was_removed": "Balasan ini dihapus oleh moderator papan", "not_mod_of_any_board": "Anda bukan mod di papan manapun.", - "filters_and_highlights": "Filter dan Sorotan" + "filters_and_highlights": "Filter dan Sorotan", + "search_results_for": "Hasil pencarian untuk" } \ No newline at end of file diff --git a/public/translations/it/default.json b/public/translations/it/default.json index cf016b54..483ed455 100644 --- a/public/translations/it/default.json +++ b/public/translations/it/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Questa risposta è stata eliminata dal suo autore", "this_reply_was_removed": "Questa risposta è stata rimossa dai moderatori del forum", "not_mod_of_any_board": "Non sei un mod di nessuna board.", - "filters_and_highlights": "Filtri e Evidenziazioni" + "filters_and_highlights": "Filtri e Evidenziazioni", + "search_results_for": "Risultati di ricerca per" } \ No newline at end of file diff --git a/public/translations/ja/default.json b/public/translations/ja/default.json index eff04089..ecef105c 100644 --- a/public/translations/ja/default.json +++ b/public/translations/ja/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "この返信はその著者によって削除されました", "this_reply_was_removed": "この返信は掲示板のモデレーターによって削除されました", "not_mod_of_any_board": "あなたはどのボードのモデレーターでもありません。", - "filters_and_highlights": "フィルターとハイライト" + "filters_and_highlights": "フィルターとハイライト", + "search_results_for": "検索結果" } \ No newline at end of file diff --git a/public/translations/ko/default.json b/public/translations/ko/default.json index 8fcfdca8..12a791f3 100644 --- a/public/translations/ko/default.json +++ b/public/translations/ko/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "이 답글은 작성자에 의해 삭제되었습니다", "this_reply_was_removed": "이 답글은 게시판 관리자에 의해 삭제되었습니다", "not_mod_of_any_board": "당신은 어떤 게시판의 관리자도 아닙니다.", - "filters_and_highlights": "필터 및 하이라이트" + "filters_and_highlights": "필터 및 하이라이트", + "search_results_for": "검색 결과" } \ No newline at end of file diff --git a/public/translations/mr/default.json b/public/translations/mr/default.json index 4d5d1a05..d8c983cb 100644 --- a/public/translations/mr/default.json +++ b/public/translations/mr/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "हा प्रतिसाद त्याच्या लेखकाने हटवला आहे", "this_reply_was_removed": "या उत्तराला बोर्ड मॉडरेटरने काढले आहे", "not_mod_of_any_board": "तुम्ही कोणत्याही बोर्डचे मॉड नाहीत.", - "filters_and_highlights": "फिल्टर आणि हायलाइट्स" + "filters_and_highlights": "फिल्टर आणि हायलाइट्स", + "search_results_for": "सर्च परिणाम" } \ No newline at end of file diff --git a/public/translations/nl/default.json b/public/translations/nl/default.json index 66e004d0..933ff4e5 100644 --- a/public/translations/nl/default.json +++ b/public/translations/nl/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Dit antwoord werd verwijderd door de auteur", "this_reply_was_removed": "Dit antwoord is verwijderd door de forum moderators", "not_mod_of_any_board": "Je bent geen mod van een bord.", - "filters_and_highlights": "Filters en markeringen" + "filters_and_highlights": "Filters en markeringen", + "search_results_for": "Zoekresultaten voor" } \ No newline at end of file diff --git a/public/translations/no/default.json b/public/translations/no/default.json index 957e4e5e..d2ff1f21 100644 --- a/public/translations/no/default.json +++ b/public/translations/no/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Dette svaret ble slettet av forfatteren", "this_reply_was_removed": "Dette svaret ble fjernet av forummoderatorer", "not_mod_of_any_board": "Du er ikke moderator på noen brett.", - "filters_and_highlights": "Filtre og fremhevinger" + "filters_and_highlights": "Filtre og fremhevinger", + "search_results_for": "Søkeresultater for" } \ No newline at end of file diff --git a/public/translations/pl/default.json b/public/translations/pl/default.json index a282392e..e1299990 100644 --- a/public/translations/pl/default.json +++ b/public/translations/pl/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Ta odpowiedź została usunięta przez autora", "this_reply_was_removed": "Ta odpowiedź została usunięta przez moderatorów forum", "not_mod_of_any_board": "Nie jesteś moderatorem żadnej tablicy.", - "filters_and_highlights": "Filtry i wyróżnienia" + "filters_and_highlights": "Filtry i wyróżnienia", + "search_results_for": "Wyniki wyszukiwania dla" } \ No newline at end of file diff --git a/public/translations/pt/default.json b/public/translations/pt/default.json index 7227a583..36fed0ef 100644 --- a/public/translations/pt/default.json +++ b/public/translations/pt/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Esta resposta foi excluída pelo autor", "this_reply_was_removed": "Esta resposta foi removida pelos moderadores do fórum", "not_mod_of_any_board": "Você não é um moderador de nenhum quadro.", - "filters_and_highlights": "Filtros e Destaques" + "filters_and_highlights": "Filtros e Destaques", + "search_results_for": "Resultados de pesquisa para" } \ No newline at end of file diff --git a/public/translations/ro/default.json b/public/translations/ro/default.json index bb3afd18..70bd1821 100644 --- a/public/translations/ro/default.json +++ b/public/translations/ro/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Acest răspuns a fost șters de autorul său", "this_reply_was_removed": "Acest răspuns a fost eliminat de moderatorii forumului", "not_mod_of_any_board": "Nu ești moderator pe niciun tablou.", - "filters_and_highlights": "Filtre și evidențiere" + "filters_and_highlights": "Filtre și evidențiere", + "search_results_for": "Rezultatele căutării pentru" } \ No newline at end of file diff --git a/public/translations/ru/default.json b/public/translations/ru/default.json index 1845e5e9..950de4d8 100644 --- a/public/translations/ru/default.json +++ b/public/translations/ru/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Этот ответ был удален автором", "this_reply_was_removed": "Этот ответ был удален модераторами форума", "not_mod_of_any_board": "Вы не модератор ни одной доски.", - "filters_and_highlights": "Фильтры и выделения" + "filters_and_highlights": "Фильтры и выделения", + "search_results_for": "Результаты поиска для" } \ No newline at end of file diff --git a/public/translations/sq/default.json b/public/translations/sq/default.json index 30c031a8..6752e2b9 100644 --- a/public/translations/sq/default.json +++ b/public/translations/sq/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Ky përgjigje u fshi nga autori i saj", "this_reply_was_removed": "Ky përgjigje u hoq nga moderatorët e forumit", "not_mod_of_any_board": "Nuk jeni mod në asnjë bord.", - "filters_and_highlights": "Filtra dhe theksime" + "filters_and_highlights": "Filtra dhe theksime", + "search_results_for": "Rezultatet e kërkimit për" } \ No newline at end of file diff --git a/public/translations/sv/default.json b/public/translations/sv/default.json index c3220d2c..0c3bccb3 100644 --- a/public/translations/sv/default.json +++ b/public/translations/sv/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Detta svar togs bort av författaren", "this_reply_was_removed": "Detta svar togs bort av forumets moderatorer", "not_mod_of_any_board": "Du är inte moderator på någon tavla.", - "filters_and_highlights": "Filter och markeringar" + "filters_and_highlights": "Filter och markeringar", + "search_results_for": "Sökresultat för" } \ No newline at end of file diff --git a/public/translations/te/default.json b/public/translations/te/default.json index 77071d70..b0aec7b8 100644 --- a/public/translations/te/default.json +++ b/public/translations/te/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "ఈ స్పందనను దాని రచయిత తొలగించారు", "this_reply_was_removed": "ఈ స్పందన బోర్డ్ మోడరేటర్లచే తొలగించబడింది", "not_mod_of_any_board": "మీరు ఎటువంటి బోర్డుకు మోడ్ కంటే లేరు.", - "filters_and_highlights": "ఫిల్టర్లు మరియు హైలైట్‌లు" + "filters_and_highlights": "ఫిల్టర్లు మరియు హైలైట్‌లు", + "search_results_for": "శోధన ఫలితాలు" } \ No newline at end of file diff --git a/public/translations/th/default.json b/public/translations/th/default.json index 424791e3..92adbe11 100644 --- a/public/translations/th/default.json +++ b/public/translations/th/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "การตอบกลับนี้ถูกลบโดยผู้แต่ง", "this_reply_was_removed": "คำตอบนี้ถูกลบโดยผู้ดูแลบอร์ด", "not_mod_of_any_board": "คุณไม่ใช่ผู้ดูแลบอร์ดใดๆ", - "filters_and_highlights": "ตัวกรองและไฮไลท์" + "filters_and_highlights": "ตัวกรองและไฮไลท์", + "search_results_for": "ผลการค้นหาสำหรับ" } \ No newline at end of file diff --git a/public/translations/tr/default.json b/public/translations/tr/default.json index be858ec5..1f74ba69 100644 --- a/public/translations/tr/default.json +++ b/public/translations/tr/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Bu yanıt, yazar tarafından silindi", "this_reply_was_removed": "Bu yanıt, forum moderatörleri tarafından kaldırıldı", "not_mod_of_any_board": "Hiçbir tahtanın moderatörü değilsiniz.", - "filters_and_highlights": "Filtreler ve Vurgular" + "filters_and_highlights": "Filtreler ve Vurgular", + "search_results_for": "Arama sonuçları için" } \ No newline at end of file diff --git a/public/translations/uk/default.json b/public/translations/uk/default.json index d4521437..2414bdee 100644 --- a/public/translations/uk/default.json +++ b/public/translations/uk/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Цю відповідь було видалено її автором", "this_reply_was_removed": "Цю відповідь було видалено модераторами форуму", "not_mod_of_any_board": "Ви не модератор жодної дошки.", - "filters_and_highlights": "Фільтри та виділення" + "filters_and_highlights": "Фільтри та виділення", + "search_results_for": "Результати пошуку для" } \ No newline at end of file diff --git a/public/translations/ur/default.json b/public/translations/ur/default.json index 2100d08a..93e8c58d 100644 --- a/public/translations/ur/default.json +++ b/public/translations/ur/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "اس جواب کو اس کے مصنف نے حذف کر دیا تھا", "this_reply_was_removed": "اس جواب کو بورڈ کے منتظمین نے حذف کر دیا ہے", "not_mod_of_any_board": "آپ کسی بورڈ کے موڈ نہیں ہیں۔", - "filters_and_highlights": "فلٹرز اور ہائیلائٹس" + "filters_and_highlights": "فلٹرز اور ہائیلائٹس", + "search_results_for": "تلاش کے نتائج" } \ No newline at end of file diff --git a/public/translations/vi/default.json b/public/translations/vi/default.json index acd7aed7..010e1085 100644 --- a/public/translations/vi/default.json +++ b/public/translations/vi/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "Câu trả lời này đã bị tác giả của nó xóa", "this_reply_was_removed": "Phản hồi này đã bị xóa bởi các quản trị viên diễn đàn", "not_mod_of_any_board": "Bạn không phải là quản trị viên của bất kỳ bảng nào.", - "filters_and_highlights": "Bộ lọc và Nổi bật" + "filters_and_highlights": "Bộ lọc và Nổi bật", + "search_results_for": "Kết quả tìm kiếm cho" } \ No newline at end of file diff --git a/public/translations/zh/default.json b/public/translations/zh/default.json index ead5e850..22bd4a80 100644 --- a/public/translations/zh/default.json +++ b/public/translations/zh/default.json @@ -292,5 +292,6 @@ "this_reply_was_deleted": "该回复已被其作者删除", "this_reply_was_removed": "该回复已被版主删除", "not_mod_of_any_board": "您不是任何板块的管理员。", - "filters_and_highlights": "筛选器和高亮" + "filters_and_highlights": "筛选器和高亮", + "search_results_for": "搜索结果" } \ No newline at end of file diff --git a/src/components/board-buttons/board-buttons.tsx b/src/components/board-buttons/board-buttons.tsx index 320a414c..61ce220c 100644 --- a/src/components/board-buttons/board-buttons.tsx +++ b/src/components/board-buttons/board-buttons.tsx @@ -246,7 +246,7 @@ export const MobileBoardButtons = () => { const accountComment = useAccountComment({ commentIndex: params?.accountCommentIndex as any }); const subplebbitAddress = params?.subplebbitAddress || accountComment?.subplebbitAddress; - const { filteredCount } = useCatalogFiltersStore(); + const { filteredCount, searchText } = useCatalogFiltersStore(); return (
@@ -269,11 +269,19 @@ export const MobileBoardButtons = () => { )} {!(isInAllView || isInSubscriptionsView) && } - {isInCatalogView && filteredCount > 0 && ( + {isInCatalogView && searchText ? ( {' '} - — {t('filtered_threads')}: {filteredCount} + — {t('search_results_for')}: {searchText} + ) : ( + isInCatalogView && + filteredCount > 0 && ( + + {' '} + — {t('filtered_threads')}: {filteredCount} + + ) )} {isInCatalogView && ( <> @@ -331,7 +339,7 @@ export const DesktopBoardButtons = () => { const isInPostView = isPostPageView(location.pathname, params); const isInSubscriptionsView = isSubscriptionsView(location.pathname, useParams()); - const { filteredCount } = useCatalogFiltersStore(); + const { filteredCount, searchText } = useCatalogFiltersStore(); return ( <> @@ -364,11 +372,19 @@ export const DesktopBoardButtons = () => { )} [] - {isInCatalogView && filteredCount > 0 && ( + {isInCatalogView && searchText ? ( {' '} - — {t('filtered_threads')}: {filteredCount} + — {t('search_results_for')}: {searchText} + ) : ( + isInCatalogView && + filteredCount > 0 && ( + + {' '} + — {t('filtered_threads')}: {filteredCount} + + ) )} {isInCatalogView && ( diff --git a/src/components/catalog-search/catalog-search.tsx b/src/components/catalog-search/catalog-search.tsx index 7c723dfe..1c25c08b 100644 --- a/src/components/catalog-search/catalog-search.tsx +++ b/src/components/catalog-search/catalog-search.tsx @@ -1,11 +1,43 @@ -import { useEffect, useState } from 'react'; +import { useEffect, useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import styles from './catalog-search.module.css'; import useIsMobile from '../../hooks/use-is-mobile'; +import useCatalogFiltersStore from '../../stores/use-catalog-filters-store'; +import _ from 'lodash'; const CatalogSearch = () => { const { t } = useTranslation(); const [openSearch, setOpenSearch] = useState(false); + const [inputValue, setInputValue] = useState(''); + const { setSearchFilter, clearSearchFilter } = useCatalogFiltersStore(); + + // Create a debounced version of setSearchFilter + // eslint-disable-next-line react-hooks/exhaustive-deps + const debouncedSetSearchFilter = useCallback( + _.debounce((text: string) => { + if (text.trim()) { + setSearchFilter(text); + } else { + clearSearchFilter(); + } + }, 300), + [setSearchFilter, clearSearchFilter], + ); + + const handleToggleSearch = useCallback(() => { + setOpenSearch((prev) => !prev); + + if (openSearch) { + setInputValue(''); + clearSearchFilter(); + } + }, [openSearch, clearSearchFilter]); + + const handleCloseSearch = useCallback(() => { + setOpenSearch(false); + setInputValue(''); + clearSearchFilter(); + }, [clearSearchFilter]); useEffect(() => { if (openSearch) { @@ -14,26 +46,42 @@ const CatalogSearch = () => { const handleKeyDown = (event: KeyboardEvent) => { if (event.key === 'Escape') { - setOpenSearch(false); + handleCloseSearch(); } }; window.addEventListener('keydown', handleKeyDown); + + return () => { + window.removeEventListener('keydown', handleKeyDown); + }; } - }, [openSearch]); + }, [openSearch, handleCloseSearch]); + + useEffect(() => { + debouncedSetSearchFilter(inputValue); + + return () => { + debouncedSetSearchFilter.cancel(); + }; + }, [inputValue, debouncedSetSearchFilter]); + + const handleSearchChange = (e: React.ChangeEvent) => { + setInputValue(e.target.value); + }; const isMobile = useIsMobile(); return ( <> {!isMobile && '['} - setOpenSearch(!openSearch)}> + {t('search')} {!isMobile && ']'} {openSearch && (
- - setOpenSearch(false)}> + + ✖
diff --git a/src/hooks/use-catalog-feed-rows.ts b/src/hooks/use-catalog-feed-rows.ts index bb995bbc..6ab2b373 100644 --- a/src/hooks/use-catalog-feed-rows.ts +++ b/src/hooks/use-catalog-feed-rows.ts @@ -7,6 +7,7 @@ import { getCommentMediaInfo, getHasThumbnail } from '../lib/utils/media-utils'; import { isAllView } from '../lib/utils/view-utils'; import { useMultisubMetadata } from './use-default-subplebbits'; import _ from 'lodash'; +import useCatalogFiltersStore from '../stores/use-catalog-filters-store'; const useCatalogFeedRows = (columnCount: number, feed: any, isFeedLoaded: boolean, subplebbit: Subplebbit) => { const { t } = useTranslation(); @@ -19,6 +20,7 @@ const useCatalogFeedRows = (columnCount: number, feed: any, isFeedLoaded: boolea const multisub = useMultisubMetadata(); const { accountComments } = useAccountComments(); + const { searchText } = useCatalogFiltersStore(); const feedWithFakePostsOnTop = useMemo(() => { if (!isFeedLoaded) { @@ -64,7 +66,7 @@ const useCatalogFeedRows = (columnCount: number, feed: any, isFeedLoaded: boolea } // add subplebbit description and rules as fake posts at the top of the feed - if (description && description.length > 0) { + if (description && description.length > 0 && !searchText) { _feed.unshift({ isDescription: true, subplebbitAddress: address, @@ -79,7 +81,7 @@ const useCatalogFeedRows = (columnCount: number, feed: any, isFeedLoaded: boolea } // rules are shown in description thread if both are set - if (rules && rules.length > 0 && !description) { + if (rules && rules.length > 0 && !description && !searchText) { _feed.unshift({ isRules: true, subplebbitAddress: address, diff --git a/src/stores/use-catalog-filters-store.ts b/src/stores/use-catalog-filters-store.ts index 1b7d9728..edb50748 100644 --- a/src/stores/use-catalog-filters-store.ts +++ b/src/stores/use-catalog-filters-store.ts @@ -31,6 +31,9 @@ interface CatalogFiltersStore { currentSubplebbitAddress: string | null; setCurrentSubplebbitAddress: (address: string | null) => void; getFilteredCountForCurrentSubplebbit: () => number; + searchText: string; + setSearchFilter: (text: string) => void; + clearSearchFilter: () => void; } const useCatalogFiltersStore = create( @@ -48,6 +51,15 @@ const useCatalogFiltersStore = create( filteredCids: new Set(), currentSubplebbitAddress: null, setCurrentSubplebbitAddress: (address: string | null) => set({ currentSubplebbitAddress: address }), + searchText: '', + setSearchFilter: (text: string) => { + set({ searchText: text }); + get().updateFilter(); + }, + clearSearchFilter: () => { + set({ searchText: '' }); + get().updateFilter(); + }, setFilterItems: (items: FilterItem[]) => { const nonEmptyItems = items .filter((item) => item.text.trim() !== '') @@ -87,6 +99,17 @@ const useCatalogFiltersStore = create( set((state) => ({ filter: (comment: Comment) => { if (!comment?.cid) return true; + + if (state.searchText.trim() !== '') { + const searchPattern = state.searchText.toLowerCase(); + const title = comment?.title?.toLowerCase() || ''; + const content = comment?.content?.toLowerCase() || ''; + + if (!title.includes(searchPattern) && !content.includes(searchPattern)) { + return false; + } + } + const { filterItems } = state; let shouldHide = false; for (let i = 0; i < filterItems.length; i++) { diff --git a/src/views/catalog/catalog.tsx b/src/views/catalog/catalog.tsx index 64b60d83..a0c5bb9a 100644 --- a/src/views/catalog/catalog.tsx +++ b/src/views/catalog/catalog.tsx @@ -92,19 +92,35 @@ const createImageFilter = (showTextOnlyThreads: boolean) => { const createCombinedFilter = ( showTextOnlyThreads: boolean, filterItems: { text: string; enabled: boolean; count: number; filteredCids: Set; hide: boolean; top: boolean }[], + searchText: string, subplebbitAddress: string, onFilterMatch?: (filterIndex: number, cid: string, subplebbitAddress: string) => void, ) => { const imageFilter = createImageFilter(showTextOnlyThreads); const contentFilter = createContentFilter(filterItems, subplebbitAddress, onFilterMatch); + const searchFilter = { + filter: (comment: Comment) => { + if (!searchText.trim()) return true; + + const titleLower = comment?.title?.toLowerCase() || ''; + const contentLower = comment?.content?.toLowerCase() || ''; + const searchPattern = searchText.toLowerCase(); + + return titleLower.includes(searchPattern) || contentLower.includes(searchPattern); + }, + key: searchText ? `search-filter-${searchText}` : 'no-search-filter', + }; + return { filter: (comment: Comment) => { if (!imageFilter.filter(comment)) return false; + if (!contentFilter.filter(comment)) return false; + if (!searchFilter.filter(comment)) return false; - return contentFilter.filter(comment); + return true; }, - key: `${imageFilter.key}-${contentFilter.key}`, + key: `${imageFilter.key}-${contentFilter.key}-${searchFilter.key}`, }; }; @@ -116,7 +132,7 @@ const Catalog = () => { const isInAllView = isAllView(location.pathname); const defaultSubplebbits = useDefaultSubplebbits(); const { hideAdultBoards, hideGoreBoards } = useInterfaceSettingsStore(); - const { showTextOnlyThreads, filterItems } = useCatalogFiltersStore(); + const { showTextOnlyThreads, filterItems, searchText } = useCatalogFiltersStore(); const account = useAccount(); const subscriptions = account?.subscriptions; @@ -172,7 +188,7 @@ const Catalog = () => { subplebbitAddresses, sortType, postsPerPage: isInAllView || isInSubscriptionsView ? 10 : postsPerPage, - filter: createCombinedFilter(showTextOnlyThreads, filterItems, subplebbitAddress || 'all', handleFilterMatch), + filter: createCombinedFilter(showTextOnlyThreads, filterItems, searchText, subplebbitAddress || 'all', handleFilterMatch), }; if (isInAllView || isInSubscriptionsView) { @@ -189,6 +205,7 @@ const Catalog = () => { timeFilterSeconds, showTextOnlyThreads, filterItems, + searchText, subplebbitAddress, handleFilterMatch, ]); @@ -203,7 +220,9 @@ const Catalog = () => { () => accountComments.filter((comment) => { const { cid, deleted, link, linkHeight, linkWidth, postCid, removed, state, thumbnailUrl, timestamp } = comment || {}; - return ( + + // Basic filtering conditions + const basicConditions = !deleted && !removed && timestamp > Date.now() / 1000 - 60 * 60 && @@ -212,10 +231,20 @@ const Catalog = () => { (showTextOnlyThreads ? getHasThumbnail(getCommentMediaInfo(link, thumbnailUrl, linkWidth, linkHeight), comment?.link) : true) && cid === postCid && comment?.subplebbitAddress === subplebbitAddress && - !feed.some((post) => post.cid === cid) - ); + !feed.some((post) => post.cid === cid); + + // If search is active, also check search conditions + if (basicConditions && searchText.trim()) { + const titleLower = comment?.title?.toLowerCase() || ''; + const contentLower = comment?.content?.toLowerCase() || ''; + const searchPattern = searchText.toLowerCase(); + + return titleLower.includes(searchPattern) || contentLower.includes(searchPattern); + } + + return basicConditions; }), - [accountComments, subplebbitAddress, feed, showTextOnlyThreads], + [accountComments, subplebbitAddress, feed, showTextOnlyThreads, searchText], ); // show newest account comment at the top of the feed but after pinned posts @@ -247,14 +276,14 @@ const Catalog = () => { subplebbitAddresses, sortType, newerThan: 60 * 60 * 24 * 7, - filter: createCombinedFilter(showTextOnlyThreads, filterItems, subplebbitAddress || 'all', handleFilterMatch), + filter: createCombinedFilter(showTextOnlyThreads, filterItems, searchText, subplebbitAddress || 'all', handleFilterMatch), }); const { feed: monthlyFeed } = useFeed({ subplebbitAddresses, sortType, newerThan: 60 * 60 * 24 * 30, - filter: createCombinedFilter(showTextOnlyThreads, filterItems, subplebbitAddress || 'all', handleFilterMatch), + filter: createCombinedFilter(showTextOnlyThreads, filterItems, searchText, subplebbitAddress || 'all', handleFilterMatch), }); const [showMorePostsSuggestion, setShowMorePostsSuggestion] = useState(false); diff --git a/src/views/post/post.module.css b/src/views/post/post.module.css index 0bc3987c..19ca4464 100644 --- a/src/views/post/post.module.css +++ b/src/views/post/post.module.css @@ -562,7 +562,7 @@ width: 24px; max-height: 24px; position: absolute; - bottom: -5px; + bottom: -7px; } @media (max-width: 640px) {