From 86f9991deeb44a6cc81044e61a9ad3ee001c5ced Mon Sep 17 00:00:00 2001
From: Joris Guyonvarch
Date: Sat, 18 Apr 2015 15:46:44 +0200
Subject: Send both plain text and html in mail notifications

---
 src/Mail.hs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/Mail.hs')

diff --git a/src/Mail.hs b/src/Mail.hs
index 45962a5..83a2bbd 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -5,8 +5,9 @@ module Mail
   ) where
 
 import Data.Text (Text)
-import Data.Text.Lazy.Builder (toLazyText, fromText)
 import qualified Data.Text as T
+import qualified Data.Text.Lazy as LT
+import Data.Text.Lazy.Builder (toLazyText, fromText)
 
 import Control.Exception (SomeException, try)
 
@@ -14,21 +15,28 @@ import Network.Mail.Mime
 
 import Utils.Either (mapLeft)
 
-sendMail :: [Text] -> Text -> Text -> IO (Either Text ())
-sendMail mailTo subject body = safeSendMail (mail mailTo subject body)
+sendMail :: [Text] -> Text -> Text -> Text -> IO (Either Text ())
+sendMail mailTo subject plainBody htmlBody = safeSendMail (mail mailTo subject plainBody htmlBody)
 
 safeSendMail :: Mail -> IO (Either Text ())
 safeSendMail mail =
   mapLeft (T.pack . show) <$> (try (renderSendMail mail) :: IO (Either SomeException ()))
 
-mail :: [Text] -> Text -> Text -> Mail
-mail mailTo subject body =
+mail :: [Text] -> Text -> Text -> Text -> Mail
+mail mailTo subject plainBody htmlBody =
   let fromMail = emptyMail (address "no-reply@leboncoin-listener.com")
   in  fromMail
         { mailTo = map address mailTo
-        , mailParts = [[plainPart (toLazyText . fromText $ body)]]
+        , mailParts =
+            [ [ plainPart . strictToLazy $ plainBody
+              , htmlPart . strictToLazy $ htmlBody
+              ]
+            ]
         , mailHeaders = [("Subject", subject)]
         }
 
+strictToLazy :: Text -> LT.Text
+strictToLazy = toLazyText . fromText
+
 address :: Text -> Address
 address mail = Address { addressName = Nothing, addressEmail = mail }
-- 
cgit v1.2.3