From a42e1df1a7f170c93797c8821725da65867ca5ac Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Fri, 10 Apr 2026 12:40:28 -0700
Subject: [PATCH] Fix feed pagination logic

---
 src/app/core/requests.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/core/requests.ts b/src/app/core/requests.ts
index dfab9bca..b695cc3f 100644
--- a/src/app/core/requests.ts
+++ b/src/app/core/requests.ts
@@ -60,7 +60,7 @@ export const makeFeed = ({
 
   const insertIntoBuffer = (event: TrustedEvent) => {
     for (let i = 0; i < buffer.length; i++) {
-      if (buffer[i].created_at > event.created_at) {
+      if (buffer[i].created_at < event.created_at) {
         buffer.splice(i, 0, event)
         return
       }
@@ -152,7 +152,7 @@ export const makeFeed = ({
     element,
     delay: 300,
     threshold: 5000,
-    onScroll: () => {
+    onScroll: async () => {
       const [since, until] = backwardWindow
 
       backwardWindow = [since - interval, since]
@@ -160,7 +160,7 @@ export const makeFeed = ({
       insertEvents(buffer.splice(0, 30))
 
       if (until > now() - int(2, YEAR)) {
-        loadTimeframe(since, until)
+        await loadTimeframe(since, until)
       } else if (!buffer.some(e => e.created_at < at)) {
         backwardScroller.stop()
         onBackwardExhausted?.()
@@ -173,7 +173,7 @@ export const makeFeed = ({
     reverse: true,
     delay: 300,
     threshold: 5000,
-    onScroll: () => {
+    onScroll: async () => {
       const [since, until] = forwardWindow
 
       forwardWindow = [until, until + interval]
@@ -181,7 +181,7 @@ export const makeFeed = ({
       insertEvents(buffer.splice(0, 30))
 
       if (until < now()) {
-        loadTimeframe(since, until)
+        await loadTimeframe(since, until)
       } else if (!buffer.some(e => e.created_at > at)) {
         forwardScroller.stop()
         onForwardExhausted?.()