sigit/sigit.io
7
2
Fork 0
Code Issues 51 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'staging' into 196-ext-login-infinite-loading
All checks were successful
Open PR on Staging / audit_and_check (pull_request) Successful in 33s
Details

Browse Source
This commit is contained in:
b 2024-09-16 11:45:22 +00:00
commit 5a2a0ad9c4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/layouts/Main.tsx
View File

@ -109,6 +109,7 @@ export const MainLayout = () => {
if (pubkey && !hasSubscribed.current) { if (pubkey && !hasSubscribed.current) {
// Call `subscribeForSigits` only if it hasn't been called before // Call `subscribeForSigits` only if it hasn't been called before
// #193 disabled websocket subscribtion, until #194 is done
subscribeForSigits(pubkey) subscribeForSigits(pubkey)
// Mark `subscribeForSigits` as called // Mark `subscribeForSigits` as called

15
src/utils/nostr.ts
View File

@ -859,9 +859,16 @@ export const subscribeForSigits = async (pubkey: string) => {
'#p': [pubkey] '#p': [pubkey]
} }
relayController.subscribeForEvents(filter, relaySet.read, (event) => { // Process the received event synchronously
processReceivedEvent(event) // Process the received event const events = await relayController.fetchEvents(filter, relaySet.read)
}) for (const e of events) {
await processReceivedEvent(e)
}
// Async processing of the events has a race condition
// relayController.subscribeForEvents(filter, relaySet.read, (event) => {
// processReceivedEvent(event)
// })
} }
const processReceivedEvent = async (event: Event, difficulty: number = 5) => { const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
@ -907,7 +914,7 @@ const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
if (!meta) return if (!meta) return
updateUsersAppData(meta) await updateUsersAppData(meta)
} }
/** /**