mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-25 22:19:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

groupware: fix keyword patching syntax for adding and removing email keywords endpoints

Browse Source
This commit is contained in:
Pascal Bleser
2025-10-21 16:12:56 +02:00
parent ed605f92b4
commit 2358e61733
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/groupware/pkg/groupware/groupware_api_emails.go
View File

@@ -1012,19 +1012,15 @@ func (g *Groupware) UpdateEmailKeywords(w http.ResponseWriter, r *http.Request)
return noContentResponse(req.session.State)
}
// TODO FIXME use "keywords/$seen" instead, see https://datatracker.ietf.org/doc/html/rfc8620#section-5.7
patch := map[string]*bool{}
truth := true
patch := jmap.EmailUpdate{}
for _, keyword := range body.Add {
patch[keyword] = &truth
patch["keywords/"+keyword] = true
}
for _, keyword := range body.Remove {
patch[keyword] = nil
patch["keywords/"+keyword] = nil
}
patches := map[string]jmap.EmailUpdate{
emailId: {
"keywords": patch,
},
emailId: patch,
}
result, sessionState, lang, jerr := g.jmap.UpdateEmails(accountId, patches, req.session, req.ctx, logger, req.language())
@@ -1080,14 +1076,12 @@ func (g *Groupware) AddEmailKeywords(w http.ResponseWriter, r *http.Request) {
return noContentResponse(req.session.State)
}
patch := map[string]bool{}
patch := jmap.EmailUpdate{}
for _, keyword := range body {
patch[keyword] = true
patch["keywords/"+keyword] = true
}
patches := map[string]jmap.EmailUpdate{
emailId: {
"keywords": patch,
},
emailId: patch,
}
result, sessionState, lang, jerr := g.jmap.UpdateEmails(accountId, patches, req.session, req.ctx, logger, req.language())
@@ -1147,14 +1141,12 @@ func (g *Groupware) RemoveEmailKeywords(w http.ResponseWriter, r *http.Request)
return noContentResponse(req.session.State)
}
patch := map[string]*bool{}
patch := jmap.EmailUpdate{}
for _, keyword := range body {
patch[keyword] = nil
patch["keywords/"+keyword] = nil
}
patches := map[string]jmap.EmailUpdate{
emailId: {
"keywords": patch,
},
emailId: patch,
}
result, sessionState, lang, jerr := g.jmap.UpdateEmails(accountId, patches, req.session, req.ctx, logger, req.language())