userAdityaa/flotilla
1
0
Fork 0
forked from coracle/flotilla
Code Pull Requests Activity

Load messages more aggressively at the top level for all spaces

Browse Source
This commit is contained in:
Jon Staab
2024-12-30 15:15:22 -08:00
parent 7a17dc772f
commit 0c9109f387
2 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/requests.ts
+11 -28
View File
@@ -1,9 +1,9 @@
import {partition, assoc, now} from "@welshman/lib"
import {MESSAGE, REACTION, DELETE, THREAD, COMMENT} from "@welshman/util"
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, load, pull, hasNegentropy} from "@welshman/app"
import {userRoomsByUrl, LEGACY_MESSAGE, GENERAL, getEventsForUrl} from "@app/state"
import {subscribe, repository, pull, hasNegentropy} from "@welshman/app"
import {userRoomsByUrl, getEventsForUrl} from "@app/state"
// Utils
@@ -29,16 +29,15 @@ export const pullConservatively = ({relays, filters}: AppSyncOpts) => {
// Application requests
export const listenForNotifications = () => {
const since = now()
const subs: Subscription[] = []
for (const [url, rooms] of userRoomsByUrl.get()) {
load({
pullConservatively({
relays: [url],
filters: [
{kinds: [THREAD], limit: 1},
{kinds: [COMMENT], "#K": [String(THREAD)], limit: 1},
...Array.from(rooms).map(room => ({kinds: [MESSAGE], "#h": [room], limit: 1})),
{kinds: [THREAD, DELETE], since: ago(MONTH)},
{kinds: [COMMENT], "#K": [String(THREAD)], since: ago(MONTH)},
...Array.from(rooms).map(room => ({kinds: [MESSAGE], "#h": [room], since: ago(MONTH)})),
],
})
@@ -46,9 +45,9 @@ export const listenForNotifications = () => {
subscribe({
relays: [url],
filters: [
{kinds: [THREAD], since},
{kinds: [COMMENT], "#K": [String(THREAD)], since},
{kinds: [MESSAGE], "#h": Array.from(rooms), since},
{kinds: [THREAD], since: now()},
{kinds: [COMMENT], "#K": [String(THREAD)], since: now()},
{kinds: [MESSAGE], "#h": Array.from(rooms), since: now()},
],
}),
)
@@ -60,19 +59,3 @@ export const listenForNotifications = () => {
}
}
}
export const listenForChannelMessages = (url: string, room: string) => {
const since = now()
const relays = [url]
const kinds = [MESSAGE, REACTION, DELETE]
const legacyRoom = room === GENERAL ? "general" : room
// Load legacy immediate so our request doesn't get rejected by nip29 relays
load({relays, filters: [{kinds: [LEGACY_MESSAGE], "#~": [legacyRoom]}], delay: 0})
// Load historical state with negentropy if available
pullConservatively({relays, filters: [{kinds, "#h": [room]}]})
// Listen for new messages
return subscribe({relays, filters: [{kinds, "#h": [room], since}]})
}