Small fixes/performance improvements

src/app/requests.ts

@@ -1,20 +1,23 @@
+import {get} from "svelte/store"
 import {partition, assoc, now, ago, MONTH} from "@welshman/lib"
 import {MESSAGE, DELETE, THREAD, COMMENT} from "@welshman/util"
 import type {Subscription} from "@welshman/net"
 import type {AppSyncOpts} from "@welshman/app"
 import {subscribe, repository, pull, hasNegentropy} from "@welshman/app"
-import {userRoomsByUrl, getEventsForUrl} from "@app/state"
+import {userRoomsByUrl, getUrlsForEvent} from "@app/state"
 
 // Utils
 
 export const pullConservatively = ({relays, filters}: AppSyncOpts) => {
+  const $getUrlsForEvent = get(getUrlsForEvent)
   const [smart, dumb] = partition(hasNegentropy, relays)
   const promises = [pull({relays: smart, filters})]
+  const allEvents = repository.query(filters, {shouldSort: false})
 
   // Since pulling from relays without negentropy is expensive, limit how many
   // duplicates we repeatedly download
   for (const url of dumb) {
-    const events = getEventsForUrl(repository, url, filters)
+    const events = allEvents.filter(e => $getUrlsForEvent(e.id).includes(url))
 
     if (events.length > 100) {
       filters = filters.map(assoc("since", events[10]!.created_at))