From ad55fc510c6dc093d74657e5c8bef4e6da485dc8 Mon Sep 17 00:00:00 2001
From: freamon <adslater@gmail.com>
Date: Tue, 17 Dec 2024 12:50:29 +0000
Subject: [PATCH 01/14] Move code to hide duplicate cross-posts into PR #386

---
 app/main/routes.py | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/app/main/routes.py b/app/main/routes.py
index ba64cf6e..aebf502c 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -116,39 +116,9 @@ def home_page(sort, view_filter):
         posts = posts.order_by(desc(Post.last_active))
 
     # Pagination
-    if view_filter == 'subscribed' and current_user.is_authenticated and sort == 'new':
-        # use python list instead of DB query
-        posts = posts.all()
-
-        # exclude extra cross-posts from feed
-        already_seen = []
-        limit = 100 if not low_bandwidth else 50
-        #i = -1                                                 # option 1: don't exclude cross-posts
-        #i = min(limit - 1, len(posts) - 1)                     # option 2: exclude cross-posts from the first page only
-        i = min((limit * 10) - 1, len(posts) - 1)               # option 3: exclude cross-posts across a 'magic number' of pages
-        #i = len(posts) - 1                                     # option 4: exclude all cross-posts ever
-        while i >= 0:
-            if not posts[i].cross_posts:
-                i -= 1
-                continue
-            if posts[i].id in already_seen:
-                posts.pop(i)
-            else:
-                already_seen.extend(posts[i].cross_posts)
-            i -= 1
-
-        # paginate manually (can't use paginate())
-        start = (page - 1) * limit
-        end = start + limit
-        posts = posts[start:end]
-        next_page = page + 1 if len(posts) == limit else None
-        previous_page = page - 1 if page != 1 else None
-        next_url = url_for('main.index', page=next_page, sort=sort, view_filter=view_filter) if next_page else None
-        prev_url = url_for('main.index', page=previous_page, sort=sort, view_filter=view_filter) if previous_page else None
-    else:
-        posts = posts.paginate(page=page, per_page=100 if current_user.is_authenticated and not low_bandwidth else 50, error_out=False)
-        next_url = url_for('main.index', page=posts.next_num, sort=sort, view_filter=view_filter) if posts.has_next else None
-        prev_url = url_for('main.index', page=posts.prev_num, sort=sort, view_filter=view_filter) if posts.has_prev and page != 1 else None
+    posts = posts.paginate(page=page, per_page=100 if current_user.is_authenticated and not low_bandwidth else 50, error_out=False)
+    next_url = url_for('main.index', page=posts.next_num, sort=sort, view_filter=view_filter) if posts.has_next else None
+    prev_url = url_for('main.index', page=posts.prev_num, sort=sort, view_filter=view_filter) if posts.has_prev and page != 1 else None
 
     # Active Communities
     active_communities = Community.query.filter_by(banned=False)

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 02/14] 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 03/14] 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 04/14] 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 05/14] 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 06/14] 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 07/14] 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 08/14] 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 09/14] 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 10/14] 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 11/14] 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 -%}

From f76b205f29588df7dcf8eb2b6063c8fd84c58747 Mon Sep 17 00:00:00 2001
From: aroberts-fox <alan.roberts@fox.com>
Date: Tue, 17 Dec 2024 16:54:18 -0500
Subject: [PATCH 12/14] Fix - subscribed page topic filter handling

---
 app/main/routes.py | 139 ++++++++++++++++++++++-----------------------
 1 file changed, 68 insertions(+), 71 deletions(-)

diff --git a/app/main/routes.py b/app/main/routes.py
index aebf502c..3f7dccff 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -220,7 +220,7 @@ def list_communities():
                            next_url=next_url, prev_url=prev_url, current_user=current_user,
                            topics=topics, languages=languages, topic_id=topic_id, language_id=language_id, sort_by=sort_by,
                            low_bandwidth=low_bandwidth, moderating_communities=moderating_communities(current_user.get_id()),
-                           joined_communities=joined_communities(current_user.get_id()),
+                        #    joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(), site=g.site)
 
 
@@ -272,11 +272,12 @@ def list_local_communities():
                            next_url=next_url, prev_url=prev_url, current_user=current_user,
                            topics=topics, languages=languages, topic_id=topic_id, language_id=language_id, sort_by=sort_by,
                            low_bandwidth=low_bandwidth, moderating_communities=moderating_communities(current_user.get_id()),
-                           joined_communities=joined_communities(current_user.get_id()),
+                        #    joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(), site=g.site)
 
 
 @bp.route('/communities/subscribed', methods=['GET'])
+@login_required
 def list_subscribed_communities():
     verification_warning()
     search_param = request.args.get('search', '')
