Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +02:00
Code Releases Activity

Set ReplyTo for SMTP based notifications

Browse source 
Ensure all replies go back to person who initiated the notification.
This commit is contained in:
sauls8t 2018-05-03 18:03:25 +01:00
parent 3b0291d94c
commit 2298ac3376
9 changed files with 720 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

12
domain/mail/document.go
View file

@ -20,19 +20,21 @@ import (
)
// DocumentApprover notifies user who has just been granted document approval rights.
func (m *Mailer) DocumentApprover(recipient, inviter, url, document string) {
func (m *Mailer) DocumentApprover(recipient, inviterName, inviterEmail, url, document string) {
method := "DocumentApprover"
m.Initialize()
// check inviter name
if inviter == "Hello You" || len(inviter) == 0 {
inviter = "Your colleague"
if inviterName == "Hello You" || len(inviterName) == 0 {
inviterName = "Your colleague"
}
em := smtp.EmailMessage{}
em.Subject = fmt.Sprintf("%s has granted you document approval", inviter)
em.Subject = fmt.Sprintf("%s has granted you document approval", inviterName)
em.ToEmail = recipient
em.ToName = recipient
em.ReplyTo = inviterEmail
em.ReplyName = inviterName
parameters := struct {
Subject string
@ -41,7 +43,7 @@ func (m *Mailer) DocumentApprover(recipient, inviter, url, document string) {
Document string
}{
em.Subject,
inviter,
inviterName,
url,
document,
}

24
domain/mail/space.go
View file

@ -18,19 +18,21 @@ import (
)
// ShareSpaceExistingUser provides an existing user with a link to a newly shared space.
func (m *Mailer) ShareSpaceExistingUser(recipient, inviter, url, folder, intro string) {
func (m *Mailer) ShareSpaceExistingUser(recipient, inviterName, inviterEmail, url, folder, intro string) {
method := "ShareSpaceExistingUser"
m.Initialize()
// check inviter name
if inviter == "Hello You" || len(inviter) == 0 {
inviter = "Your colleague"
if inviterName == "Hello You" || len(inviterName) == 0 {
inviterName = "Your colleague"
}
em := smtp.EmailMessage{}
em.Subject = fmt.Sprintf("%s has shared %s with you", inviter, folder)
em.Subject = fmt.Sprintf("%s has shared %s with you", inviterName, folder)
em.ToEmail = recipient
em.ToName = recipient
em.ReplyTo = inviterEmail
em.ReplyName = inviterName
parameters := struct {
Subject string
@ -40,7 +42,7 @@ func (m *Mailer) ShareSpaceExistingUser(recipient, inviter, url, folder, intro s
Intro string
}{
em.Subject,
inviter,
inviterName,
url,
folder,
intro,
@ -63,19 +65,21 @@ func (m *Mailer) ShareSpaceExistingUser(recipient, inviter, url, folder, intro s
}
// ShareSpaceNewUser invites new user providing Credentials, explaining the product and stating who is inviting them.
func (m *Mailer) ShareSpaceNewUser(recipient, inviter, url, space, invitationMessage string) {
func (m *Mailer) ShareSpaceNewUser(recipient, inviterName, inviterEmail, url, space, invitationMessage string) {
method := "ShareSpaceNewUser"
m.Initialize()
// check inviter name
if inviter == "Hello You" || len(inviter) == 0 {
inviter = "Your colleague"
if inviterName == "Hello You" || len(inviterName) == 0 {
inviterName = "Your colleague"
}
em := smtp.EmailMessage{}
em.Subject = fmt.Sprintf("%s has shared %s with you on Documize", inviter, space)
em.Subject = fmt.Sprintf("%s has shared %s with you on Documize", inviterName, space)
em.ToEmail = recipient
em.ToName = recipient
em.ReplyTo = inviterEmail
em.ReplyName = inviterName
parameters := struct {
Subject string
@ -85,7 +89,7 @@ func (m *Mailer) ShareSpaceNewUser(recipient, inviter, url, space, invitationMes
Folder string
}{
em.Subject,
inviter,
inviterName,
url,
invitationMessage,
space,

24
domain/mail/user.go
View file

@ -18,19 +18,21 @@ import (
)
// InviteNewUser invites someone new providing credentials, explaining the product and stating who is inviting them.
func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password string) {
func (m *Mailer) InviteNewUser(recipient, inviterName, inviterEmail, url, username, password string) {
method := "InviteNewUser"
m.Initialize()
// check inviter name
if inviter == "Hello You" || len(inviter) == 0 {
inviter = "Your colleague"
if inviterName == "Hello You" || len(inviterName) == 0 {
inviterName = "Your colleague"
}
em := smtp.EmailMessage{}
em.Subject = fmt.Sprintf("%s has invited you to Documize", inviter)
em.Subject = fmt.Sprintf("%s has invited you to Documize", inviterName)
em.ToEmail = recipient
em.ToName = recipient
em.ReplyTo = inviterEmail
em.ReplyName = inviterName
parameters := struct {
Subject string
@ -40,7 +42,7 @@ func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password strin
Password string
}{
em.Subject,
inviter,
inviterName,
url,
recipient,
password,
@ -63,19 +65,21 @@ func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password strin
}
// InviteExistingUser invites a known user to an organization.
func (m *Mailer) InviteExistingUser(recipient, inviter, url string) {
func (m *Mailer) InviteExistingUser(recipient, inviterName, inviterEmail, url string) {
method := "InviteExistingUser"
m.Initialize()
// check inviter name
if inviter == "Hello You" || len(inviter) == 0 {
inviter = "Your colleague"
if inviterName == "Hello You" || len(inviterName) == 0 {
inviterName = "Your colleague"
}
em := smtp.EmailMessage{}
em.Subject = fmt.Sprintf("%s has invited you to their Documize account", inviter)
em.Subject = fmt.Sprintf("%s has invited you to their Documize account", inviterName)
em.ToEmail = recipient
em.ToName = recipient
em.ReplyTo = inviterEmail
em.ReplyName = inviterName
parameters := struct {
Subject string
@ -83,7 +87,7 @@ func (m *Mailer) InviteExistingUser(recipient, inviter, url string) {
URL string
}{
em.Subject,
inviter,
inviterName,
url,
}