From 7b5de79d3f12e955575c0a66f5133ce2642a9782 Mon Sep 17 00:00:00 2001
From: aroberts-fox <alan.roberts@fox.com>
Date: Wed, 27 Nov 2024 13:18:56 -0500
Subject: [PATCH] Adding sorting to read-posts page

---
 app/templates/user/_read_posts_nav.html | 17 +++++++++++++++++
 app/templates/user/read_posts.html      |  1 +
 app/user/routes.py                      | 21 ++++++++++++++++++---
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 app/templates/user/_read_posts_nav.html

diff --git a/app/templates/user/_read_posts_nav.html b/app/templates/user/_read_posts_nav.html
new file mode 100644
index 00000000..7865544e
--- /dev/null
+++ b/app/templates/user/_read_posts_nav.html
@@ -0,0 +1,17 @@
+<div class="btn-group mt-1 mb-2" aria-label="{{ _('Sorting methods: ') }}">
+    <a href="/read-posts/newest" class="btn {{ 'btn-primary' if sort == 'newest' else 'btn-outline-secondary' }}" rel="nofollow noindex" title="{{ _('Newest posts') }}">
+        {{ _('Newest') }}
+    </a>
+    <a href="/read-posts/oldest" class="btn {{ 'btn-primary' if sort == 'oldest' else 'btn-outline-secondary' }}" rel="nofollow noindex" title="{{ _('Oldest posts') }}">
+        {{ _('Oldest') }}
+    </a>
+    <a href="/read-posts/hot" class="btn {{ 'btn-primary' if sort == 'hot' else 'btn-outline-secondary' }}" rel="nofollow noindex" title="{{ _('Trending now') }}">
+        {{ _('Hot') }}
+    </a>
+    <a href="/read-posts/top" class="btn {{ 'btn-primary' if sort == 'top' else 'btn-outline-secondary' }}" rel="nofollow noindex" title="{{ _('Most upvotes in the last 24h') }}">
+        {{ _('Top') }}
+    </a>
+    <a href="/read-posts/active" class="btn {{ 'btn-primary' if sort == 'active' else 'btn-outline-secondary' }}" rel="nofollow noindex" title="{{ _('Recently commented on') }}">
+        {{ _('Active') }}
+    </a>
+</div>
\ No newline at end of file
diff --git a/app/templates/user/read_posts.html b/app/templates/user/read_posts.html
index 86dd221a..d8b7b7dd 100644
--- a/app/templates/user/read_posts.html
+++ b/app/templates/user/read_posts.html
@@ -16,6 +16,7 @@
           </ol>
         </nav>
         <h1>{{ _('Read posts') }}</h1>
+        {% include "user/_read_posts_nav.html" -%}
         {% if posts %}
             <div class="post_list">
                 {% for post in posts.items -%}
diff --git a/app/user/routes.py b/app/user/routes.py
index 5753f783..3bbb038d 100644
--- a/app/user/routes.py
+++ b/app/user/routes.py
@@ -26,7 +26,7 @@ from app.utils import get_setting, render_template, markdown_to_html, user_acces
     user_filters_posts, user_filters_replies, moderating_communities, joined_communities, theme_list, blocked_instances, \
     allowlist_html, recently_upvoted_posts, recently_downvoted_posts, blocked_users, menu_topics, add_to_modlog, \
     blocked_communities, piefed_markdown_to_lemmy_markdown
-from sqlalchemy import desc, or_, text
+from sqlalchemy import desc, or_, text, asc
 import os
 import json as python_json
 
@@ -1264,8 +1264,11 @@ def fediverse_redirect(actor):
 
 
 @bp.route('/read-posts')
+@bp.route('/read-posts/<sort>', methods=['GET', 'POST'])
 @login_required
-def user_read_posts():
+def user_read_posts(sort=None):
+    if sort is None:
+        sort = current_user.default_sort if current_user.is_authenticated else 'hot'
     page = request.args.get('page', 1, type=int)
     low_bandwidth = request.cookies.get('low_bandwidth', '0') == '1'
 
@@ -1282,13 +1285,25 @@ def user_read_posts():
     # current_user has already read/voted on
     posts = posts.join(read_posts, read_posts.c.read_post_id == Post.id).filter(read_posts.c.user_id == current_user.id)
 
+    # sort the posts
+    if sort == 'hot':
+        posts = posts.order_by(desc(Post.sticky)).order_by(desc(Post.ranking)).order_by(desc(Post.posted_at))
+    elif sort == 'top':
+        posts = posts.filter(Post.posted_at > utcnow() - timedelta(days=7)).order_by(desc(Post.sticky)).order_by(desc(Post.up_votes - Post.down_votes))
+    elif sort == 'newest':
+        posts = posts.order_by(desc(Post.posted_at))
+    elif sort == 'oldest':
+        posts = posts.order_by(asc(Post.posted_at))
+    elif sort == 'active':
+        posts = posts.order_by(desc(Post.sticky)).order_by(desc(Post.last_active))
+
     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('user.user_read_posts', page=posts.next_num) if posts.has_next else None
     prev_url = url_for('user.user_read_posts', page=posts.prev_num) if posts.has_prev and page != 1 else None
 
     return render_template('user/read_posts.html', title=_('Read posts'), posts=posts, show_post_community=True,
-                           low_bandwidth=low_bandwidth, user=current_user,
+                           sort=sort, low_bandwidth=low_bandwidth, user=current_user,
                            moderating_communities=moderating_communities(current_user.get_id()),
                            joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(), site=g.site,