From c96cc28c33d687dbcbddf69972032c617be4b5f4 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Sun, 22 Oct 2023 23:36:18 -0300 Subject: [PATCH] fix ParentLink that was showing up all the time when it shouldn't. --- data.go | 10 ++++++---- render_event.go | 24 +++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data.go b/data.go index c31ca1c..32e1361 100644 --- a/data.go +++ b/data.go @@ -70,7 +70,7 @@ type Data struct { naddr string createdAt string modifiedAt string - parentNevent string + parentLink template.HTML metadata nostr.ProfileMetadata authorRelays []string authorLong string @@ -108,7 +108,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e author := event var renderableLastNotes []EnhancedEvent - parentNevent := "" + var parentLink template.HTML authorRelays := []string{} var content string var templateId TemplateID @@ -176,7 +176,9 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e case 1, 7, 30023, 30024: templateId = Note content = event.Content - parentNevent = getParentNevent(event) + if parentNevent := getParentNevent(event); parentNevent != "" { + parentLink = template.HTML(replaceNostrURLsWithTags(nostrNoteNeventMatcher, "nostr:"+parentNevent)) + } case 6: templateId = Note if reposted := event.Tags.GetFirst([]string{"e", ""}); reposted != nil { @@ -251,7 +253,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e authorRelays: authorRelays, createdAt: createdAt, modifiedAt: modifiedAt, - parentNevent: parentNevent, + parentLink: parentLink, metadata: metadata, authorLong: authorLong, authorShort: authorShort, diff --git a/render_event.go b/render_event.go index 6e67c75..0b6c71e 100644 --- a/render_event.go +++ b/render_event.go @@ -244,19 +244,17 @@ func renderEvent(w http.ResponseWriter, r *http.Request) { Clients: generateClientList(code, data.event), }, - AuthorLong: data.authorLong, - Content: template.HTML(data.content), - CreatedAt: data.createdAt, - Description: description, - Image: data.image, - Metadata: data.metadata, - Nevent: data.nevent, - Npub: data.npub, - NpubShort: data.npubShort, - Oembed: oembed, - ParentLink: template.HTML( - replaceNostrURLsWithTags(nostrNoteNeventMatcher, "nostr:"+data.parentNevent), - ), + AuthorLong: data.authorLong, + Content: template.HTML(data.content), + CreatedAt: data.createdAt, + Description: description, + Image: data.image, + Metadata: data.metadata, + Nevent: data.nevent, + Npub: data.npub, + NpubShort: data.npubShort, + Oembed: oembed, + ParentLink: data.parentLink, Proxy: "https://" + host + "/njump/proxy?src=", SeenOn: data.relays, Style: style,