sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add email subject

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-09-22 09:38:11 +02:00
parent daaa08aa09
commit 6ea8623b55
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/notifications/pkg/channels/channels.go
+6 -5
View File
@@ -19,9 +19,9 @@ import (
// Channel defines the methods of a communication channel.
type Channel interface {
// SendMessage sends a message to users.
SendMessage(userIDs []string, msg string) error
SendMessage(userIDs []string, msg, subject string) error
// SendMessageToGroup sends a message to a group.
SendMessageToGroup(groupdID *groups.GroupId, msg string) error
SendMessageToGroup(groupdID *groups.GroupId, msg, subject string) error
}
// NewMailChannel instantiates a new mail communication channel.
@@ -100,7 +100,7 @@ func (m Mail) getMailClient() (*mail.SMTPClient, error) {
}
// SendMessage sends a message to all given users.
func (m Mail) SendMessage(userIDs []string, msg string) error {
func (m Mail) SendMessage(userIDs []string, msg, subject string) error {
if m.conf.Notifications.SMTP.Host == "" {
return nil
}
@@ -118,12 +118,13 @@ func (m Mail) SendMessage(userIDs []string, msg string) error {
email := mail.NewMSG()
email.SetFrom(m.conf.Notifications.SMTP.Sender).AddTo(to...)
email.SetBody(mail.TextPlain, msg)
email.SetSubject(subject)
return email.Send(smtpClient)
}
// SendMessageToGroup sends a message to all members of the given group.
func (m Mail) SendMessageToGroup(groupID *groups.GroupId, msg string) error {
func (m Mail) SendMessageToGroup(groupID *groups.GroupId, msg, subject string) error {
// TODO We need an authenticated context here...
res, err := m.gatewayClient.GetGroup(context.Background(), &groups.GetGroupRequest{GroupId: groupID})
if err != nil {
@@ -138,7 +139,7 @@ func (m Mail) SendMessageToGroup(groupID *groups.GroupId, msg string) error {
members = append(members, id.OpaqueId)
}
return m.SendMessage(members, msg)
return m.SendMessage(members, msg, subject)
}
func (m Mail) getReceiverAddresses(receivers []string) ([]string, error) {
services/notifications/pkg/service/service.go
+3 -3
View File
@@ -155,7 +155,7 @@ func (s eventsNotifier) handleSpaceCreated(e events.SpaceCreated) {
Msg("Could not render E-Mail template for spaces")
}
if e.Executant != nil {
err = s.channel.SendMessage([]string{e.Executant.OpaqueId}, msg)
err = s.channel.SendMessage([]string{e.Executant.OpaqueId}, msg, "You were invited to join a space")
}
if err != nil {
s.logger.Error().
@@ -241,9 +241,9 @@ func (s eventsNotifier) handleShareCreated(e events.ShareCreated) {
Msg("Could not render E-Mail template for shares")
}
if e.GranteeUserID != nil {
err = s.channel.SendMessage([]string{e.GranteeUserID.OpaqueId}, msg)
err = s.channel.SendMessage([]string{e.GranteeUserID.OpaqueId}, msg, "You have received a share.")
} else if e.GranteeGroupID != nil {
err = s.channel.SendMessageToGroup(e.GranteeGroupID, msg)
err = s.channel.SendMessageToGroup(e.GranteeGroupID, msg, "You have received a share.")
}
if err != nil {
s.logger.Error().