turn kind1063Metadata into a struct.

This commit is contained in:
fiatjaf
2023-10-30 22:28:33 -03:00
parent f3997b78ae
commit 2fecd4e5f2
3 changed files with 80 additions and 53 deletions

View File

@@ -231,10 +231,10 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
SeenOn: data.relays,
Npub: data.npub,
Nprofile: data.nprofile,
Magnet: data.kind1063Metadata["magnet"],
Dim: data.kind1063Metadata["dim"],
Size: data.kind1063Metadata["size"],
Summary: data.kind1063Metadata["summary"],
Magnet: data.kind1063Metadata.magnet,
Dim: data.kind1063Metadata.dim,
Size: data.kind1063Metadata.size,
Summary: data.kind1063Metadata.summary,
}
switch data.templateId {
@@ -285,7 +285,7 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
VideoType: data.videoType,
})
case FileMetadata:
thisImage := data.kind1063Metadata["image"]
thisImage := data.kind1063Metadata.image
if thisImage == "" && data.image != "" {
thisImage = data.image
}
@@ -298,7 +298,7 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
},
DetailsPartial: detailsData,
ClientsPartial: ClientsPartial{
Clients: generateClientList(code, data.event),
Clients: generateClientList(style, code, data.event),
},
AuthorLong: data.authorLong,
@@ -315,16 +315,16 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
TwitterTitle: twitterTitle,
Video: data.video,
VideoType: data.videoType,
Url: data.kind1063Metadata["url"],
M: data.kind1063Metadata["m"],
Aes256Gcm: data.kind1063Metadata["aes-256-gcm"],
X: data.kind1063Metadata["x"],
I: data.kind1063Metadata["i"],
Blurhash: data.kind1063Metadata["blurhash"],
Thumb: data.kind1063Metadata["thumb"],
Url: data.kind1063Metadata.url,
M: data.kind1063Metadata.m,
Aes256Gcm: data.kind1063Metadata.aes256gcm,
X: data.kind1063Metadata.x,
I: data.kind1063Metadata.i,
Blurhash: data.kind1063Metadata.blurhash,
Thumb: data.kind1063Metadata.thumb,
Image: thisImage,
Alt: data.kind1063Metadata["alt"],
MType: strings.Split(data.kind1063Metadata["m"], "/")[0],
Alt: data.alt,
MType: strings.Split(data.kind1063Metadata.m, "/")[0],
})
case Other:
err = OtherTemplate.Render(w, &OtherPage{