jyapayne/nimforum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #62 from FedericoCeratto/resent-from

Browse source 
Add Resent-From header when syncing to a mailing list
This commit is contained in:
Dominik Picheta 2015-08-29 21:32:02 +01:00
commit 8f8d995e69
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
utils.nim
View file

@ -21,15 +21,22 @@ proc loadConfig*(filename = getCurrentDir() / "forum.json"): Config =
except: except:
echo("[WARNING] Couldn't read config file: ./forum.json") echo("[WARNING] Couldn't read config file: ./forum.json")
proc sendMail(config: Config, subject, message, recipient: string, from_addr = "forum@nim-lang.org") {.async.} = proc sendMail(config: Config, subject, message, recipient: string, from_addr = "forum@nim-lang.org", resent_from = "") {.async.} =
var client = newAsyncSmtp(config.smtpAddress, Port(config.smtpPort)) var client = newAsyncSmtp(config.smtpAddress, Port(config.smtpPort))
await client.connect() await client.connect()
if config.smtpUser.len > 0: if config.smtpUser.len > 0:
await client.auth(config.smtpUser, config.smtpPassword) await client.auth(config.smtpUser, config.smtpPassword)
let toList = @[recipient] let toList = @[recipient]
let otherHeaders =
if resent_from == "":
@[]
else:
@[("Resent-From", resent_from)]
let encoded = createMessage(subject, message, let encoded = createMessage(subject, message,
toList, @[], []) toList, @[], otherHeaders)
await client.sendMail(from_addr, toList, await client.sendMail(from_addr, toList,
$encoded) $encoded)
@ -39,7 +46,7 @@ proc sendMailToMailingList*(config: Config, username, user_email_addr, subject,
let from_addr = "$# <$#>" % [username, user_email_addr] let from_addr = "$# <$#>" % [username, user_email_addr]
if config.mlistAddress != "": if config.mlistAddress != "":
await sendMail(config, subject, message, config.mlistAddress, from_addr=from_addr) await sendMail(config, subject, message, config.mlistAddress, from_addr=from_addr, resent_from="forum@nim-lang.org")
proc sendPassReset*(config: Config, email, user, resetUrl: string) {.async.} = proc sendPassReset*(config: Config, email, user, resetUrl: string) {.async.} =
let message = """Hello $1, let message = """Hello $1,