aljaz/rabbit
1
0
Fork 0
mirror of https://github.com/aljazceru/rabbit.git synced 2025-12-17 05:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: clear events when filter is updated

Browse Source
This commit is contained in:
Shusui MOYATANI
2024-02-13 12:36:35 +09:00
parent c5d25aed14
commit 5e8ce8e48a
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nostr/useSubscription.ts
View File

@@ -78,6 +78,12 @@ const useThrottledEvents = ({
}, 100);
};
const stopTimer = () => {
if (timeoutId != null) {
clearTimeout(timeoutId);
}
};
const addEvent = (event: NostrEvent) => {
const diffSec = event.created_at - epoch();
if (diffSec > SecondsToIgnore) return;
@@ -101,6 +107,11 @@ const useThrottledEvents = ({
}
};
const clearEvents = () => {
setEvents([]);
stopTimer();
};
createEffect(() => {
if (eose()) {
reflectDelayedEvents();
@@ -108,12 +119,10 @@ const useThrottledEvents = ({
});
onCleanup(() => {
if (timeoutId != null) {
clearTimeout(timeoutId);
}
stopTimer();
});
return { events, setEvents, addEvent };
return { events, setEvents, addEvent, clearEvents };
};
const useSubscription = (propsProvider: () => UseSubscriptionProps | null) => {
@@ -125,7 +134,11 @@ const useSubscription = (propsProvider: () => UseSubscriptionProps | null) => {
const eoseLimit = () => propsProvider()?.eoseLimit ?? 25;
const limit = () => propsProvider()?.limit ?? 50;
const { events, setEvents, addEvent } = useThrottledEvents({ eose, eoseLimit, limit });
const { events, addEvent, clearEvents, setEvents } = useThrottledEvents({
eose,
eoseLimit,
limit,
});
createEffect(
on(
@@ -161,6 +174,7 @@ const useSubscription = (propsProvider: () => UseSubscriptionProps | null) => {
let subscribing = true;
count += 1;
clearEvents();
setEose(false);
const sub = pool().subscribeMany(