@@ -287,36 +288,39 @@ def list_subscribed_communities():
     sort_by = request.args.get('sort_by', 'post_reply_count desc')
     topics = Topic.query.order_by(Topic.name).all()
     languages = Language.query.order_by(Language.name).all()
-    if current_user.is_authenticated:
-        communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id)
+    # get all the communities
+    all_communities = Community.query.filter_by(banned=False)
+    # get the user's joined communities
+    user_joined_communities = joined_communities(current_user.id)
+    # get the joined community ids list
+    joined_ids = []
+    for jc in user_joined_communities:
+        joined_ids.append(jc.id)
+    # filter down to just the joined communities
+    communities = all_communities.filter(Community.id.in_(joined_ids))
 
-        if search_param == '':
+    if search_param == '':
             pass
-        else:
-            communities = communities.filter(or_(Community.title.ilike(f"%{search_param}%"), Community.ap_id.ilike(f"%{search_param}%")))
-
-        if topic_id != 0:
-            communities = communities.filter_by(topic_id=topic_id)
-
-        if language_id != 0:
-            communities = communities.join(community_language).filter(community_language.c.language_id == language_id)
-
-        banned_from = communities_banned_from(current_user.id)
-        if banned_from:
-            communities = communities.filter(Community.id.not_in(banned_from))
-
-        communities = communities.order_by(text('community.' + sort_by))
-
-        # Pagination
-        communities = communities.paginate(page=page, per_page=250 if current_user.is_authenticated and not low_bandwidth else 50,
-                           error_out=False)
-        next_url = url_for('main.list_subscribed_communities', page=communities.next_num, sort_by=sort_by, language_id=language_id) if communities.has_next else None
-        prev_url = url_for('main.list_subscribed_communities', page=communities.prev_num, sort_by=sort_by, language_id=language_id) if communities.has_prev and page != 1 else None
-
     else:
-        communities = []
-        next_url = None
-        prev_url = None
+        communities = communities.filter(or_(Community.title.ilike(f"%{search_param}%"), Community.ap_id.ilike(f"%{search_param}%")))
+
+    if topic_id != 0:
+        communities = communities.filter_by(topic_id=topic_id)
+
+    if language_id != 0:
+        communities = communities.join(community_language).filter(community_language.c.language_id == language_id)
+
+    banned_from = communities_banned_from(current_user.id)
+    if banned_from:
+        communities = communities.filter(Community.id.not_in(banned_from))
+
+    communities = communities.order_by(text('community.' + sort_by))
+
+    # Pagination
+    communities = communities.paginate(page=page, per_page=250 if current_user.is_authenticated and not low_bandwidth else 50,
+                        error_out=False)
+    next_url = url_for('main.list_subscribed_communities', page=communities.next_num, sort_by=sort_by, language_id=language_id) if communities.has_next else None
+    prev_url = url_for('main.list_subscribed_communities', page=communities.prev_num, sort_by=sort_by, language_id=language_id) if communities.has_prev and page != 1 else None
 
     return render_template('list_communities.html', communities=communities, search=search_param, title=_('Joined Communities'),
                            SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING, SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER,
@@ -324,7 +328,6 @@ def list_subscribed_communities():
                            next_url=next_url, prev_url=prev_url, current_user=current_user,
                            topics=topics, languages=languages, topic_id=topic_id, language_id=language_id, sort_by=sort_by,
                            low_bandwidth=low_bandwidth, moderating_communities=moderating_communities(current_user.get_id()),
-                           joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(), site=g.site)
 
 
@@ -339,49 +342,43 @@ def list_not_subscribed_communities():
     sort_by = request.args.get('sort_by', 'post_reply_count desc')
     topics = Topic.query.order_by(Topic.name).all()
     languages = Language.query.order_by(Language.name).all()
