Skip to content

Commit a3517c7

Browse files
committed
problem: replied event not added to bloom filter
1 parent 737d702 commit a3517c7

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

src/lib/snort_workers/master_worker.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ workerDataStore.subscribe((data) => {
3131
let fed = new FrontendData();
3232
fed.baseFollows = data.ourFollows;
3333
let roots: NostrEvent[] = [];
34+
let inBloom:string[] = []
3435
for (let r of data.roots) {
3536
if (!data.ourBloom.test(r)) {
3637
let re = data.events.get(r);
@@ -39,6 +40,7 @@ workerDataStore.subscribe((data) => {
3940
}
4041
roots.push(re!);
4142
} else {
43+
inBloom.push(r)
4244
//console.log(42)
4345
}
4446
}
@@ -59,6 +61,8 @@ workerDataStore.subscribe((data) => {
5961
fed.replies = data.replies;
6062
fed.events = data.events;
6163
fed._bloomString = JSON.stringify([].slice.call(data.ourBloom.buckets))
64+
let testbloom = new BloomFilter(JSON.parse(fed._bloomString), 32)
65+
//console.log(data.ourBloom.test(inBloom[0]), testbloom.test(inBloom[0]))
6266
fed.ourBloom = data.ourBloom;//new BloomFilter(JSON.parse(fed._bloomString), 32)
6367
postMessage(fed);
6468
end()

src/lib/snort_workers/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class tagSplits {
4949
unlabelled: Set<string>;
5050
unknown: Set<string>;
5151
All(): Set<string> {
52-
return new Set(...this.roots, this.replies, this.mentions, this.unlabelled, this.unknown);
52+
return new Set([...this.roots, ...this.replies, ...this.mentions, ...this.unlabelled, ...this.unknown]);
5353
}
5454
constructor(event: NostrEvent) {
5555
this.rawEvent = event;

src/lib/views/messages/Messages.svelte

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,24 @@
205205
><br />
206206
LOGGED IN AS: {$currentUser?.pubkey} <br />
207207
<Input bind:value={eventID} class="w-64" /><Button onClick={()=>{
208-
//let bloom = new BloomFilter(JSON.parse($FrontendDataStore._bloomString), 32)
209-
console.log($FrontendDataStore.ourBloom)
210-
if ($FrontendDataStore.ourBloom) {
211-
console.log(210)
212-
console.log(eventID)
213-
$FrontendDataStore.ourBloom.add("t")
214-
let result = $FrontendDataStore.ourBloom.test(eventID)
215-
console.log(213)
216-
console.log(214, result)
208+
let bloom = new BloomFilter(32 * 256, 32)
209+
bloom.add("12345")
210+
console.log(bloom.test("12345"))
211+
let testbloom = new BloomFilter(JSON.parse($FrontendDataStore._bloomString), 32)
212+
console.log(testbloom)
213+
for (let e of $stableShortList) {
214+
console.log(testbloom.test(e.id))
217215
}
216+
console.log(216, testbloom.test(eventID))
217+
// console.log($FrontendDataStore.ourBloom)
218+
// if ($FrontendDataStore.ourBloom) {
219+
// console.log(210)
220+
// console.log(eventID)
221+
// $FrontendDataStore.ourBloom.add("t")
222+
// let result = $FrontendDataStore.ourBloom.test(eventID)
223+
// console.log(213)
224+
// console.log(214, result)
225+
// }
218226
}}>Check if event is in bloom filter</Button><br />
219227
{$FrontendDataStore.ourBloom?.buckets.byteLength}
220228
</div>

0 commit comments

Comments
 (0)