From 2fd7556a521b6ccd650350e4a46acc6c41c6ba15 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 30 Mar 2026 14:20:30 -0700
Subject: [PATCH] Fix new messages button, improve room load

---
 src/app/core/requests.ts                    | 11 ++++-------
 src/routes/spaces/[relay]/[h]/+page.svelte  |  4 ++--
 src/routes/spaces/[relay]/chat/+page.svelte |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/app/core/requests.ts b/src/app/core/requests.ts
index b1d8da433..97060ee9e 100644
--- a/src/app/core/requests.ts
+++ b/src/app/core/requests.ts
@@ -22,6 +22,7 @@ import {
   getAddress,
   isShareableRelayUrl,
   getRelaysFromList,
+  sortEventsDesc,
 } from "@welshman/util"
 import type {TrustedEvent, Filter, List} from "@welshman/util"
 import {load, request} from "@welshman/net"
@@ -51,7 +52,7 @@ export const makeFeed = ({
   const events = writable<TrustedEvent[]>([])
 
   let interval = int(WEEK)
-  let buffer: TrustedEvent[] = []
+  let buffer = sortEventsDesc(getEventsForUrl(url, filters))
   let backwardWindow = [at - interval, at]
   let forwardWindow = [at, at + interval]
 
@@ -136,7 +137,7 @@ export const makeFeed = ({
 
       backwardWindow = [since - interval, since]
 
-      for (const event of buffer.splice(0)) {
+      for (const event of buffer.splice(0, 30)) {
         insertEvent(event)
       }
 
@@ -159,7 +160,7 @@ export const makeFeed = ({
 
       forwardWindow = [until, until + interval]
 
-      for (const event of buffer.splice(0)) {
+      for (const event of buffer.splice(0, 30)) {
         insertEvent(event)
       }
 
@@ -172,10 +173,6 @@ export const makeFeed = ({
     },
   })
 
-  for (const event of getEventsForUrl(url, filters)) {
-    insertEvent(event)
-  }
-
   return {
     events,
     cleanup: () => {
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index f58dc2e7b..9bc7323c1 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {onMount, tick} from "svelte"
+  import {onMount} from "svelte"
   import {readable} from "svelte/store"
   import {page} from "$app/stores"
   import {goto} from "$app/navigation"
@@ -301,7 +301,7 @@
 
     elements.reverse()
 
-    tick().then(manageScrollPosition)
+    requestAnimationFrame(manageScrollPosition)
 
     return elements
   })
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 3104c254d..50b66ddd5 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {onMount, tick} from "svelte"
+  import {onMount} from "svelte"
   import {page} from "$app/stores"
   import {goto} from "$app/navigation"
   import type {Readable} from "svelte/store"
@@ -232,7 +232,7 @@
 
     elements.reverse()
 
-    tick().then(manageScrollPosition)
+    requestAnimationFrame(manageScrollPosition)
 
     return elements
   })