18d3c1f · typeable/mandrill

git.iko.soy/typeable/mandrill

Merge pull request #35 from mwotton/fix_aeson_clash

fix inadvertent implementation of Aeson classes for EmailAddress

commit18d3c1fa1babbd80af5ef26e962ca28bdfc7991c authorAlfredo Di Napoli <alfredo.dinapoli@gmail.com> dateMon 16 May 2016, 17:31 (10 years ago) parentc8a4e82 fd22b87

2 files changed+2−12

compare with master

unifiedsplit

src/Network/API/Mandrill/Senders.hs+2−2 src/Network/API/Mandrill/Types.hs−10

src/Network/API/Mandrill/Senders.hs+2−2

@@ -27,7 +27,7 @@ data VerifyDomainResponse =

2727 VerifyDomainResponse

2828 { _vdres_status :: Text

2929 , _vdres_domain :: Text

30− , _vdres_email :: TEV.EmailAddress

30+ , _vdres_email :: MandrillEmail

3131 } deriving Show

3232

3333makeLenses ''VerifyDomainResponse

@@ -42,4 +42,4 @@ verifyDomain :: MandrillKey

4242 -> IO (MandrillResponse VerifyDomainResponse)

4343verifyDomain k email =

4444 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

387387 case timeParse defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of

388388 Just d -> pure $ MandrillDate d

389389 _ -> 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