aljaz/njump
1
0
Fork 0
mirror of https://github.com/aljazceru/njump.git synced 2025-12-18 23:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix ParentLink that was showing up all the time when it shouldn't.

Browse Source
This commit is contained in:
fiatjaf
2023-10-22 23:36:18 -03:00
parent e7af45bf23
commit c96cc28c33
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data.go
View File

@@ -70,7 +70,7 @@ type Data struct {
naddr string naddr string
createdAt string createdAt string
modifiedAt string modifiedAt string
parentNevent string parentLink template.HTML
metadata nostr.ProfileMetadata metadata nostr.ProfileMetadata
authorRelays []string authorRelays []string
authorLong string authorLong string
@@ -108,7 +108,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
author := event author := event
var renderableLastNotes []EnhancedEvent var renderableLastNotes []EnhancedEvent
parentNevent := "" var parentLink template.HTML
authorRelays := []string{} authorRelays := []string{}
var content string var content string
var templateId TemplateID var templateId TemplateID
@@ -176,7 +176,9 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
case 1, 7, 30023, 30024: case 1, 7, 30023, 30024:
templateId = Note templateId = Note
content = event.Content content = event.Content
parentNevent = getParentNevent(event) if parentNevent := getParentNevent(event); parentNevent != "" {
parentLink = template.HTML(replaceNostrURLsWithTags(nostrNoteNeventMatcher, "nostr:"+parentNevent))
}
case 6: case 6:
templateId = Note templateId = Note
if reposted := event.Tags.GetFirst([]string{"e", ""}); reposted != nil { 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, authorRelays: authorRelays,
createdAt: createdAt, createdAt: createdAt,
modifiedAt: modifiedAt, modifiedAt: modifiedAt,
parentNevent: parentNevent, parentLink: parentLink,
metadata: metadata, metadata: metadata,
authorLong: authorLong, authorLong: authorLong,
authorShort: authorShort, authorShort: authorShort,

24
render_event.go
View File

@@ -244,19 +244,17 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
Clients: generateClientList(code, data.event), Clients: generateClientList(code, data.event),
}, },
AuthorLong: data.authorLong, AuthorLong: data.authorLong,
Content: template.HTML(data.content), Content: template.HTML(data.content),
CreatedAt: data.createdAt, CreatedAt: data.createdAt,
Description: description, Description: description,
Image: data.image, Image: data.image,
Metadata: data.metadata, Metadata: data.metadata,
Nevent: data.nevent, Nevent: data.nevent,
Npub: data.npub, Npub: data.npub,
NpubShort: data.npubShort, NpubShort: data.npubShort,
Oembed: oembed, Oembed: oembed,
ParentLink: template.HTML( ParentLink: data.parentLink,
replaceNostrURLsWithTags(nostrNoteNeventMatcher, "nostr:"+data.parentNevent),
),
Proxy: "https://" + host + "/njump/proxy?src=", Proxy: "https://" + host + "/njump/proxy?src=",
SeenOn: data.relays, SeenOn: data.relays,
Style: style, Style: style,