From 08b07227eb739187935f4b79afc4a9da03a118c0 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Wed, 8 Nov 2023 18:51:23 -0300 Subject: [PATCH] fix getParentNevent() this would panic if we didn\'t have any relays in data.relays for the child. but also I think it wasn't a good idea to give spurious hints in the nevent. either we have good hints or we don't. --- data.go | 2 +- utils.go | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/data.go b/data.go index 2ca8aee..bacbbfe 100644 --- a/data.go +++ b/data.go @@ -211,7 +211,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e case 1, 7, 30023, 30024: data.templateId = Note data.content = event.Content - if parentNevent := getParentNevent(event, data.relays[0]); parentNevent != "" { + if parentNevent := getParentNevent(event); parentNevent != "" { data.parentLink = template.HTML(replaceNostrURLsWithTags(nostrNoteNeventMatcher, "nostr:"+parentNevent)) } case 6: diff --git a/utils.go b/utils.go index af5d2d6..3f61e20 100644 --- a/utils.go +++ b/utils.go @@ -175,19 +175,15 @@ func getPreviewStyle(r *http.Request) Style { } } -func getParentNevent(event *nostr.Event, fallbackRelay string) string { +func getParentNevent(event *nostr.Event) string { parentNevent := "" replyTag := nip10.GetImmediateReply(event.Tags) if replyTag != nil { - relay := "" + var relays []string if (len(*replyTag) > 2) && ((*replyTag)[2] != "") { - relay = (*replyTag)[2] - } else if fallbackRelay != "" { - relay = fallbackRelay - } else { - relay = getRandomRelay() + relays = []string{(*replyTag)[2]} } - parentNevent, _ = nip19.EncodeEvent((*replyTag)[1], []string{relay}, "") + parentNevent, _ = nip19.EncodeEvent((*replyTag)[1], relays, "") } return parentNevent }