Skip to content

Add support for retrieving last server reply from sendMail() #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThomasTJdev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for retrieving last server reply from sendMail() #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/smtp.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ proc auth*(smtp: Smtp | AsyncSmtp, username, password: string) {.multisync.} =
await smtp.debugSend(encode(password) & "\c\L")
await smtp.checkReply("235") # Check whether the authentication was successful.

proc sendMail*(smtp: Smtp | AsyncSmtp, fromAddr: string,
toAddrs: seq[string], msg: string) {.multisync.} =
proc sendMailGetReply*(smtp: Smtp | AsyncSmtp, fromAddr: string,
toAddrs: seq[string], msg: string): Future[string] {.multisync.} =
## Sends `msg` from `fromAddr` to the addresses specified in `toAddrs`.
## Messages may be formed using `createMessage` by converting the
## Message into a string.
Expand All @@ -309,7 +309,24 @@ proc sendMail*(smtp: Smtp | AsyncSmtp, fromAddr: string,
await smtp.checkReply("354")
await smtp.sock.send(msg & "\c\L")
await smtp.debugSend(".\c\L")
await smtp.checkReply("250")

var line = await smtp.debugRecv()
if not line.startsWith("250"):
await quitExcpt(smtp, "Expected " & "250" & " reply, got: " & line)
return line

proc sendMail*(smtp: Smtp | AsyncSmtp, fromAddr: string,
toAddrs: seq[string], msg: string) {.multisync.} =
## Sends `msg` from `fromAddr` to the addresses specified in `toAddrs`.
## Messages may be formed using `createMessage` by converting the
## Message into a string.
##
## You need to make sure that `fromAddr` and `toAddrs` don't contain
## any newline characters. Failing to do so will raise `AssertionDefect`.
doAssert(not (toAddrs.containsNewline() or fromAddr.contains({'\c', '\L'})),
"'toAddrs' and 'fromAddr' shouldn't contain any newline characters")

discard sendMailGetReply(smtp, fromAddr, toAddrs, msg)

proc close*(smtp: Smtp | AsyncSmtp) {.multisync.} =
## Disconnects from the SMTP server and closes the socket.
Expand Down