git.iko.soy/typeable/mandrill
on master help sign in
Merge pull request #35 from mwotton/fix_aeson_clash
18d3c1fAlfredo Di Napoli
src/Network/API/Mandrill/Senders.hs+2−2
compare with master
unifiedsplit
@@ -27,7 +27,7 @@ data VerifyDomainResponse =
27 VerifyDomainResponse
27 VerifyDomainResponse
28 { _vdres_status :: Text
28 { _vdres_status :: Text
29 , _vdres_domain :: Text
29 , _vdres_domain :: Text
30− , _vdres_email :: TEV.EmailAddress
30+ , _vdres_email :: MandrillEmail
31 } deriving Show
31 } deriving Show
32
32
33makeLenses ''VerifyDomainResponse
33makeLenses ''VerifyDomainResponse
@@ -42,4 +42,4 @@ verifyDomain :: MandrillKey
42 -> IO (MandrillResponse VerifyDomainResponse)
42 -> IO (MandrillResponse VerifyDomainResponse)
43verifyDomain k email =
43verifyDomain k email =
44 toMandrillResponse VerifyDomain
44 toMandrillResponse VerifyDomain
45− (VerifyDomainRq k (decodeUtf8 $ TEV.domainPart email) (decodeUtf8 $ TEV.localPart email))
45+ (VerifyDomainRq k (decodeUtf8 $ TEV.domainPart email) (decodeUtf8 $ TEV.localPart email))
src/Network/API/Mandrill/Types.hs−10
@@ -387,13 +387,3 @@ instance FromJSON MandrillDate where
387 case timeParse defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of
387 case timeParse defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of
388 Just d -> pure $ MandrillDate d
388 Just d -> pure $ MandrillDate d
389 _ -> fail "could not parse Mandrill date"
389 _ -> fail "could not parse Mandrill date"
390−
391−
392−instance ToJSON TEV.EmailAddress where
393− toJSON = String . TL.decodeUtf8 . TEV.toByteString
394−
395−instance FromJSON TEV.EmailAddress where
396− parseJSON (String s) = case TEV.emailAddress (TL.encodeUtf8 s) of
397− Nothing -> mzero
398− Just x -> return x
399− parseJSON _ = mzero