From 19be3779e37664b9dbb444ad105dfdb8c1730676 Mon Sep 17 00:00:00 2001
From: mae taylor <mae@mae.wtf>
Date: Wed, 23 Jul 2025 22:10:01 +0100
Subject: [PATCH] fix: pagination bug on misskey favourites

---
 src/lib/api.js      | 32 ++++++++++++++++++++------------
 src/lib/timeline.js | 13 ++++++++++---
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/lib/api.js b/src/lib/api.js
index 812ddd0..7401f0f 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -285,13 +285,17 @@ export async function getTimeline(host, token, timeline, max_id, local_only, rem
         headers: { "Authorization": token ? `Bearer ${token}` : null }
     })
 
-    let links = _parseLinkHeader(data.headers.get("Link"));
+    let res = {
+        data: await data.json()
+    }
 
-    return {
-        data: await data.json(),
-        prev: links.find(f=>f.rel=="prev"),
-        next: links.find(f=>f.rel=="next")
-    };
+    if(data.headers.has("Link")) {
+        let links = _parseLinkHeader(data.headers.get("Link"));
+        res["prev"] = links.find(f=>f.rel=="prev");
+        res["next"] = links.find(f=>f.rel=="next");
+    }
+
+    return res;
 }
 
 /**
@@ -312,14 +316,18 @@ export async function getFavourites(host, token, max_id) {
         method: 'GET',
         headers: { "Authorization": token ? `Bearer ${token}` : null }
     })
+    
+    let res = {
+        data: await data.json()
+    }
 
-    let links = _parseLinkHeader(data.headers.get("Link"));
+    if(data.headers.has("Link")) {
+        let links = _parseLinkHeader(data.headers.get("Link"));
+        res["prev"] = links.find(f=>f.rel=="prev");
+        res["next"] = links.find(f=>f.rel=="next");
+    }
 
-    return {
-        data: await data.json(),
-        prev: links.find(f=>f.rel=="prev"),
-        next: links.find(f=>f.rel=="next")
-    };
+    return res;
 }
 
 /**
diff --git a/src/lib/timeline.js b/src/lib/timeline.js
index 179f0a4..5e86f5f 100644
--- a/src/lib/timeline.js
+++ b/src/lib/timeline.js
@@ -10,12 +10,15 @@ export const timeline = writable([]);
 const lang = Lang();
 
 let loading = false;
-let last_post = false;
+let last_post = false;      // last post marker, used for fetching next sequence of posts
+let at_end = false;         // at end of timeline, no next param to paginate
 
 export async function getTimeline(timelineType = "home", clean, localOnly = false, remoteOnly = false) {
     if (loading) return; // no spamming!!
     loading = true;
 
+    if(at_end) return;
+
     if(clean) {
         timeline.set([]);
         last_post = false;
@@ -49,9 +52,12 @@ export async function getTimeline(timelineType = "home", clean, localOnly = fals
         return;
     }
 
-    if (!clean) {
+    if (!clean && timeline_data.next) {
         last_post = timeline_data.next.url.searchParams.get("max_id")
-    } 
+    } else if(!timeline_data.next) {
+        console.log(timeline_data)
+        at_end = true;
+    }
 
     for (let i in timeline_data.data) {
         const post_data = timeline_data.data[i];
@@ -75,4 +81,5 @@ export async function getTimeline(timelineType = "home", clean, localOnly = fals
 export function clearTimeline() {
     timeline.set([]);
     last_post = false;
+    at_end = false;
 }
\ No newline at end of file