-    if current_user.is_authenticated:
-        # get all communities
-        all_communities = Community.query.filter_by(banned=False)
-        # get the user's joined communities
-        joined_communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id)
-        # get the joined community ids list
-        joined_ids = []
-        for jc in joined_communities:
-            joined_ids.append(jc.id)
-        # filter out the joined communities from all communities
-        communities = all_communities.filter(Community.id.not_in(joined_ids))
-
-        if search_param == '':
-            pass
-        else:
-            communities = communities.filter(or_(Community.title.ilike(f"%{search_param}%"), Community.ap_id.ilike(f"%{search_param}%")))
-
-        if topic_id != 0:
-            communities = communities.filter_by(topic_id=topic_id)
-
-        if language_id != 0:
-            communities = communities.join(community_language).filter(community_language.c.language_id == language_id)
-
-        banned_from = communities_banned_from(current_user.id)
-        if banned_from:
-            communities = communities.filter(Community.id.not_in(banned_from))
-        if current_user.hide_nsfw == 1:
-            communities = communities.filter(Community.nsfw == False)
-        if current_user.hide_nsfl == 1:
-            communities = communities.filter(Community.nsfl == False)
-
-        communities = communities.order_by(text('community.' + sort_by))
-
-        # Pagination
-        communities = communities.paginate(page=page, per_page=250 if current_user.is_authenticated and not low_bandwidth else 50,
-                           error_out=False)
-        next_url = url_for('main.list_not_subscribed_communities', page=communities.next_num, sort_by=sort_by, language_id=language_id) if communities.has_next else None
-        prev_url = url_for('main.list_not_subscribed_communities', page=communities.prev_num, sort_by=sort_by, language_id=language_id) if communities.has_prev and page != 1 else None
+    # get all communities
+    all_communities = Community.query.filter_by(banned=False)
+    # get the user's joined communities
+    joined_communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id)
+    # get the joined community ids list
+    joined_ids = []
+    for jc in joined_communities:
+        joined_ids.append(jc.id)
+    # filter out the joined communities from all communities
+    communities = all_communities.filter(Community.id.not_in(joined_ids))
 
+    if search_param == '':
+        pass
     else:
-        communities = []
-        next_url = None
-        prev_url = None
+        communities = communities.filter(or_(Community.title.ilike(f"%{search_param}%"), Community.ap_id.ilike(f"%{search_param}%")))
+
+    if topic_id != 0:
+        communities = communities.filter_by(topic_id=topic_id)
+
+    if language_id != 0:
+        communities = communities.join(community_language).filter(community_language.c.language_id == language_id)
+
+    banned_from = communities_banned_from(current_user.id)
+    if banned_from:
+        communities = communities.filter(Community.id.not_in(banned_from))
+    if current_user.hide_nsfw == 1:
+        communities = communities.filter(Community.nsfw == False)
+    if current_user.hide_nsfl == 1:
+        communities = communities.filter(Community.nsfl == False)
+
+    communities = communities.order_by(text('community.' + sort_by))
+
+    # Pagination
+    communities = communities.paginate(page=page, per_page=250 if current_user.is_authenticated and not low_bandwidth else 50,
+                        error_out=False)
+    next_url = url_for('main.list_not_subscribed_communities', page=communities.next_num, sort_by=sort_by, language_id=language_id) if communities.has_next else None
+    prev_url = url_for('main.list_not_subscribed_communities', page=communities.prev_num, sort_by=sort_by, language_id=language_id) if communities.has_prev and page != 1 else None
 
     return render_template('list_communities.html', communities=communities, search=search_param, title=_('Not Joined Communities'),
                            SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING, SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER,

From db914ca2b7d17892935b6635a89095d7b8fefe5c Mon Sep 17 00:00:00 2001
From: aroberts-fox <alan.roberts@fox.com>
Date: Tue, 17 Dec 2024 17:04:04 -0500
Subject: [PATCH 13/14] comment cleanup

---
 app/main/routes.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/main/routes.py b/app/main/routes.py
index 3f7dccff..17b8b8ef 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -220,7 +220,6 @@ def list_communities():
                            next_url=next_url, prev_url=prev_url, current_user=current_user,
                            topics=topics, languages=languages, topic_id=topic_id, language_id=language_id, sort_by=sort_by,
                            low_bandwidth=low_bandwidth, moderating_communities=moderating_communities(current_user.get_id()),
-                        #    joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(), site=g.site)
 
 
@@ -272,7 +271,6 @@ def list_local_communities():
                            next_url=next_url, prev_url=prev_url, current_user=current_user,
                            topics=topics, languages=languages, topic_id=topic_id, language_id=language_id, sort_by=sort_by,
                            low_bandwidth=low_bandwidth, moderating_communities=moderating_communities(current_user.get_id()),
-                        #    joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(), site=g.site)
 
 

From dce17fd09467e5b3724e048205db6e1945a5369f Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:21:03 +1300
Subject: [PATCH 14/14] fix where clicking on teaser body text goes to

---
 app/static/js/scripts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/static/js/scripts.js b/app/static/js/scripts.js
index ae9bac26..94ffab99 100644
--- a/app/static/js/scripts.js
+++ b/app/static/js/scripts.js
@@ -39,7 +39,7 @@ document.addEventListener("DOMContentLoaded", function () {
 function setupPostTeaserHandler() {
     document.querySelectorAll('.post_teaser_clickable').forEach(div => {
         div.onclick = function() {
-            const firstAnchor = this.parentElement.querySelector('a');
+            const firstAnchor = this.parentElement.querySelector('h3 a');
             if (firstAnchor) {
                 window.location.href = firstAnchor.href;
             }