aljaz/njump
1
0
Fork 0
mirror of https://github.com/aljazceru/njump.git synced 2025-12-17 06:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

use naddr as code in client urls when param-replaceable and fix relay filtering for nip19.

Browse Source 
fixes https://github.com/fiatjaf/njump/issues/14
This commit is contained in:
fiatjaf
2023-11-07 07:18:23 -03:00
parent 74ec67c669
commit 9f0b3fa4af
4 changed files with 103 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
utils.go
View File

@@ -8,6 +8,7 @@ import (
"html/template"
"io"
"net/http"
"net/url"
"regexp"
"strings"
"time"
@@ -118,67 +119,6 @@ var kindNIPs = map[int]string{
30078: "78",
}
type ClientReference struct {
ID string
Name string
URL template.URL
}
func generateClientList(style Style, code string, event *nostr.Event) []ClientReference {
if event.Kind == 1 || event.Kind == 6 {
return []ClientReference{
{ID: "native", Name: "your native client", URL: template.URL("nostr:" + code)},
{ID: "snort", Name: "Snort", URL: template.URL("https://Snort.social/e/" + code)},
{ID: "nostrudel", Name: "Nostrudel", URL: template.URL("https://nostrudel.ninja/#/n/" + code)},
{ID: "satellite", Name: "Satellite", URL: template.URL("https://satellite.earth/thread/" + event.ID)},
{ID: "coracle", Name: "Coracle", URL: template.URL("https://coracle.social/" + code)},
{ID: "primal", Name: "Primal", URL: template.URL("https://primal.net/thread/" + event.ID)},
{ID: "nostter", Name: "Nostter", URL: template.URL("https://nostter.vercel.app/" + code)},
{ID: "highlighter", Name: "Highlighter", URL: template.URL("https://highlighter.com/a/" + code)},
{ID: "iris", Name: "Iris", URL: template.URL("https://iris.to/" + code)},
}
} else if event.Kind == 0 {
return []ClientReference{
{ID: "native", Name: "your native client", URL: template.URL("nostr:" + code)},
{ID: "nosta", Name: "Nosta", URL: template.URL("https://nosta.me/" + code)},
{ID: "snort", Name: "Snort", URL: template.URL("https://snort.social/p/" + code)},
{ID: "satellite", Name: "Satellite", URL: template.URL("https://satellite.earth/@" + code)},
{ID: "coracle", Name: "Coracle", URL: template.URL("https://coracle.social/" + code)},
{ID: "primal", Name: "Primal", URL: template.URL("https://primal.net/profile/" + event.PubKey)},
{ID: "nostrudel", Name: "Nostrudel", URL: template.URL("https://nostrudel.ninja/#/u/" + code)},
{ID: "nostter", Name: "Nostter", URL: template.URL("https://nostter.vercel.app/" + code)},
{ID: "iris", Name: "Iris", URL: template.URL("https://iris.to/" + code)},
}
} else if event.Kind == 30023 || event.Kind == 30024 {
return []ClientReference{
{ID: "native", Name: "your native client", URL: template.URL("nostr:" + code)},
{ID: "yakihonne", Name: "YakiHonne", URL: template.URL("https://yakihonne.com/article/" + code)},
{ID: "habla", Name: "Habla", URL: template.URL("https://habla.news/a/" + code)},
{ID: "highlighter", Name: "Highlighter", URL: template.URL("https://highlighter.com/a/" + code)},
{ID: "blogstack", Name: "Blogstack", URL: template.URL("https://blogstack.io/" + code)},
}
} else if event.Kind == 1063 {
return []ClientReference{
{ID: "native", Name: "your native client", URL: template.URL("nostr:" + code)},
{ID: "snort", Name: "Snort", URL: template.URL("https://snort.social/p/" + code)},
{ID: "coracle", Name: "Coracle", URL: template.URL("https://coracle.social/" + code)},
}
} else if event.Kind == 30311 {
return []ClientReference{
{ID: "native", Name: "your native client", URL: template.URL("nostr:" + code)},
{ID: "zap.stream", Name: "zap.stream", URL: template.URL("https://zap.stream/" + code)},
{ID: "nostrudel", Name: "Nostrudel", URL: template.URL("https://nostrudel.ninja/#/streams/" + code)},
}
}
return nil
}
func generateRelayBrowserClientList(host string) []ClientReference {
return []ClientReference{
{ID: "coracle", Name: "Coracle", URL: template.URL("https://coracle.social/relays/" + host)},
}
}
type Style string
const (
@@ -567,3 +507,22 @@ func humanDate(createdAt nostr.Timestamp) string {
return ts.UTC().Format("Mon, Jan _2 15:04 UTC")
}
}
func shouldUseRelayForNip19(relayUrl string) bool {
for _, excluded := range excludedRelays {
if strings.Contains(relayUrl, excluded) {
return false
}
}
urlp, err := url.Parse(relayUrl)
if err != nil {
return false
}
if urlp.Scheme != "wss" && urlp.Scheme != "ws" {
return false
}
if urlp.Path != "" && urlp.Path != "/" {
return false
}
return true
}