smtp: populate sender from From header
This commit is contained in:
parent
0248c4c722
commit
6f5f315be9
13
smtp/smtp.go
13
smtp/smtp.go
|
@ -64,7 +64,8 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
|
||||||
return errors.New("no recipient specified")
|
return errors.New("no recipient specified")
|
||||||
}
|
}
|
||||||
|
|
||||||
fromAddrStr := fromList[0].Address
|
rawFrom := fromList[0]
|
||||||
|
fromAddrStr := rawFrom.Address
|
||||||
var fromAddr *protonmail.Address
|
var fromAddr *protonmail.Address
|
||||||
for _, addr := range u.addrs {
|
for _, addr := range u.addrs {
|
||||||
if strings.EqualFold(addr.Email, fromAddrStr) {
|
if strings.EqualFold(addr.Email, fromAddrStr) {
|
||||||
|
@ -96,11 +97,6 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
|
||||||
return errors.New("sender address key hasn't been decrypted")
|
return errors.New("sender address key hasn't been decrypted")
|
||||||
}
|
}
|
||||||
|
|
||||||
senderAddress := &protonmail.MessageAddress{
|
|
||||||
Address: fromAddr.Email,
|
|
||||||
Name: fromAddr.DisplayName,
|
|
||||||
}
|
|
||||||
|
|
||||||
msg := &protonmail.Message{
|
msg := &protonmail.Message{
|
||||||
ToList: toPMAddressList(toList),
|
ToList: toPMAddressList(toList),
|
||||||
CCList: toPMAddressList(ccList),
|
CCList: toPMAddressList(ccList),
|
||||||
|
@ -108,7 +104,10 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
|
||||||
Subject: subject,
|
Subject: subject,
|
||||||
Header: formatHeader(mr.Header),
|
Header: formatHeader(mr.Header),
|
||||||
AddressID: fromAddr.ID,
|
AddressID: fromAddr.ID,
|
||||||
Sender: senderAddress,
|
Sender: &protonmail.MessageAddress{
|
||||||
|
Address: rawFrom.Address,
|
||||||
|
Name: rawFrom.Name,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create an empty draft
|
// Create an empty draft
|
||||||
|
|
Loading…
Reference in New Issue