a bunch of conversions and api tweaks on khatru and eventstore.

eventstore/cmd/eventstore/README.md

@@ -1,7 +1,7 @@
 # eventstore command-line tool
 
 ```
-go install github.com/fiatjaf/eventstore/cmd/eventstore@latest
+go install fiatjaf.com/nostr/eventstore/cmd/eventstore@latest
 ```
 
 ## Usage

eventstore/cmd/eventstore/main_mmm.go

@@ -3,13 +3,11 @@
 package main
 
 import (
-	"context"
 	"os"
 	"path/filepath"
 
 	"fiatjaf.com/nostr/eventstore"
 	"fiatjaf.com/nostr/eventstore/mmm"
-	"fiatjaf.com/nostr"
 	"github.com/rs/zerolog"
 )
 
@@ -24,9 +22,7 @@ func doMmmInit(path string) (eventstore.Store, error) {
 	if err := mmmm.Init(); err != nil {
 		return nil, err
 	}
-	il := &mmm.IndexingLayer{
-		ShouldIndex: func(ctx context.Context, e *nostr.Event) bool { return false },
-	}
+	il := &mmm.IndexingLayer{}
 	if err := mmmm.EnsureLayer(filepath.Base(path), il); err != nil {
 		return nil, err
 	}

eventstore/cmd/eventstore/neg.go

@@ -8,11 +8,11 @@ import (
 	"os"
 	"sync"
 
-	"github.com/urfave/cli/v3"
-	"github.com/mailru/easyjson"
 	"fiatjaf.com/nostr"
 	"fiatjaf.com/nostr/nip77/negentropy"
 	"fiatjaf.com/nostr/nip77/negentropy/storage/vector"
+	"github.com/mailru/easyjson"
+	"github.com/urfave/cli/v3"
 )
 
 var neg = &cli.Command{
@@ -44,11 +44,7 @@ var neg = &cli.Command{
 		// create negentropy object and initialize it with events
 		vec := vector.New()
 		neg := negentropy.New(vec, frameSizeLimit)
-		ch, err := db.QueryEvents(ctx, filter)
-		if err != nil {
-			return fmt.Errorf("error querying: %s\n", err)
-		}
-		for evt := range ch {
+		for evt := range db.QueryEvents(filter) {
 			vec.Insert(evt.CreatedAt, evt.ID)
 		}
 

eventstore/cmd/eventstore/query.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mailru/easyjson"
 	"fiatjaf.com/nostr"
+	"github.com/mailru/easyjson"
 	"github.com/urfave/cli/v3"
 )
 
@@ -25,14 +25,7 @@ var query = &cli.Command{
 				continue
 			}
 
-			ch, err := db.QueryEvents(ctx, filter)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "error querying: %s\n", err)
-				hasError = true
-				continue
-			}
-
-			for evt := range ch {
+			for evt := range db.QueryEvents(filter) {
 				fmt.Println(evt)
 			}
 		}

eventstore/cmd/eventstore/save.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/urfave/cli/v3"
-	"github.com/mailru/easyjson"
 	"fiatjaf.com/nostr"
+	"github.com/mailru/easyjson"
+	"github.com/urfave/cli/v3"
 )
 
 var save = &cli.Command{
@@ -25,7 +25,7 @@ var save = &cli.Command{
 				continue
 			}
 
-			if err := db.SaveEvent(ctx, &event); err != nil {
+			if err := db.SaveEvent(event); err != nil {
 				fmt.Fprintf(os.Stderr, "failed to save event '%s': %s\n", line, err)
 				hasError = true
 				continue