convert to using nostrlib.

nostrfs/asyncfile.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
+	"fiatjaf.com/nostr"
 )
 
 type AsyncFile struct {

nostrfs/entitydir.go

@@ -15,14 +15,15 @@ import (
 	"unsafe"
 
 	"fiatjaf.com/lib/debouncer"
+	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/nip19"
+	"fiatjaf.com/nostr/nip27"
+	"fiatjaf.com/nostr/nip73"
+	"fiatjaf.com/nostr/nip92"
+	sdk "fiatjaf.com/nostr/sdk"
 	"github.com/fatih/color"
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/nip27"
-	"github.com/nbd-wtf/go-nostr/nip92"
-	sdk "github.com/nbd-wtf/go-nostr/sdk"
 )
 
 type EntityDir struct {
@@ -95,11 +96,10 @@ func (e *EntityDir) Setattr(_ context.Context, _ fs.FileHandle, in *fuse.SetAttr
 func (e *EntityDir) OnAdd(_ context.Context) {
 	log := e.root.ctx.Value("log").(func(msg string, args ...any))
 
-	npub, _ := nip19.EncodePublicKey(e.event.PubKey)
 	e.AddChild("@author", e.NewPersistentInode(
 		e.root.ctx,
 		&fs.MemSymlink{
-			Data: []byte(e.root.wd + "/" + npub),
+			Data: []byte(e.root.wd + "/" + nip19.EncodeNpub(e.event.PubKey)),
 		},
 		fs.StableAttr{Mode: syscall.S_IFLNK},
 	), true)
@@ -180,8 +180,12 @@ func (e *EntityDir) OnAdd(_ context.Context) {
 
 	var refsdir *fs.Inode
 	i := 0
-	for ref := range nip27.ParseReferences(*e.event) {
+	for ref := range nip27.Parse(e.event.Content) {
+		if _, isExternal := ref.Pointer.(nip73.ExternalPointer); isExternal {
+			continue
+		}
 		i++
+
 		if refsdir == nil {
 			refsdir = e.NewPersistentInode(e.root.ctx, &fs.Inode{}, fs.StableAttr{Mode: syscall.S_IFDIR})
 			e.root.AddChild("references", refsdir, true)
@@ -320,7 +324,11 @@ func (e *EntityDir) handleWrite() {
 		}
 
 		// add "p" tags from people mentioned and "q" tags from events mentioned
-		for ref := range nip27.ParseReferences(evt) {
+		for ref := range nip27.Parse(evt.Content) {
+			if _, isExternal := ref.Pointer.(nip73.ExternalPointer); isExternal {
+				continue
+			}
+
 			tag := ref.Pointer.AsTag()
 			key := tag[0]
 			val := tag[1]
@@ -339,7 +347,7 @@ func (e *EntityDir) handleWrite() {
 		}
 		logverbose("%s\n", evt)
 
-		relays := e.root.sys.FetchWriteRelays(e.root.ctx, e.root.rootPubKey, 8)
+		relays := e.root.sys.FetchWriteRelays(e.root.ctx, e.root.rootPubKey)
 		if len(relays) == 0 {
 			relays = e.root.sys.FetchOutboxRelays(e.root.ctx, e.root.rootPubKey, 6)
 		}

nostrfs/eventdir.go

@@ -3,6 +3,7 @@ package nostrfs
 import (
 	"bytes"
 	"context"
+	"encoding/binary"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -11,16 +12,16 @@ import (
 	"syscall"
 	"time"
 
+	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/nip10"
+	"fiatjaf.com/nostr/nip19"
+	"fiatjaf.com/nostr/nip22"
+	"fiatjaf.com/nostr/nip27"
+	"fiatjaf.com/nostr/nip73"
+	"fiatjaf.com/nostr/nip92"
+	sdk "fiatjaf.com/nostr/sdk"
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip10"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/nip22"
-	"github.com/nbd-wtf/go-nostr/nip27"
-	"github.com/nbd-wtf/go-nostr/nip73"
-	"github.com/nbd-wtf/go-nostr/nip92"
-	sdk "github.com/nbd-wtf/go-nostr/sdk"
 )
 
 type EventDir struct {
@@ -58,14 +59,13 @@ func (r *NostrRoot) CreateEventDir(
 	h := parent.EmbeddedInode().NewPersistentInode(
 		r.ctx,
 		&EventDir{ctx: r.ctx, wd: r.wd, evt: event},
-		fs.StableAttr{Mode: syscall.S_IFDIR, Ino: hexToUint64(event.ID)},
+		fs.StableAttr{Mode: syscall.S_IFDIR, Ino: binary.BigEndian.Uint64(event.ID[8:16])},
 	)
 
-	npub, _ := nip19.EncodePublicKey(event.PubKey)
 	h.AddChild("@author", h.NewPersistentInode(
 		r.ctx,
 		&fs.MemSymlink{
-			Data: []byte(r.wd + "/" + npub),
+			Data: []byte(r.wd + "/" + nip19.EncodeNpub(event.PubKey)),
 		},
 		fs.StableAttr{Mode: syscall.S_IFLNK},
 	), true)
@@ -88,7 +88,7 @@ func (r *NostrRoot) CreateEventDir(
 	h.AddChild("id", h.NewPersistentInode(
 		r.ctx,
 		&fs.MemRegularFile{
-			Data: []byte(event.ID),
+			Data: []byte(event.ID.Hex()),
 			Attr: fuse.Attr{
 				Mode:  0444,
 				Ctime: uint64(event.CreatedAt),
@@ -115,8 +115,12 @@ func (r *NostrRoot) CreateEventDir(
 
 	var refsdir *fs.Inode
 	i := 0
-	for ref := range nip27.ParseReferences(*event) {
+	for ref := range nip27.Parse(event.Content) {
+		if _, isExternal := ref.Pointer.(nip73.ExternalPointer); isExternal {
+			continue
+		}
 		i++
+
 		if refsdir == nil {
 			refsdir = h.NewPersistentInode(r.ctx, &fs.Inode{}, fs.StableAttr{Mode: syscall.S_IFDIR})
 			h.AddChild("references", refsdir, true)

nostrfs/helpers.go

@@ -1,8 +1,10 @@
 package nostrfs
 
-import "strconv"
+import (
+	"fiatjaf.com/nostr"
+)
 
-func kindToExtension(kind int) string {
+func kindToExtension(kind nostr.Kind) string {
 	switch kind {
 	case 30023:
 		return "md"
@@ -12,8 +14,3 @@ func kindToExtension(kind int) string {
 		return "txt"
 	}
 }
-
-func hexToUint64(hexStr string) uint64 {
-	v, _ := strconv.ParseUint(hexStr[16:32], 16, 64)
-	return v
-}

nostrfs/npubdir.go

@@ -3,6 +3,7 @@ package nostrfs
 import (
 	"bytes"
 	"context"
+	"encoding/binary"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -10,12 +11,12 @@ import (
 	"syscall"
 	"time"
 
+	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/nip19"
 	"github.com/fatih/color"
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
 	"github.com/liamg/magic"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip19"
 )
 
 type NpubDir struct {
@@ -36,7 +37,7 @@ func (r *NostrRoot) CreateNpubDir(
 	return parent.EmbeddedInode().NewPersistentInode(
 		r.ctx,
 		npubdir,
-		fs.StableAttr{Mode: syscall.S_IFDIR, Ino: hexToUint64(pointer.PublicKey)},
+		fs.StableAttr{Mode: syscall.S_IFDIR, Ino: binary.BigEndian.Uint64(pointer.PublicKey[8:16])},
 	)
 }
 
@@ -49,7 +50,7 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 
 	h.AddChild("pubkey", h.NewPersistentInode(
 		h.root.ctx,
-		&fs.MemRegularFile{Data: []byte(h.pointer.PublicKey + "\n"), Attr: fuse.Attr{Mode: 0444}},
+		&fs.MemRegularFile{Data: []byte(h.pointer.PublicKey.Hex() + "\n"), Attr: fuse.Attr{Mode: 0444}},
 		fs.StableAttr{},
 	), true)
 
@@ -116,8 +117,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{1},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{1},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    true,
 					relays:      relays,
@@ -138,8 +139,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{1111},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{1111},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    true,
 					relays:      relays,
@@ -159,8 +160,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{20},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{20},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    true,
 					relays:      relays,
@@ -180,8 +181,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{21, 22},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{21, 22},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    false,
 					relays:      relays,
@@ -201,8 +202,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{9802},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{9802},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    false,
 					relays:      relays,
@@ -222,8 +223,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{30023},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{30023},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    false,
 					relays:      relays,
@@ -244,8 +245,8 @@ func (h *NpubDir) OnAdd(_ context.Context) {
 				&ViewDir{
 					root: h.root,
 					filter: nostr.Filter{
-						Kinds:   []int{30818},
-						Authors: []string{h.pointer.PublicKey},
+						Kinds:   []nostr.Kind{30818},
+						Authors: []nostr.PubKey{h.pointer.PublicKey},
 					},
 					paginate:    false,
 					relays:      relays,

nostrfs/root.go

@@ -6,12 +6,12 @@ import (
 	"syscall"
 	"time"
 
+	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/nip05"
+	"fiatjaf.com/nostr/nip19"
+	"fiatjaf.com/nostr/sdk"
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip05"
-	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/nbd-wtf/go-nostr/sdk"
 )
 
 type Options struct {
@@ -25,7 +25,7 @@ type NostrRoot struct {
 	ctx        context.Context
 	wd         string
 	sys        *sdk.System
-	rootPubKey string
+	rootPubKey nostr.PubKey
 	signer     nostr.Signer
 
 	opts Options
@@ -54,7 +54,7 @@ func NewNostrRoot(ctx context.Context, sys *sdk.System, user nostr.User, mountpo
 }
 
 func (r *NostrRoot) OnAdd(_ context.Context) {
-	if r.rootPubKey == "" {
+	if r.rootPubKey == nostr.ZeroPK {
 		return
 	}
 
@@ -65,16 +65,15 @@ func (r *NostrRoot) OnAdd(_ context.Context) {
 		fl := r.sys.FetchFollowList(r.ctx, r.rootPubKey)
 		for _, f := range fl.Items {
 			pointer := nostr.ProfilePointer{PublicKey: f.Pubkey, Relays: []string{f.Relay}}
-			npub, _ := nip19.EncodePublicKey(f.Pubkey)
 			r.AddChild(
-				npub,
+				nip19.EncodeNpub(f.Pubkey),
 				r.CreateNpubDir(r, pointer, nil),
 				true,
 			)
 		}
 
 		// add ourselves
-		npub, _ := nip19.EncodePublicKey(r.rootPubKey)
+		npub := nip19.EncodeNpub(r.rootPubKey)
 		if r.GetChild(npub) == nil {
 			pointer := nostr.ProfilePointer{PublicKey: r.rootPubKey}
 

nostrfs/viewdir.go

@@ -8,11 +8,12 @@ import (
 	"syscall"
 
 	"fiatjaf.com/lib/debouncer"
+	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/nip27"
+	"fiatjaf.com/nostr/nip73"
 	"github.com/fatih/color"
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
-	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nip27"
 )
 
 type ViewDir struct {
@@ -141,13 +142,17 @@ func (n *ViewDir) publishNote() {
 	}
 
 	// our write relays
-	relays := n.root.sys.FetchWriteRelays(n.root.ctx, n.root.rootPubKey, 8)
+	relays := n.root.sys.FetchWriteRelays(n.root.ctx, n.root.rootPubKey)
 	if len(relays) == 0 {
 		relays = n.root.sys.FetchOutboxRelays(n.root.ctx, n.root.rootPubKey, 6)
 	}
 
 	// add "p" tags from people mentioned and "q" tags from events mentioned
-	for ref := range nip27.ParseReferences(evt) {
+	for ref := range nip27.Parse(evt.Content) {
+		if _, isExternal := ref.Pointer.(nip73.ExternalPointer); isExternal {
+			continue
+		}
+
 		tag := ref.Pointer.AsTag()
 		key := tag[0]
 		val := tag[1]
@@ -159,7 +164,12 @@ func (n *ViewDir) publishNote() {
 
 			// add their "read" relays
 			if key == "p" {
-				for _, r := range n.root.sys.FetchInboxRelays(n.root.ctx, val, 4) {
+				pk, err := nostr.PubKeyFromHex(val)
+				if err != nil {
+					continue
+				}
+
+				for _, r := range n.root.sys.FetchInboxRelays(n.root.ctx, pk, 4) {
 					if !slices.Contains(relays, r) {
 						relays = append(relays, r)
 					}
@@ -196,8 +206,8 @@ func (n *ViewDir) publishNote() {
 
 	if success {
 		n.RmChild("new")
-		n.AddChild(evt.ID, n.root.CreateEventDir(n, &evt), true)
-		log("event published as %s and updated locally.\n", color.BlueString(evt.ID))
+		n.AddChild(evt.ID.Hex(), n.root.CreateEventDir(n, &evt), true)
+		log("event published as %s and updated locally.\n", color.BlueString(evt.ID.Hex()))
 	}
 }
 
@@ -241,23 +251,24 @@ func (n *ViewDir) Opendir(ctx context.Context) syscall.Errno {
 	}
 
 	if n.replaceable {
-		for rkey, evt := range n.root.sys.Pool.FetchManyReplaceable(n.root.ctx, n.relays, n.filter,
-			nostr.WithLabel("nakfs"),
-		).Range {
+		for rkey, evt := range n.root.sys.Pool.FetchManyReplaceable(n.root.ctx, n.relays, n.filter, nostr.SubscriptionOptions{
+			Label: "nakfs",
+		}).Range {
 			name := rkey.D
 			if name == "" {
 				name = "_"
 			}
 			if n.GetChild(name) == nil {
-				n.AddChild(name, n.root.CreateEntityDir(n, evt), true)
+				n.AddChild(name, n.root.CreateEntityDir(n, &evt), true)
 			}
 		}
 	} else {
 		for ie := range n.root.sys.Pool.FetchMany(n.root.ctx, n.relays, n.filter,
-			nostr.WithLabel("nakfs"),
-		) {
-			if n.GetChild(ie.Event.ID) == nil {
-				n.AddChild(ie.Event.ID, n.root.CreateEventDir(n, ie.Event), true)
+			nostr.SubscriptionOptions{
+				Label: "nakfs",
+			}) {
+			if n.GetChild(ie.Event.ID.Hex()) == nil {
+				n.AddChild(ie.Event.ID.Hex(), n.root.CreateEventDir(n, &ie.Event), true)
 			}
 		}
 	}