From 5c2453affcd4963b0a021f6c55c2f0a33b367817 Mon Sep 17 00:00:00 2001
From: jkoberg <jkoberg@owncloud.com>
Date: Fri, 3 Mar 2023 14:50:59 +0100
Subject: [PATCH] bugfixes round one

Signed-off-by: jkoberg <jkoberg@owncloud.com>
---
 services/userlog/pkg/service/http.go      | 11 ++++++++---
 services/userlog/pkg/service/templates.go |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/services/userlog/pkg/service/http.go b/services/userlog/pkg/service/http.go
index 072e35b26..725275e04 100644
--- a/services/userlog/pkg/service/http.go
+++ b/services/userlog/pkg/service/http.go
@@ -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"`
+}
diff --git a/services/userlog/pkg/service/templates.go b/services/userlog/pkg/service/templates.go
index 3a597cfb6..bc9bf33d2 100644
--- a/services/userlog/pkg/service/templates.go
+++ b/services/userlog/pkg/service/templates.go
@@ -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"