fix feed pagination error

freedit-org · Nov 9, 2023 · a113aad · a113aad
1 parent 754dafe
commit a113aad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/controller/feed.rs b/src/controller/feed.rs
@@ -218,17 +218,21 @@ pub(crate) async fn feed(
         let out_feed = OutFeed::new(&DB, feed.feed_id, feed.is_public)?;
         e.push(out_feed);
 
-        if let Some(active_feed) = params.active_feed {
-            if active_feed != feed.feed_id {
-                continue;
-            }
-            active_folder = Some(feed.folder)
-        } else if let Some(ref active_folder) = active_folder {
+        if let Some(ref active_folder) = active_folder {
             if active_folder != &feed.folder && !active_folder.is_empty() {
                 continue;
             }
         }
 
+        if let Some(active_feed) = params.active_feed {
+            if active_feed != 0 {
+                if active_feed != feed.feed_id {
+                    continue;
+                }
+                active_folder = Some(feed.folder)
+            }
+        }
+
         feed_ids.push(feed.feed_id);
     }
 

diff --git a/templates/feed.html b/templates/feed.html
@@ -72,7 +72,7 @@
         {% match filter %} {% when Some with (val) %}
             <a class="pagination-previous" href="/feed/{{uid}}?anchor={{anchor - n}}&is_desc={{is_desc}}&filter={{val}}&active_folder={{active_folder}}&active_feed={{active_feed}}">Prev</a>
         {% else %}
-            <a class="pagination-previous" href="/feed/{{uid}}?anchor={{anchor - n}}&is_desc={{is_desc}}">Prev</a>
+            <a class="pagination-previous" href="/feed/{{uid}}?anchor={{anchor - n}}&is_desc={{is_desc}}&active_folder={{active_folder}}&active_feed={{active_feed}}">Prev</a>
         {% endmatch %}
     {% endif %}
 
@@ -82,7 +82,7 @@
         {% match filter %} {% when Some with (val) %}
             <a class="pagination-next" href="/feed/{{uid}}?anchor={{anchor + n}}&is_desc={{is_desc}}&filter={{val}}&active_folder={{active_folder}}&active_feed={{active_feed}}">Next</a>
         {% else %}
-            <a class="pagination-next" href="/feed/{{uid}}?anchor={{anchor + n}}&is_desc={{is_desc}}">Next</a>
+            <a class="pagination-next" href="/feed/{{uid}}?anchor={{anchor + n}}&is_desc={{is_desc}}&active_folder={{active_folder}}&active_feed={{active_feed}}">Next</a>
         {% endmatch %}
     {% endif %}
 </nav>