|
@@ -10,7 +10,6 @@ import SMTP.Address
|
|
|
import SMTP.Account
|
|
|
import qualified SMTP.Mime as Mime
|
|
|
import SMTP.Response
|
|
|
-import Data.Textual.Class
|
|
|
import Text.StringConvert
|
|
|
|
|
|
import Data.Time.ISO8601
|
|
@@ -112,14 +111,14 @@ renderMetadata m = BS.concat serialize
|
|
|
"Action: ", show act, "\r\n",
|
|
|
"Client-Ip: ", show $ cid^.clientIp, "\r\n",
|
|
|
"Client-Port: ", show $ cid^.clientPort, "\r\n",
|
|
|
- "Client-Name: ", fromTextual cnm, "\r\n",
|
|
|
- "Return-Path: ", fromTextual . normalAccountName $ rfm, "\r\n",
|
|
|
+ "Client-Name: ", s cnm, "\r\n",
|
|
|
+ "Return-Path: ", s . normalAccountName $ rfm, "\r\n",
|
|
|
"Recv-Date: ", formatISO8601 rcv, "\r\n",
|
|
|
"Body-Encoding: ", show enc, "\r\n",
|
|
|
"SMTP-UTF8: ", if utf then "Yes" else "No", "\r\n",
|
|
|
"Data-Size: ", show sz, "\r\n"
|
|
|
] :: [String]
|
|
|
- in map fromTextual h ++ toStr ++ failStr ++ usrStr ++ unrec ++ ["\r\n"]
|
|
|
+ in map s h ++ toStr ++ failStr ++ usrStr ++ unrec ++ ["\r\n"]
|
|
|
|
|
|
-- | Reads a metadata from a textual representation on the format expected by the walrus backends
|
|
|
parseMetadata :: A.Parser Metadata
|
|
@@ -223,12 +222,12 @@ parseMetadata = do
|
|
|
parseRead :: Read a => Parser a
|
|
|
parseRead = do
|
|
|
v <- A.takeTill A.isSpace
|
|
|
- case readMaybe . fromTextual $ v of
|
|
|
+ case readMaybe . s $ v of
|
|
|
Nothing -> fail "failed parsing value"
|
|
|
Just i -> return i
|
|
|
parseISO8601Val = do
|
|
|
v <- A.takeTill A.isSpace
|
|
|
- case parseISO8601 . fromTextual $ v of
|
|
|
+ case parseISO8601 . s $ v of
|
|
|
Nothing -> fail "failed parsing ISO8601 date"
|
|
|
Just t -> return t
|
|
|
parseMetadataBool :: Parser Bool
|