Commit 38ff735d authored by Grégoire Locqueville's avatar Grégoire Locqueville

Removed code in `Core` and `Core.Config.Ini.Mail`

parent 507faeab
Pipeline #7123 passed with stages
in 42 minutes and 1 second
...@@ -82,6 +82,7 @@ instance ToHttpApiData Lang where ...@@ -82,6 +82,7 @@ instance ToHttpApiData Lang where
toUrlPiece = pack . show toUrlPiece = pack . show
instance Hashable Lang instance Hashable Lang
-- | https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
toISO639 :: Lang -> ISO639.ISO639_1 toISO639 :: Lang -> ISO639.ISO639_1
toISO639 DE = ISO639.DE toISO639 DE = ISO639.DE
toISO639 EL = ISO639.EL toISO639 EL = ISO639.EL
...@@ -100,20 +101,6 @@ iso639ToText la = pack [a, b] ...@@ -100,20 +101,6 @@ iso639ToText la = pack [a, b]
where where
(a, b) = ISO639.toChars la (a, b) = ISO639.toChars la
-- | https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
toISO639Lang :: Lang -> Text
toISO639Lang DE = "de"
toISO639Lang EL = "el"
toISO639Lang EN = "en"
toISO639Lang ES = "es"
toISO639Lang FR = "fr"
toISO639Lang IT = "it"
toISO639Lang PL = "pl"
toISO639Lang PT = "pt"
toISO639Lang RU = "ru"
toISO639Lang UK = "uk"
toISO639Lang ZH = "zh"
allLangs :: [Lang] allLangs :: [Lang]
allLangs = [minBound .. maxBound] allLangs = [minBound .. maxBound]
......
...@@ -15,19 +15,16 @@ module Gargantext.Core.Config.Ini.Mail ( ...@@ -15,19 +15,16 @@ module Gargantext.Core.Config.Ini.Mail (
, LoginType(..) , LoginType(..)
, MailConfig(..) , MailConfig(..)
-- * Utility functions -- * Utility function
, gargMail
, readConfig , readConfig
) )
where where
import Data.Maybe import Data.Maybe
import Data.Text (unpack)
import Gargantext.Core.Config.Ini.Ini (readIniFile', val) import Gargantext.Core.Config.Ini.Ini (readIniFile', val)
import Gargantext.Core.Config.Mail (LoginType(..), MailConfig(..), SendEmailType(LogEmailToConsole)) import Gargantext.Core.Config.Mail (LoginType(..), MailConfig(..), SendEmailType(LogEmailToConsole))
import Gargantext.Prelude import Gargantext.Prelude
import Network.Mail.Mime (plainPart)
import Network.Mail.SMTP hiding (htmlPart, STARTTLS)
import Prelude (read) import Prelude (read)
...@@ -54,24 +51,3 @@ data GargMail = GargMail { gm_to :: Email ...@@ -54,24 +51,3 @@ data GargMail = GargMail { gm_to :: Email
, gm_subject :: Text , gm_subject :: Text
, gm_body :: Text , gm_body :: Text
} }
-- | TODO add parameters to gargantext.ini
gargMail :: MailConfig -> GargMail -> IO ()
gargMail (MailConfig {..}) (GargMail { .. }) = do
let host = unpack _mc_mail_host
user = unpack _mc_mail_user
password = unpack _mc_mail_password
case _mc_mail_login_type of
NoAuth -> sendMail host mail
Normal -> sendMailWithLogin' host _mc_mail_port user password mail
SSL -> sendMailWithLoginTLS' host _mc_mail_port user password mail
TLS -> sendMailWithLoginTLS' host _mc_mail_port user password mail
STARTTLS -> sendMailWithLoginSTARTTLS' host _mc_mail_port user password mail
where
mail = simpleMail sender receiver cc bcc gm_subject [plainPart $ cs gm_body]
sender = Address (Just "GarganText Email") _mc_mail_from
receiver = [Address gm_name gm_to]
cc = []
bcc = []
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment