From b8178b650c781d8a4450c88564ef6e0164660e6a Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 18:15:36 +0700
Subject: [PATCH 01/10] fix: make community search page retain fields

Make community search page retain `topic_id`, `language_id`, and `search`

Refs: #362
---
 app/templates/list_communities.html | 60 +++++++++++++++++++----------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 98416594..edf0675a 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -27,27 +27,45 @@
         </div>
     </div>
     <div class="col-auto">
-        {% if topics -%}
-                <form method="get" style="display:inline;">Topic:
-                    <select name="topic_id" class="form-control-sm submit_on_change" aria-label="{{ _('Choose a topic to filter communities by') }}">
-                        <option value="0">All</option>
-                        {% for topic in topics -%}
-                            <option value="{{ topic.id }}" {{ 'selected' if topic.id == topic_id }}>{{ topic.name }}</option>
-                        {% endfor -%}
-                    </select>
-                </form>
-        {% endif -%}
-        {% if languages -%}
-                <form method="get" style="display:inline;">Language:
-                    <select name="language_id" class="form-control-sm submit_on_change" aria-label="{{ _('Choose a language to filter communities by') }}">
-                        <option value="0">All</option>
-                        {% for language in languages -%}
-                            <option value="{{ language.id }}" {{ 'selected' if language.id == language_id }}>{{ language.name }}</option>
-                        {% endfor -%}
-                    </select>
-                </form>
-        {% endif -%}
-        <form method="get" style="display:inline;"><input type="search" name="search" placeholder="{{ _('Search') }}" value="{{ search }}"></form>
+      <form action="/communities"
+        method="get"
+        hx-boost="true"
+        hx-trigger="change[event.target.matches('select[name=topic_id] select[name=language_id]')]">
+          {% if topics -%}
+              <div style="display:inline;">
+                  Topic:
+                  <select name="topic_id"
+                          class="form-control-sm"
+                          aria-label="{{ _('Choose a topic to filter communities by') }}">
+                      <option value="0">All</option>
+                      {% for topic in topics -%}
+                          <option value="{{ topic.id }}" {{ 'selected' if topic.id == topic_id }}>{{ topic.name }}
+                          </option>
+                      {% endfor -%}
+                  </select>
+              </div>
+          {% endif -%}
+          {% if languages -%}
+              <div style="display:inline;">
+                  Language:
+                  <select name="language_id"
+                          class="form-control-sm"
+                          aria-label="{{ _('Choose a language to filter communities by') }}">
+                      <option value="0">All</option>
+                      {% for language in languages -%}
+                          <option value="{{ language.id }}" {{ 'selected' if language.id == language_id }}>{{ language.name }}
+                          </option>
+                      {% endfor -%}
+                  </select>
+              </div>
+          {% endif -%}
+          <div style="display:inline;">
+              <input type="search"
+                     name="search"
+                     placeholder="{{ _('Search') }}"
+                     value="{{ search }}">
+          </div>
+      </form>
     </div>
     <div class="col-auto">
         <div class="btn-group">

From 3e91ee34f791c3973b735aa8913def73b1e3dee6 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 19:58:37 +0700
Subject: [PATCH 02/10] feat: make community search community name sort

Refs: #362
---
 app/templates/list_communities.html | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index edf0675a..8f2b50f5 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -85,9 +85,18 @@
                 <tr>
                     <th> </th>
                     <th {% if not low_bandwidth -%}colspan="2"{% endif -%} scope="col">
-                        <a href="?sort_by=title{{ ' asc' if sort_by == 'title desc' else ' desc' }}" title="{{ _('Sort by name') }}" rel="nofollow">{{ _('Community') }}
+                        <button 
+                            hx-get="/communities"
+                            hx-vals='{"sort_by": "title{{ ' asc' if sort_by == 'title desc' else ' desc' }}"}'
+                            hx-include="form[action='/communities']"
+                            hx-target="body"
+                            hx-push-url="true"
+                            title="{{ _('Sort by name') }}"
+                            class="btn"
+                        >
+                            {{ _('Community') }}
                             <span class="{{ 'fe fe-chevron-up' if sort_by == 'title asc' }}{{ 'fe fe-chevron-down' if sort_by == 'title desc' }}"></span>
-                        </a>
+                        </button>
                     </th>
                     <th scope="col">
                         <a href="?sort_by=post_count{{ ' asc' if sort_by == 'post_count desc' else ' desc' }}" title="{{ _('Sort by post count') }}" rel="nofollow">{{ _('Posts') }}

From 61963a43dc354de9362a54b480e48a3484477bf3 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 20:03:13 +0700
Subject: [PATCH 03/10] feat: make community search retain post_count sort

Refs: #362
---
 app/templates/list_communities.html | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 8f2b50f5..919edbb4 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -99,9 +99,18 @@
                         </button>
                     </th>
                     <th scope="col">
-                        <a href="?sort_by=post_count{{ ' asc' if sort_by == 'post_count desc' else ' desc' }}" title="{{ _('Sort by post count') }}" rel="nofollow">{{ _('Posts') }}
+                        <button 
+                            hx-get="/communities"
+                            hx-vals='{"sort_by": "post_count{{ ' asc' if sort_by == 'post_count desc' else ' desc' }}"}'
+                            hx-include="form[action='/communities']"
+                            hx-target="body"
+                            hx-push-url="true"
+                            title="{{ _('Sort by name') }}"
+                            class="btn"
+                        >
+                            {{ _('Posts') }}
                             <span class="{{ 'fe fe-chevron-up' if sort_by == 'post_count asc' }}{{ 'fe fe-chevron-down' if sort_by == 'post_count desc' }}"></span>
-                        </a>
+                        </button>
                     </th>
                     <th scope="col">
                         <a href="?sort_by=post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}" title="{{ _('Sort by reply count') }}" rel="nofollow">{{ _('Comments') }}

From 8dd3d3de9330fdf3edf41725803e5219ab1b7905 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 20:06:52 +0700
Subject: [PATCH 04/10] feat: make community search retain sort method

Make community search retain post_reply_count sort method.

Refs: #362
---
 app/templates/list_communities.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 919edbb4..d56119f9 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -116,6 +116,18 @@
                         <a href="?sort_by=post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}" title="{{ _('Sort by reply count') }}" rel="nofollow">{{ _('Comments') }}
                             <span class="{{ 'fe fe-chevron-up' if sort_by == 'post_reply_count asc' }}{{ 'fe fe-chevron-down' if sort_by == 'post_reply_count desc' }}"></span>
                         </a>
+                        <button 
+                            hx-get="/communities"
+                            hx-vals='{"sort_by": "post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}"}'
+                            hx-include="form[action='/communities']"
+                            hx-target="body"
+                            hx-push-url="true"
+                            title="{{ _('Comments') }}"
+                            class="btn"
+                        >
+                            {{ _('Comments') }}
+                            <span class="{{ 'fe fe-chevron-up' if sort_by == 'post_reply_count asc' }}{{ 'fe fe-chevron-down' if sort_by == 'post_reply_count desc' }}"></span>
+                        </button>
                     </th>
                     <th scope="col">
                         <a href="?sort_by=last_active{{ ' asc' if sort_by == 'last_active desc' else ' desc' }}" title="{{ _('Sort by recent activity') }}" rel="nofollow">{{ _('Active') }}

From 8ffd02651ceed261f3716f12fd02918172e31781 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 20:08:40 +0700
Subject: [PATCH 05/10] chore: remove unused link on table header

Refs: #362
---
 app/templates/list_communities.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index d56119f9..193bb3e0 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -113,9 +113,6 @@
                         </button>
                     </th>
                     <th scope="col">
-                        <a href="?sort_by=post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}" title="{{ _('Sort by reply count') }}" rel="nofollow">{{ _('Comments') }}
-                            <span class="{{ 'fe fe-chevron-up' if sort_by == 'post_reply_count asc' }}{{ 'fe fe-chevron-down' if sort_by == 'post_reply_count desc' }}"></span>
-                        </a>
                         <button 
                             hx-get="/communities"
                             hx-vals='{"sort_by": "post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}"}'

From e758389b10d614ee0d839606a6ecc71f54f08d2f Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 20:11:33 +0700
Subject: [PATCH 06/10] feat: make community search retain last_active sort

Refs: #362
---
 app/templates/list_communities.html | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 193bb3e0..65659530 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -127,9 +127,18 @@
                         </button>
                     </th>
                     <th scope="col">
-                        <a href="?sort_by=last_active{{ ' asc' if sort_by == 'last_active desc' else ' desc' }}" title="{{ _('Sort by recent activity') }}" rel="nofollow">{{ _('Active') }}
+                        <button 
+                            hx-get="/communities"
+                            hx-vals='{"sort_by": "last_active{{ ' asc' if sort_by == 'last_active desc' else ' desc' }}"}'
+                            hx-include="form[action='/communities']"
+                            hx-target="body"
+                            hx-push-url="true"
+                            title="{{ _('Sort by recent activity') }}"
+                            class="btn"
+                        >
+                            {{ _('Active') }}
                             <span class="{{ 'fe fe-chevron-up' if sort_by == 'last_active asc' }}{{ 'fe fe-chevron-down' if sort_by == 'last_active desc' }}"></span>
-                        </a>
+                        </button>
                     </th>
                 </tr>
             </thead>

From bad1839c148c0ac9fb1d42b3ca42e5b00dc3bb4a Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 20:13:52 +0700
Subject: [PATCH 07/10] fix: fix title attribute

Fix title attribute for the button on post count table column header.

Refs: #362
---
 app/templates/list_communities.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 65659530..235d06c3 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -105,7 +105,7 @@
                             hx-include="form[action='/communities']"
                             hx-target="body"
                             hx-push-url="true"
-                            title="{{ _('Sort by name') }}"
+                            title="{{ _('Sort by post count') }}"
                             class="btn"
                         >
                             {{ _('Posts') }}

From 2d2e18abf753ad7ba4c287cdbb1e88283f7c3609 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 20:28:10 +0700
Subject: [PATCH 08/10] fix: fix can only search by All communities

Refs: #362
---
 app/templates/list_communities.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 235d06c3..cf945314 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -27,7 +27,8 @@
         </div>
     </div>
     <div class="col-auto">
-      <form action="/communities"
+      <form 
+        id="searchCommunities"
         method="get"
         hx-boost="true"
         hx-trigger="change[event.target.matches('select[name=topic_id] select[name=language_id]')]">
@@ -86,7 +87,7 @@
                     <th> </th>
                     <th {% if not low_bandwidth -%}colspan="2"{% endif -%} scope="col">
                         <button 
-                            hx-get="/communities"
+                            hx-get=""
                             hx-vals='{"sort_by": "title{{ ' asc' if sort_by == 'title desc' else ' desc' }}"}'
                             hx-include="form[action='/communities']"
                             hx-target="body"
@@ -100,9 +101,9 @@
                     </th>
                     <th scope="col">
                         <button 
-                            hx-get="/communities"
+                            hx-get=""
                             hx-vals='{"sort_by": "post_count{{ ' asc' if sort_by == 'post_count desc' else ' desc' }}"}'
-                            hx-include="form[action='/communities']"
+                            hx-include="#searchCommunities"
                             hx-target="body"
                             hx-push-url="true"
                             title="{{ _('Sort by post count') }}"
@@ -114,7 +115,7 @@
                     </th>
                     <th scope="col">
                         <button 
-                            hx-get="/communities"
+                            hx-get=""
                             hx-vals='{"sort_by": "post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}"}'
                             hx-include="form[action='/communities']"
                             hx-target="body"
@@ -128,7 +129,7 @@
                     </th>
                     <th scope="col">
                         <button 
-                            hx-get="/communities"
+                            hx-get=""
                             hx-vals='{"sort_by": "last_active{{ ' asc' if sort_by == 'last_active desc' else ' desc' }}"}'
                             hx-include="form[action='/communities']"
                             hx-target="body"

From d78cf0cef65684c22cf91d0196bc0d5cd9f10432 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 21:05:16 +0700
Subject: [PATCH 09/10] fix: fix weird behavior on URL search params

Fix weird behavior where URL search params value gets appended instead of
being replaced.

Refs: #362
---
 app/templates/list_communities.html | 36 +++++++++++++----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index cf945314..2422118c 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -87,11 +87,10 @@
                     <th> </th>
                     <th {% if not low_bandwidth -%}colspan="2"{% endif -%} scope="col">
                         <button 
