Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions src/triangulum/email.clj
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
(defn- send-postal
"Internal function to send emails via postal.
Can optionally accept a custom email config map to override defaults."
([to-addresses cc-addresses bcc-addresses subject body content-type]
([to-addresses cc-addresses bcc-addresses subject body content-type]
(send-postal to-addresses cc-addresses bcc-addresses subject body content-type nil))
([to-addresses cc-addresses bcc-addresses subject body content-type email-config]
(let [config (or email-config
(select-keys (get-config :mail) [:host :user :pass :tls :port]))
from-address (:user config)]
([to-addresses cc-addresses bcc-addresses subject body content-type email-config]
(let [config (or email-config
(select-keys (get-config :mail) [:host :user :pass :tls :port :from]))
from-address (or (:from config) (:user config))
smtp-config (dissoc config :from)]
(send-message
config
smtp-config
{:from from-address
:to to-addresses
:cc cc-addresses
Expand Down