mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-01 01:41:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4799 from dragonchaser/improve-email-tempalting

Browse Source 
refactor templating, add subject templating
This commit is contained in:
Christian Richter
2022-10-13 17:04:26 +02:00
committed by GitHub
parent 968d26f0d6 b4caf6397c
commit 7ff04c46da
6 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
changelog/unreleased/add-subject-tempalting.md Normal file
View File

@@ -0,0 +1,5 @@
Enhancement: We added e-mail subject templating
We have added e-mail subject templating.
https://github.com/owncloud/ocis/pull/4799

0
services/notifications/pkg/email/templates/shareCreated.email.tmpl → services/notifications/pkg/email/templates/shares/shareCreated.email.body.tmpl
View File

1
services/notifications/pkg/email/templates/shares/shareCreated.email.subject.tmpl Normal file
View File

@@ -0,0 +1 @@
{{ .ShareSharer }} shared '{{ .ShareFolder }}' with you

0
services/notifications/pkg/email/templates/sharedSpace.email.tmpl → services/notifications/pkg/email/templates/spaces/sharedSpace.email.body.tmpl
View File

1
services/notifications/pkg/email/templates/spaces/sharedSpace.email.subject.tmpl Normal file
View File

@@ -0,0 +1 @@
{{ .SpaceSharer }} invited you to join {{ .SpaceName }}

35
services/notifications/pkg/service/service.go
View File

@@ -2,7 +2,6 @@ package service
import (
"context"
"fmt"
"net/url"
"os"
"os/signal"
@@ -200,7 +199,7 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
}
sharerDisplayName := sharerUserResponse.GetUser().DisplayName
msg, err := email.RenderEmailTemplate("sharedSpace.email.tmpl", map[string]string{
msg, err := email.RenderEmailTemplate("spaces/sharedSpace.email.body.tmpl", map[string]string{
"SpaceGrantee": spaceGrantee,
"SpaceSharer": sharerDisplayName,
"SpaceName": md.GetInfo().GetSpace().Name,
@@ -211,10 +210,21 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
s.logger.Error().
Err(err).
Str("event", "SpaceCreated").
Msg("Could not render E-Mail template for spaces")
Msg("Could not render E-Mail body template for spaces")
}
emailSubject, err := email.RenderEmailTemplate("spaces/sharedSpace.email.subject.tmpl", map[string]string{
"SpaceSharer": sharerDisplayName,
"SpaceName": md.GetInfo().GetSpace().Name,
}, s.emailTemplatePath)
if err != nil {
s.logger.Error().
Err(err).
Str("event", "SpaceCreated").
Msg("Could not render E-Mail subject template for spaces")
}
emailSubject := fmt.Sprintf("%s invited you to join %s", sharerUserResponse.GetUser().DisplayName, md.GetInfo().GetSpace().Name)
if e.GranteeUserID != nil {
err = s.channel.SendMessage(ownerCtx, []string{e.GranteeUserID.OpaqueId}, msg, emailSubject, sharerDisplayName)
} else if e.GranteeGroupID != nil {
@@ -338,7 +348,7 @@ func (s eventsNotifier) handleShareCreated(e events.ShareCreated) {
}
sharerDisplayName := sharerUserResponse.GetUser().DisplayName
msg, err := email.RenderEmailTemplate("shareCreated.email.tmpl", map[string]string{
msg, err := email.RenderEmailTemplate("shares/shareCreated.email.body.tmpl", map[string]string{
"ShareGrantee": shareGrantee,
"ShareSharer": sharerDisplayName,
"ShareFolder": md.GetInfo().Name,
@@ -349,10 +359,21 @@ func (s eventsNotifier) handleShareCreated(e events.ShareCreated) {
s.logger.Error().
Err(err).
Str("event", "ShareCreated").
Msg("Could not render E-Mail template for shares")
Msg("Could not render E-Mail body template for shares")
}
emailSubject, err := email.RenderEmailTemplate("shares/shareCreated.email.subject.tmpl", map[string]string{
"ShareSharer": sharerDisplayName,
"ShareFolder": md.GetInfo().Name,
}, s.emailTemplatePath)
if err != nil {
s.logger.Error().
Err(err).
Str("event", "SpaceCreated").
Msg("Could not render E-Mail subject template for shares")
}
emailSubject := fmt.Sprintf("%s shared '%s' with you", sharerUserResponse.GetUser().DisplayName, md.GetInfo().Name)
if e.GranteeUserID != nil {
err = s.channel.SendMessage(ownerCtx, []string{e.GranteeUserID.OpaqueId}, msg, emailSubject, sharerDisplayName)
} else if e.GranteeGroupID != nil {