-                            hx-get=""
-                            hx-vals='{"sort_by": "title{{ ' asc' if sort_by == 'title desc' else ' desc' }}"}'
-                            hx-include="form[action='/communities']"
-                            hx-target="body"
-                            hx-push-url="true"
+                            form="searchCommunities"
+                            hx-boost="true"
+                            name="sort_by"
+                            value="title{{ ' asc' if sort_by == 'title desc' else ' desc' }}" 
                             title="{{ _('Sort by name') }}"
                             class="btn"
                         >
@@ -101,11 +100,10 @@
                     </th>
                     <th scope="col">
                         <button 
-                            hx-get=""
-                            hx-vals='{"sort_by": "post_count{{ ' asc' if sort_by == 'post_count desc' else ' desc' }}"}'
-                            hx-include="#searchCommunities"
-                            hx-target="body"
-                            hx-push-url="true"
+                            form="searchCommunities"
+                            hx-boost="true"
+                            name="sort_by"
+                            value="post_count{{ ' asc' if sort_by == 'post_count desc' else ' desc' }}" 
                             title="{{ _('Sort by post count') }}"
                             class="btn"
                         >
@@ -115,11 +113,10 @@
                     </th>
                     <th scope="col">
                         <button 
-                            hx-get=""
-                            hx-vals='{"sort_by": "post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}"}'
-                            hx-include="form[action='/communities']"
-                            hx-target="body"
-                            hx-push-url="true"
+                            form="searchCommunities"
+                            hx-boost="true"
+                            name="sort_by"
+                            value="post_reply_count{{ ' asc' if sort_by == 'post_reply_count desc' else ' desc' }}" 
                             title="{{ _('Comments') }}"
                             class="btn"
                         >
@@ -129,11 +126,10 @@
                     </th>
                     <th scope="col">
                         <button 
-                            hx-get=""
-                            hx-vals='{"sort_by": "last_active{{ ' asc' if sort_by == 'last_active desc' else ' desc' }}"}'
-                            hx-include="form[action='/communities']"
-                            hx-target="body"
-                            hx-push-url="true"
+                            form="searchCommunities"
+                            hx-boost="true"
+                            name="sort_by"
+                            value="last_active{{ ' asc' if sort_by == 'last_active desc' else ' desc' }}" 
                             title="{{ _('Sort by recent activity') }}"
                             class="btn"
                         >

From a6732958dfaae44b21a9efeae2a82a678d783639 Mon Sep 17 00:00:00 2001
From: hono4kami <dgloaming@proton.me>
Date: Tue, 17 Dec 2024 22:51:42 +0700
Subject: [PATCH 10/10] fix: fix URL queries appending

Fix another unsual behavior where a URL query fields are being appended
to URL instead of replaced, when a form field is changed.

Refs: #362
---
 app/templates/list_communities.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/list_communities.html b/app/templates/list_communities.html
index 2422118c..0cc6e200 100644
--- a/app/templates/list_communities.html
+++ b/app/templates/list_communities.html
@@ -30,14 +30,14 @@
       <form 
         id="searchCommunities"
         method="get"
-        hx-boost="true"
-        hx-trigger="change[event.target.matches('select[name=topic_id] select[name=language_id]')]">
+      >
           {% if topics -%}
               <div style="display:inline;">
                   Topic:
                   <select name="topic_id"
-                          class="form-control-sm"
-                          aria-label="{{ _('Choose a topic to filter communities by') }}">
+                          class="form-control-sm submit_on_change"
+                          aria-label="{{ _('Choose a topic to filter communities by') }}"
+                        >
                       <option value="0">All</option>
                       {% for topic in topics -%}
                           <option value="{{ topic.id }}" {{ 'selected' if topic.id == topic_id }}>{{ topic.name }}
@@ -50,7 +50,7 @@
               <div style="display:inline;">
                   Language:
                   <select name="language_id"
-                          class="form-control-sm"
+                          class="form-control-sm submit_on_change"
                           aria-label="{{ _('Choose a language to filter communities by') }}">
                       <option value="0">All</option>
                       {% for language in languages -%}