a big bundle of conversions and other changes.

eventstore/badger/delete.go

@@ -1,22 +1,22 @@
 package badger
 
 import (
-	"context"
-	"encoding/hex"
+	"fmt"
 	"log"
 
-	"github.com/dgraph-io/badger/v4"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
+	"github.com/dgraph-io/badger/v4"
 )
 
 var serialDelete uint32 = 0
 
-func (b *BadgerBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
+func (b *BadgerBackend) DeleteEvent(id nostr.ID) error {
 	deletionHappened := false
 
 	err := b.Update(func(txn *badger.Txn) error {
 		var err error
-		deletionHappened, err = b.delete(txn, evt)
+		deletionHappened, err = b.delete(txn, id)
 		return err
 	})
 	if err != nil {
@@ -36,22 +36,30 @@ func (b *BadgerBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error
 	return nil
 }
 
-func (b *BadgerBackend) delete(txn *badger.Txn, evt *nostr.Event) (bool, error) {
+func (b *BadgerBackend) delete(txn *badger.Txn, id nostr.ID) (bool, error) {
 	idx := make([]byte, 1, 5)
 	idx[0] = rawEventStorePrefix
 
 	// query event by id to get its idx
-	idPrefix8, _ := hex.DecodeString(evt.ID[0 : 8*2])
 	prefix := make([]byte, 1+8)
 	prefix[0] = indexIdPrefix
-	copy(prefix[1:], idPrefix8)
+	copy(prefix[1:], id[0:8])
 	opts := badger.IteratorOptions{
 		PrefetchValues: false,
 	}
+
+	// also grab the actual event so we can calculate its indexes
+	var evt nostr.Event
+
 	it := txn.NewIterator(opts)
 	it.Seek(prefix)
 	if it.ValidForPrefix(prefix) {
 		idx = append(idx, it.Item().Key()[1+8:]...)
+		if err := it.Item().Value(func(val []byte) error {
+			return betterbinary.Unmarshal(val, &evt)
+		}); err != nil {
+			return false, fmt.Errorf("failed to unmarshal event %x to delete: %w", id[:], err)
+		}
 	}
 	it.Close()