infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-14 07:34:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

webmail: fix js error rerendering additional headers after updated keywords

Browse Source 
i've seen the error a few times:

	msgheaderElem.children[(msgheaderElem.children.length - 1)] is undefined

i've seen it happen after sending a reply (with the "answered" flag added).
the updateKeywords callback would render the message again, but the code for
rendering the "additional headers" table rows again was making invalid
assumptions.

the approach is now changed. the backend now just immediately sends the
additional headers to the frontend. before, the frontend would first render the
base message, then render again once the headers came in for the parsed
message. this also prevents a reflow for the (quite common) case that one of
the additional headers are present in the message.
This commit is contained in:
Mechiel Lukkien
2025-01-13 14:53:43 +01:00
parent f7193bd4c3
commit 1e15a10b66
11 changed files with 167 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
webmail/message.go
View File

@ -7,6 +7,7 @@ import (
"io"
"log/slog"
"mime"
"net/textproto"
"net/url"
"strings"
@ -72,15 +73,31 @@ func tryDecodeParam(log mlog.Log, name string) string {
// todo: mime.FormatMediaType does not wrap long lines. should do it ourselves, and split header into several parts (if commonly supported).
func messageItem(log mlog.Log, m store.Message, state *msgState) (MessageItem, error) {
pm, err := parsedMessage(log, m, state, false, true)
func messageItemMoreHeaders(moreHeaders []string, pm ParsedMessage) (l [][2]string) {
for _, k := range moreHeaders {
k = textproto.CanonicalMIMEHeaderKey(k)
for _, v := range pm.Headers[k] {
l = append(l, [2]string{k, v})
}
}
return l
}
func messageItem(log mlog.Log, m store.Message, state *msgState, moreHeaders []string) (MessageItem, error) {
full := len(moreHeaders) > 0
pm, err := parsedMessage(log, m, state, full, true)
if err != nil && errors.Is(err, message.ErrHeader) && full {
log.Debugx("load message item without parsing headers after error", err, slog.Int64("msgid", m.ID))
pm, err = parsedMessage(log, m, state, false, true)
}
if err != nil {
return MessageItem{}, fmt.Errorf("parsing message %d for item: %v", m.ID, err)
}
// Clear largish unused data.
m.MsgPrefix = nil
m.ParsedBuf = nil
return MessageItem{m, pm.envelope, pm.attachments, pm.isSigned, pm.isEncrypted, pm.firstLine, true}, nil
l := messageItemMoreHeaders(moreHeaders, pm)
return MessageItem{m, pm.envelope, pm.attachments, pm.isSigned, pm.isEncrypted, pm.firstLine, true, l}, nil
}
// formatFirstLine returns a line the client can display next to the subject line