From 3d11dcf62e8000969b637d369663f559fd2e415c Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 21 Jan 2024 20:20:40 +1300
Subject: [PATCH] masonry tile - maintain state

---
 app/community/routes.py                     |  8 ++++----
 app/templates/community/_community_nav.html | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/community/routes.py b/app/community/routes.py
index 1d72b08f..996b398c 100644
--- a/app/community/routes.py
+++ b/app/community/routes.py
@@ -109,7 +109,7 @@ def show_community(community: Community):
     post_layout = request.args.get('layout', community.default_layout if not low_bandwidth else None)
 
     # If nothing has changed since their last visit, return HTTP 304
-    current_etag = f"{community.id}{sort}_{hash(community.last_active)}"
+    current_etag = f"{community.id}{sort}{post_layout}_{hash(community.last_active)}"
     if current_user.is_anonymous and request_etag_matches(current_etag):
         return return_304(current_etag)
 
@@ -157,15 +157,15 @@ def show_community(community: Community):
     og_image = community.image.source_url if community.image_id else None
 
     next_url = url_for('activitypub.community_profile', actor=community.ap_id if community.ap_id is not None else community.name,
-                       page=posts.next_num, sort=sort) if posts.has_next else None
+                       page=posts.next_num, sort=sort, layout=post_layout) if posts.has_next else None
     prev_url = url_for('activitypub.community_profile', actor=community.ap_id if community.ap_id is not None else community.name,
-                       page=posts.prev_num, sort=sort) if posts.has_prev and page != 1 else None
+                       page=posts.prev_num, sort=sort, layout=post_layout) if posts.has_prev and page != 1 else None
 
     return render_template('community/community.html', community=community, title=community.title,
                            is_moderator=is_moderator, is_owner=is_owner, is_admin=is_admin, mods=mod_list, posts=posts, description=description,
                            og_image=og_image, POST_TYPE_IMAGE=POST_TYPE_IMAGE, POST_TYPE_LINK=POST_TYPE_LINK, SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING,
                            SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER, SUBSCRIPTION_OWNER=SUBSCRIPTION_OWNER, SUBSCRIPTION_MODERATOR=SUBSCRIPTION_MODERATOR,
-                           etag=f"{community.id}{sort}_{hash(community.last_active)}", related_communities=related_communities,
+                           etag=f"{community.id}{sort}{post_layout}_{hash(community.last_active)}", related_communities=related_communities,
                            next_url=next_url, prev_url=prev_url, low_bandwidth=low_bandwidth,
                            rss_feed=f"https://{current_app.config['SERVER_NAME']}/community/{community.link()}/feed", rss_feed_name=f"{community.title} posts on PieFed",
                            content_filters=content_filters, moderating_communities=moderating_communities(current_user.get_id()),
diff --git a/app/templates/community/_community_nav.html b/app/templates/community/_community_nav.html
index dda107e0..5771e4ae 100644
--- a/app/templates/community/_community_nav.html
+++ b/app/templates/community/_community_nav.html
@@ -2,28 +2,28 @@
     <a class="btn btn-primary" href="/community/{{ community.link() }}/submit">{{ _('Create post') }}</a>
 </div>
 <div class="btn-group mt-1 mb-2">
-    <a href="?sort=hot" class="btn {{ 'btn-primary' if sort == '' or sort == 'hot' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?sort=hot&layout={{ post_layout }}" class="btn {{ 'btn-primary' if sort == '' or sort == 'hot' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('Hot') }}
     </a>
-    <a href="?sort=top" class="btn {{ 'btn-primary' if sort == 'top' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?sort=top&layout={{ post_layout }}" class="btn {{ 'btn-primary' if sort == 'top' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('Top') }}
     </a>
-    <a href="?sort=new" class="btn {{ 'btn-primary' if sort == 'new' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?sort=new&layout={{ post_layout }}" class="btn {{ 'btn-primary' if sort == 'new' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('New') }}
     </a>
-    <a href="?sort=active" class="btn {{ 'btn-primary' if sort == 'active' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?sort=active&layout={{ post_layout }}" class="btn {{ 'btn-primary' if sort == 'active' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('Active') }}
     </a>
 </div>
 {% if post_layout != '' and post_layout is not none %}
 <div class="btn-group mt-1 mb-2 layout_switcher">
-    <a href="?layout=list" class="btn {{ 'btn-primary' if post_layout == '' or post_layout == 'list' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?layout=list&sort={{ sort }}" class="btn {{ 'btn-primary' if post_layout == '' or post_layout == 'list' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('List') }}
     </a>
-    <a href="?layout=masonry" class="btn {{ 'btn-primary' if post_layout == 'masonry' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?layout=masonry&sort={{ sort }}" class="btn {{ 'btn-primary' if post_layout == 'masonry' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('Tile') }}
     </a>
-    <a href="?layout=masonry_wide" class="btn {{ 'btn-primary' if post_layout == 'masonry_wide' else 'btn-outline-secondary' }}" rel="nofollow">
+    <a href="?layout=masonry_wide&sort={{ sort }}" class="btn {{ 'btn-primary' if post_layout == 'masonry_wide' else 'btn-outline-secondary' }}" rel="nofollow">
         {{ _('Wide tile') }}
     </a>
 </div>