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

fix slowness of previous refactors that injected nostr-sdk into this codebase + refactors.

Browse Source 
- adjusting many small things related to nostr-sdk usage
- fetching profiles in a smarter way
- decoupling the logic for rendering profile pages from the `grabData`/`getEvent` flow of other event pages.
- incorporating nostr-sdk more holistically, including more hints stuff
- improving nostr-sdk itself after some bugs and weird behaviors observed here
- set up opentelemetry (should probably remove this later)
This commit is contained in:
fiatjaf
2024-08-01 15:24:22 -03:00
parent 289d097078
commit c0004f67a2
19 changed files with 496 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
render_embedded.go
View File

@@ -6,6 +6,8 @@ import (
"net/http"
"github.com/a-h/templ"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
)
func renderEmbedjs(w http.ResponseWriter, r *http.Request) {
@@ -15,11 +17,16 @@ func renderEmbedjs(w http.ResponseWriter, r *http.Request) {
}
func renderEmbedded(w http.ResponseWriter, r *http.Request, code string) {
data, err := grabData(r.Context(), code, false)
ctx := r.Context()
ctx, span := tracer.Start(ctx, "render-embedded", trace.WithAttributes(attribute.String("code", code)))
defer span.End()
data, err := grabData(ctx, code)
if err != nil {
w.Header().Set("Cache-Control", "max-age=60")
w.WriteHeader(http.StatusNotFound)
errorTemplate(ErrorPageParams{Errors: err.Error()}).Render(r.Context(), w)
errorTemplate(ErrorPageParams{Errors: err.Error()}).Render(ctx, w)
return
}
@@ -36,7 +43,7 @@ func renderEmbedded(w http.ResponseWriter, r *http.Request, code string) {
// first we run basicFormatting, which turns URLs into their appropriate HTML tags
data.content = basicFormatting(html.EscapeString(data.content), true, false, false)
// then we render quotes as HTML, which will also apply basicFormatting to all the internal quotes
data.content = renderQuotesAsHTML(r.Context(), data.content, data.templateId == TelegramInstantView)
data.content = renderQuotesAsHTML(ctx, data.content, data.templateId == TelegramInstantView)
// we must do this because inside <blockquotes> we must treat <img>s differently when telegram_instant_view
}
@@ -56,7 +63,7 @@ func renderEmbedded(w http.ResponseWriter, r *http.Request, code string) {
Metadata: data.event.author,
NormalizedAuthorWebsiteURL: normalizeWebsiteURL(data.event.author.Website),
RenderedAuthorAboutText: template.HTML(basicFormatting(html.EscapeString(data.event.author.About), false, false, true)),
AuthorRelays: data.authorRelaysPretty(r.Context()),
AuthorRelays: relaysPretty(ctx, data.event.author.PubKey),
})
default:
log.Error().Int("templateId", int(data.templateId)).Msg("no way to render")
@@ -64,7 +71,7 @@ func renderEmbedded(w http.ResponseWriter, r *http.Request, code string) {
return
}
if err := component.Render(r.Context(), w); err != nil {
if err := component.Render(ctx, w); err != nil {
log.Warn().Err(err).Msg("error rendering tmpl")
}
return