fetch: more places to fetch relay lists from.

Fix tags with values containing =
remove .scalafmt.conf
2025-12-08 16:48:51 +00:00 · 2024-01-02 11:05:43 -03:00 · 2023-12-24 09:29:29 -03:00 · 2023-12-23 21:30:58 -03:00 · 2023-12-15 11:15:12 -03:00 · 2023-12-13 20:48:01 -03:00
7 changed files with 13 additions and 12 deletions
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,2 +0,0 @@
-version = 3.5.8
-runner.dialect = scala3
--- a/count.go
+++ b/count.go
@@ -78,7 +78,7 @@ var count = &cli.Command{

 		tags := make([][]string, 0, 5)
 		for _, tagFlag := range c.StringSlice("tag") {
-			spl := strings.Split(tagFlag, "=")
+			spl := strings.SplitN(tagFlag, "=", 2)
 			if len(spl) == 2 && len(spl[0]) == 1 {
 				tags = append(tags, spl)
 			} else {
--- a/event.go
+++ b/event.go
@@ -153,12 +153,12 @@ example:
 			tags := make(nostr.Tags, 0, 5)
 			for _, tagFlag := range c.StringSlice("tag") {
 				// tags are in the format key=value
-				spl := strings.Split(tagFlag, "=")
-				if len(spl) == 2 && len(spl[0]) > 0 {
-					tag := nostr.Tag{spl[0]}
+				tagName, tagValue, found := strings.Cut(tagFlag, "=")
+				tag := []string{tagName}
+				if found {
 					// tags may also contain extra elements separated with a ";"
-					spl2 := strings.Split(spl[1], ";")
-					tag = append(tag, spl2...)
+					tagValues := strings.Split(tagValue, ";")
+					tag = append(tag, tagValues...)
 					// ~
 					tags = append(tags, tag)
 				}
--- a/example_test.go
+++ b/example_test.go
@@ -7,9 +7,9 @@ func ExampleEventBasic() {
 }

 func ExampleEventComplex() {
-	app.Run([]string{"nak", "event", "--ts", "1699485669", "-k", "11", "-c", "skjdbaskd", "--sec", "17", "-t", "t=spam", "-e", "36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c", "-t", "r=https://abc.def;nothing"})
+	app.Run([]string{"nak", "event", "--ts", "1699485669", "-k", "11", "-c", "skjdbaskd", "--sec", "17", "-t", "t=spam", "-e", "36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c", "-t", "r=https://abc.def?name=foobar;nothing"})
 	// Output:
-	// {"id":"aec4de6d051a7c2b6ca2d087903d42051a31e07fb742f1240970084822de10a6","pubkey":"2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f","created_at":1699485669,"kind":11,"tags":[["t","spam"],["r","https://abc.def","nothing"],["e","36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c"]],"content":"skjdbaskd","sig":"1165ac7a27d774d351ef19c8e918fb22f4005fcba193976c3d7edba6ef87ead7f14467f376a9e199f8371835368d86a8506f591e382528d00287fb168a7b8f38"}
+	// {"id":"19aba166dcf354bf5ef64f4afe69ada1eb851495001ee05e07d393ee8c8ea179","pubkey":"2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f","created_at":1699485669,"kind":11,"tags":[["t","spam"],["r","https://abc.def?name=foobar","nothing"],["e","36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c"]],"content":"skjdbaskd","sig":"cf452def4a68341c897c3fc96fa34dc6895a5b8cc266d4c041bcdf758ec992ec5adb8b0179e98552aaaf9450526a26d7e62e413b15b1c57e0cfc8db6b29215d7"}
 }

 func ExampleReq() {
--- a/fetch.go
+++ b/fetch.go
@@ -70,7 +70,8 @@ var fetch = &cli.Command{
 			pool := nostr.NewSimplePool(c.Context)
 			if authorHint != "" {
 				relayList := sdk.FetchRelaysForPubkey(c.Context, pool, authorHint,
-					"wss://purplepag.es", "wss://offchain.pub", "wss://public.relaying.io")
+					"wss://purplepag.es", "wss://relay.damus.io", "wss://relay.noswhere.com",
+					"wss://nos.lol", "wss://public.relaying.io", "wss://relay.nostr.band")
 				for _, relayListItem := range relayList {
 					if relayListItem.Outbox {
 						relays = append(relays, relayListItem.URL)
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.21.0
 require (
 	github.com/bgentry/speakeasy v0.1.0
 	github.com/mailru/easyjson v0.7.7
-	github.com/nbd-wtf/go-nostr v0.27.0
+	github.com/nbd-wtf/go-nostr v0.27.2
 	github.com/nbd-wtf/nostr-sdk v0.0.5
 	github.com/urfave/cli/v2 v2.25.7
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,8 @@ github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYt
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/nbd-wtf/go-nostr v0.27.0 h1:h6JmMMmfNcAORTL2kk/K3+U6Mju6rk/IjcHA/PMeOc8=
 github.com/nbd-wtf/go-nostr v0.27.0/go.mod h1:bkffJI+x914sPQWum9ZRUn66D7NpDnAoWo1yICvj3/0=
+github.com/nbd-wtf/go-nostr v0.27.2 h1:RImJfo8IgOK2rgGNif2FHFXq4sjNwzeZILUp9JGtQDg=
+github.com/nbd-wtf/go-nostr v0.27.2/go.mod h1:e5WOFsKEpslDOxIgK00NqemH7KuAvKIW6sBXeJYCfUs=
 github.com/nbd-wtf/nostr-sdk v0.0.5 h1:rec+FcDizDVO0W25PX0lgYMXvP7zNNOgI3Fu9UCm4BY=
 github.com/nbd-wtf/nostr-sdk v0.0.5/go.mod h1:iJJsikesCGLNFZ9dLqhLPDzdt924EagUmdQxT3w2Lmk=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Author	SHA1	Message	Date
fiatjaf	16c1e795bd	fetch: more places to fetch relay lists from.	2024-01-02 11:05:43 -03:00
OHASHI Hideya	8373da647e	Fix tags with values containing =	2023-12-24 09:29:29 -03:00
fiatjaf	f295f130f2	remove .scalafmt.conf	2023-12-23 21:30:58 -03:00
fiatjaf	5415fd369c	update go-nostr to fix pool infinite loop.	2023-12-15 11:15:12 -03:00
Daniel Cadenas	f35cb4bd1d	Fix tags with values containing =	2023-12-13 20:48:01 -03:00