yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

refactor: pass mailSettings in to avoid extra call

Browse Source
This commit is contained in:
James Houlahan
2020-07-27 11:35:10 +02:00
parent 61a841ced7
commit 145da7ffa5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/smtp/user.go
View File

@ -76,7 +76,10 @@ func (su *smtpUser) client() pmapi.Client {
} }
// Send sends an email from the given address to the given addresses with the given body. // Send sends an email from the given address to the given addresses with the given body.
func (su *smtpUser) getSendPreferences(recipient, messageMIMEType string) (preferences SendPreferences, err error) { func (su *smtpUser) getSendPreferences(
recipient, messageMIMEType string,
mailSettings pmapi.MailSettings,
) (preferences SendPreferences, err error) {
b := &sendPreferencesBuilder{} b := &sendPreferencesBuilder{}
// 1. contact vcard data // 1. contact vcard data
@ -97,10 +100,7 @@ func (su *smtpUser) getSendPreferences(recipient, messageMIMEType string) (prefe
} }
// 4. mail settings // 4. mail settings
mailSettings, err := su.client().GetMailSettings() // Passed in from su.client().GetMailSettings()
if err != nil {
return
}
// 3 + 4 -> 5. encryption preferences // 3 + 4 -> 5. encryption preferences
b.setEncryptionPreferences(mailSettings) b.setEncryptionPreferences(mailSettings)
@ -283,7 +283,7 @@ func (su *smtpUser) Send(from string, to []string, messageReader io.Reader) (err
return errors.New(`"` + email + `" is not a valid recipient.`) return errors.New(`"` + email + `" is not a valid recipient.`)
} }
sendPreferences, err := su.getSendPreferences(email, message.MIMEType) sendPreferences, err := su.getSendPreferences(email, message.MIMEType, mailSettings)
if err != nil { if err != nil {
return err return err
} }