eventstore: QueryEvents() to take a maxLimit param now so everything is clearer.

eventstore/badger/lib.go

@@ -27,8 +27,6 @@ var _ eventstore.Store = (*BadgerBackend)(nil)
 
 type BadgerBackend struct {
 	Path                  string
-	MaxLimit              int
-	MaxLimitNegentropy    int
 	BadgerOptionsModifier func(badger.Options) badger.Options
 
 	// Experimental
@@ -57,15 +55,6 @@ func (b *BadgerBackend) Init() error {
 		return fmt.Errorf("error running migrations: %w", err)
 	}
 
-	if b.MaxLimit != 0 {
-		b.MaxLimitNegentropy = b.MaxLimit
-	} else {
-		b.MaxLimit = 1000
-		if b.MaxLimitNegentropy == 0 {
-			b.MaxLimitNegentropy = 16777216
-		}
-	}
-
 	if err := b.DB.View(func(txn *badger.Txn) error {
 		it := txn.NewIterator(badger.IteratorOptions{
 			Prefix:  []byte{0},

eventstore/badger/query.go

@@ -16,26 +16,25 @@ import (
 
 var batchFilled = errors.New("batch-filled")
 
-func (b *BadgerBackend) QueryEvents(filter nostr.Filter) iter.Seq[nostr.Event] {
+func (b *BadgerBackend) QueryEvents(filter nostr.Filter, maxLimit int) iter.Seq[nostr.Event] {
 	return func(yield func(nostr.Event) bool) {
 		if filter.Search != "" {
 			return
 		}
 
 		// max number of events we'll return
-		limit := b.MaxLimit / 4
-		if filter.Limit > 0 && filter.Limit <= b.MaxLimit {
-			limit = filter.Limit
-		}
-		if tlimit := nostr.GetTheoreticalLimit(filter); tlimit == 0 {
+		if tlimit := filter.GetTheoreticalLimit(); tlimit == 0 || filter.LimitZero {
 			return
-		} else if tlimit > 0 {
-			limit = tlimit
+		} else if tlimit < maxLimit {
+			maxLimit = tlimit
+		}
+		if filter.Limit < maxLimit {
+			maxLimit = filter.Limit
 		}
 
 		// fmt.Println("limit", limit)
 		b.View(func(txn *badger.Txn) error {
-			results, err := b.query(txn, filter, limit)
+			results, err := b.query(txn, filter, maxLimit)
 			if err != nil {
 				return err
 			}