mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 04:40:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes round one

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2023-03-03 14:50:59 +01:00
parent 179d82c9cf
commit 5c2453affc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/userlog/pkg/service/http.go
View File

@@ -53,14 +53,14 @@ func (ul *UserlogService) HandleDeleteEvents(w http.ResponseWriter, r *http.Requ
return
}
var ids []string
if err := json.NewDecoder(r.Body).Decode(&ids); err != nil {
var req DeleteEventsRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
ul.log.Error().Err(err).Int("returned statuscode", http.StatusBadRequest).Msg("request body is malformed")
w.WriteHeader(http.StatusBadRequest)
return
}
if err := ul.DeleteEvents(u.GetId().GetOpaqueId(), ids); err != nil {
if err := ul.DeleteEvents(u.GetId().GetOpaqueId(), req.IDs); err != nil {
ul.log.Error().Err(err).Int("returned statuscode", http.StatusInternalServerError).Msg("delete events failed")
w.WriteHeader(http.StatusInternalServerError)
return
@@ -80,3 +80,8 @@ type GetEventResponseOC10 struct {
Data []OC10Notification `json:"data"`
} `json:"ocs"`
}
// DeleteEventsRequest is the expected body for the delete request
type DeleteEventsRequest struct {
IDs []string `json:"ids"`
}

6
services/userlog/pkg/service/templates.go
View File

@@ -6,7 +6,7 @@ import "text/template"
var (
SpaceShared = "space-shared"
SpaceSharedSubject = "Space shared"
SpaceSharedMessage = "{{ .username }} shared Space {{ .spacename }} with you"
SpaceSharedMessage = "{{ .username }} added you to Space {{ .spacename }}"
SpaceUnshared = "space-unshared"
SpaceUnsharedSubject = "Removed from Space"
@@ -26,11 +26,11 @@ var (
ShareCreated = "item-shared"
ShareCreatedSubject = "Resource shared"
ShareCreatedMessage = "{{ .username }} shared {{ .itemname }} with you"
ShareCreatedMessage = "{{ .username }} shared {{ .resourcename }} with you"
ShareRemoved = "item-unshared"
ShareRemovedSubject = "Resource unshared"
ShareRemovedMessage = "{{ .username }} unshared {{ .itemname }} with you"
ShareRemovedMessage = "{{ .username }} unshared {{ .resourcename }} with you"
ShareExpired = "share-expired"
ShareExpiredSubject = "Share expired"