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

encode displayed nevent with seen-on relays.

Browse Source 
fixes https://github.com/fiatjaf/njump/issues/7
This commit is contained in:
fiatjaf
2023-10-10 13:52:14 -03:00
parent c7b7351d5b
commit fe646af02c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
data.go
View File

@@ -54,8 +54,16 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
return nil, err return nil, err
} }
relaysForNip19 := make([]string, 0, 3)
for i, relay := range relays {
relaysForNip19 = append(relaysForNip19, relay)
if i == 2 {
break
}
}
npub, _ := nip19.EncodePublicKey(event.PubKey) npub, _ := nip19.EncodePublicKey(event.PubKey)
nevent, _ := nip19.EncodeEvent(event.ID, []string{}, event.PubKey) nevent, _ := nip19.EncodeEvent(event.ID, relaysForNip19, event.PubKey)
naddr := "" naddr := ""
createdAt := time.Unix(int64(event.CreatedAt), 0).Format("2006-01-02 15:04:05") createdAt := time.Unix(int64(event.CreatedAt), 0).Format("2006-01-02 15:04:05")
modifiedAt := time.Unix(int64(event.CreatedAt), 0).Format("2006-01-02T15:04:05Z07:00") modifiedAt := time.Unix(int64(event.CreatedAt), 0).Format("2006-01-02T15:04:05Z07:00")
@@ -75,7 +83,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
} }
} }
if strings.Contains(relay, "/npub1") { if strings.Contains(relay, "/npub1") {
continue // Skip relays with personalyzed query like filter.nostr.wine continue // skip relays with personalyzed query like filter.nostr.wine
} }
eventRelays = append(eventRelays, trimProtocol(relay)) eventRelays = append(eventRelays, trimProtocol(relay))
} }
@@ -105,7 +113,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
} }
} }
if strings.Contains(relay, "/npub1") { if strings.Contains(relay, "/npub1") {
continue // Skip relays with personalyzed query like filter.nostr.wine continue // skip relays with personalyzed query like filter.nostr.wine
} }
authorRelays = append(authorRelays, trimProtocol(relay)) authorRelays = append(authorRelays, trimProtocol(relay))
} }
@@ -150,7 +158,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
if event.Kind >= 30000 && event.Kind < 40000 { if event.Kind >= 30000 && event.Kind < 40000 {
typ = "address" typ = "address"
if d := event.Tags.GetFirst([]string{"d", ""}); d != nil { if d := event.Tags.GetFirst([]string{"d", ""}); d != nil {
naddr, _ = nip19.EncodeEntity(event.PubKey, event.Kind, d.Value(), []string{}) naddr, _ = nip19.EncodeEntity(event.PubKey, event.Kind, d.Value(), relaysForNip19)
} }
} else { } else {
typ = "other" typ = "other"

2
templates/details.html
View File

@@ -12,7 +12,7 @@
</div> </div>
<div class="field {{if not ( or (eq .type "other") (eq .type "address"))}}advanced{{end}}"> <div class="field {{if not ( or (eq .type "other") (eq .type "address"))}}advanced{{end}}">
<div class="label">Nevent</div> <div class="label">Address Code</div>
<div>{{.nevent}}</div> <div>{{.nevent}}</div>
</div> </div>