infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 12:18:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

webmail: fix displaying a message in separate window if there was no known viewmode (text or html or html with externals)

Browse Source 
we were sending a zero value for ViewMode, which the frontend js rejected
during parsing.

noticed during testing.
This commit is contained in:
Mechiel Lukkien 2024-10-04 16:37:32 +02:00
parent 32b549b260
commit edb6e8d15c
No known key found for this signature in database
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webmail/api.go
View File

@ -204,8 +204,10 @@ func fromAddrViewMode(tx *bstore.Tx, from MessageAddress) (store.ViewMode, error
err = tx.Get(&fas) err = tx.Get(&fas)
if err == bstore.ErrAbsent { if err == bstore.ErrAbsent {
return settingsViewMode() return settingsViewMode()
} else if err != nil {
return store.ModeText, err
} }
return fas.ViewMode, err return fas.ViewMode, nil
} }
// FromAddressSettingsSave saves per-"From"-address settings. // FromAddressSettingsSave saves per-"From"-address settings.

2
webmail/message.go
View File

@ -181,6 +181,8 @@ func formatFirstLine(r io.Reader) (string, error) {
} }
func parsedMessage(log mlog.Log, m store.Message, state *msgState, full, msgitem bool) (pm ParsedMessage, rerr error) { func parsedMessage(log mlog.Log, m store.Message, state *msgState, full, msgitem bool) (pm ParsedMessage, rerr error) {
pm.ViewMode = store.ModeText // Valid default, in case this makes it to frontend.
if full || msgitem { if full || msgitem {
if !state.ensurePart(m, true) { if !state.ensurePart(m, true) {
return pm, state.err return pm, state.err