update go-nostr and deprecated tag methods.

Author: fiatjaf

data.go

@@ -72,9 +72,9 @@ func grabData(ctx context.Context, code string, withRelays bool) (Data, error) {
 	data.createdAt = time.Unix(int64(event.CreatedAt), 0).Format("2006-01-02 15:04:05 MST")
 
 	if event.Kind >= 30000 && event.Kind < 40000 {
-		if d := event.Tags.GetFirst([]string{"d", ""}); d != nil {
-			data.naddr, _ = nip19.EncodeEntity(event.PubKey, event.Kind, d.Value(), relaysForNip19)
-			data.naddrNaked, _ = nip19.EncodeEntity(event.PubKey, event.Kind, d.Value(), nil)
+		if dTag := event.Tags.Find("d"); dTag != nil {
+			data.naddr, _ = nip19.EncodeEntity(event.PubKey, event.Kind, dTag[1], relaysForNip19)
+			data.naddrNaked, _ = nip19.EncodeEntity(event.PubKey, event.Kind, dTag[1], nil)
 		}
 	}
 
@@ -92,8 +92,8 @@ func grabData(ctx context.Context, code string, withRelays bool) (Data, error) {
 		data.content = event.Content
 	case 6:
 		data.templateId = Note
-		if reposted := event.Tags.GetFirst([]string{"e", ""}); reposted != nil {
-			originalNevent, _ := nip19.EncodeEvent((*reposted)[1], []string{}, "")
+		if reposted := event.Tags.Find("e"); reposted != nil {
+			originalNevent, _ := nip19.EncodeEvent(reposted[1], []string{}, "")
 			data.content = "Repost of nostr:" + originalNevent
 		}
 	case 1063:
@@ -116,11 +116,14 @@ func grabData(ctx context.Context, code string, withRelays bool) (Data, error) {
 		data.content = event.Content
 	case 30818:
 		data.templateId = WikiEvent
-		data.Kind30818Metadata.Handle = event.Tags.GetFirst([]string{"d"}).Value()
-		data.Kind30818Metadata.Title = event.Tags.GetFirst([]string{"title"}).Value()
+		data.Kind30818Metadata.Handle = event.Tags.GetD()
+		data.Kind30818Metadata.Title = data.Kind30818Metadata.Handle
+		if titleTag := event.Tags.Find("title"); titleTag != nil {
+			data.Kind30818Metadata.Title = titleTag[1]
+		}
 		data.Kind30818Metadata.Summary = func() string {
-			if tag := event.Tags.GetFirst([]string{"summary"}); tag != nil {
-				value := tag.Value()
+			if tag := event.Tags.Find("summary"); tag != nil {
+				value := tag[1]
 				return value
 			}
 			return ""
@@ -136,9 +139,9 @@ func grabData(ctx context.Context, code string, withRelays bool) (Data, error) {
 	}
 	data.kindNIP = kindNIPs[event.Kind]
 
-	image := event.Tags.GetFirst([]string{"image", ""})
+	image := event.Tags.Find("image")
 	if event.Kind == 30023 && image != nil {
-		data.cover = (*image)[1]
+		data.cover = image[1]
 	} else if event.Kind == 1063 {
 		if data.kind1063Metadata.IsImage() {
 			data.image = data.kind1063Metadata.URL
@@ -160,8 +163,8 @@ func grabData(ctx context.Context, code string, withRelays bool) (Data, error) {
 			content.WriteString(data.content)
 			data.content = content.String()
 		}
-		if tag := data.event.Tags.GetFirst([]string{"title", ""}); tag != nil {
-			data.event.subject = (*tag)[1]
+		if tag := data.event.Tags.Find("title"); tag != nil {
+			data.event.subject = tag[1]
 		}
 	} else {
 		urls := urlMatcher.FindAllString(event.Content, -1)

enhanced_event.go

@@ -67,44 +67,17 @@ func (ee EnhancedEvent) getParentNevent() string {
 	parentNevent := ""
 	switch ee.Kind {
 	case 1, 1063:
-		replyTag := nip10.GetImmediateReply(ee.Tags)
-		if replyTag != nil {
-			var relays []string
-			if (len(*replyTag) > 2) && ((*replyTag)[2] != "") {
-				relays = []string{(*replyTag)[2]}
-			}
-			if (*replyTag)[0] == "a" { // reply to a ndaddr event
-				spl := strings.Split((*replyTag)[1], ":")
-				if len(spl) != 3 {
-					return ""
-				}
-				author := spl[1]
-				kind, _ := strconv.Atoi(spl[0])
-				identifier := spl[2]
-
-				var relays []string
-				if (len(*replyTag) > 2) && ((*replyTag)[2] != "") {
-					relays = []string{(*replyTag)[2]}
-				}
-
-				parentNevent, _ = nip19.EncodeEntity(
-					author,
-					kind,
-					identifier,
-					relays,
-				)
-			} else {
-				eventId := (*replyTag)[1]
-				parentNevent, _ = nip19.EncodeEvent(eventId, relays, "")
-			}
+		parent := nip10.GetImmediateParent(ee.Tags)
+		if parent != nil {
+			parentNevent = nip19.EncodePointer(parent)
 		}
 	case 1311:
-		if atag := ee.Tags.GetFirst([]string{"a", ""}); atag != nil {
-			parts := strings.Split((*atag)[1], ":")
+		if atag := ee.Tags.Find("a"); atag != nil {
+			parts := strings.Split(atag[1], ":")
 			kind, _ := strconv.Atoi(parts[0])
 			var relays []string
-			if (len(*atag) > 2) && ((*atag)[2] != "") {
-				relays = []string{(*atag)[2]}
+			if (len(atag) > 2) && (atag[2] != "") {
+				relays = []string{atag[2]}
 			}
 			parentNevent, _ = nip19.EncodeEntity(parts[1], kind, parts[2], relays)
 		}
@@ -114,7 +87,7 @@ func (ee EnhancedEvent) getParentNevent() string {
 }
 
 func (ee EnhancedEvent) isReply() bool {
-	return nip10.GetImmediateReply(ee.Event.Tags) != nil
+	return nip10.GetImmediateParent(ee.Event.Tags) != nil
 }
 
 func (ee EnhancedEvent) Preview() template.HTML {

go.mod

@@ -1,15 +1,15 @@
 module github.com/fiatjaf/njump
 
-go 1.23.1
+go 1.24.1
 
 require (
 	fiatjaf.com/leafdb v0.0.7
 	github.com/PuerkitoBio/goquery v1.10.1
 	github.com/a-h/templ v0.3.833
 	github.com/bytesparadise/libasciidoc v0.8.0
 	github.com/dgraph-io/ristretto v1.0.0
-	github.com/fiatjaf/eventstore v0.16.1
-	github.com/fiatjaf/khatru v0.15.0
+	github.com/fiatjaf/eventstore v0.16.4
+	github.com/fiatjaf/khatru v0.17.5
 	github.com/fogleman/gg v1.3.0
 	github.com/go-text/typesetting v0.0.0-20231221124458-48cc05a56658
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
@@ -18,7 +18,7 @@ require (
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/nbd-wtf/emoji v0.0.3
-	github.com/nbd-wtf/go-nostr v0.50.0
+	github.com/nbd-wtf/go-nostr v0.51.8
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/pelletier/go-toml v1.9.5
 	github.com/puzpuzpuz/xsync/v3 v3.5.1
@@ -35,6 +35,7 @@ require (
 
 require (
 	fiatjaf.com/lib v0.2.0 // indirect
+	github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 // indirect
 	github.com/PowerDNS/lmdb-go v1.9.3 // indirect
 	github.com/alecthomas/chroma/v2 v2.3.0 // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
@@ -44,8 +45,11 @@ require (
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
+	github.com/bytedance/sonic v1.13.2 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/coder/websocket v1.8.12 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/coder/websocket v1.8.13 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
@@ -59,10 +63,10 @@ require (
 	github.com/google/flatbuffers v24.12.23+incompatible // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
-	github.com/graph-gophers/dataloader/v7 v7.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -77,16 +81,18 @@ require (
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.58.0 // indirect
+	github.com/valyala/fasthttp v1.59.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
-	golang.org/x/mod v0.23.0 // indirect
-	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/tools v0.30.0 // indirect
+	golang.org/x/arch v0.15.0 // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )