From 65411a10c8ae6db0b4237646409a0432b89fe4f6 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Mon, 12 May 2025 06:12:58 -0300 Subject: [PATCH] eventstore: fix maxLimit handling when filter.Limit is unset. --- eventstore/badger/delete.go | 2 -- eventstore/badger/query.go | 2 +- eventstore/lmdb/query.go | 2 +- eventstore/mmm/query.go | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eventstore/badger/delete.go b/eventstore/badger/delete.go index 7741dab..e7fdc4f 100644 --- a/eventstore/badger/delete.go +++ b/eventstore/badger/delete.go @@ -12,8 +12,6 @@ import ( var serialDelete uint32 = 0 func (b *BadgerBackend) DeleteEvent(id nostr.ID) error { - fmt.Println("...", id) - deletionHappened := false err := b.Update(func(txn *badger.Txn) error { diff --git a/eventstore/badger/query.go b/eventstore/badger/query.go index f654375..ee10679 100644 --- a/eventstore/badger/query.go +++ b/eventstore/badger/query.go @@ -28,7 +28,7 @@ func (b *BadgerBackend) QueryEvents(filter nostr.Filter, maxLimit int) iter.Seq[ } else if tlimit < maxLimit { maxLimit = tlimit } - if filter.Limit < maxLimit { + if filter.Limit > 0 && filter.Limit < maxLimit { maxLimit = filter.Limit } diff --git a/eventstore/lmdb/query.go b/eventstore/lmdb/query.go index 7d95779..da387a4 100644 --- a/eventstore/lmdb/query.go +++ b/eventstore/lmdb/query.go @@ -26,7 +26,7 @@ func (b *LMDBBackend) QueryEvents(filter nostr.Filter, maxLimit int) iter.Seq[no } else if tlimit < maxLimit { maxLimit = tlimit } - if filter.Limit < maxLimit { + if filter.Limit > 0 && filter.Limit < maxLimit { maxLimit = filter.Limit } diff --git a/eventstore/mmm/query.go b/eventstore/mmm/query.go index f16b4b9..5d9c404 100644 --- a/eventstore/mmm/query.go +++ b/eventstore/mmm/query.go @@ -89,7 +89,7 @@ func (il *IndexingLayer) QueryEvents(filter nostr.Filter, maxLimit int) iter.Seq } else if tlimit < maxLimit { maxLimit = tlimit } - if filter.Limit < maxLimit { + if filter.Limit > 0 && filter.Limit < maxLimit { maxLimit = filter.Limit }