require purebred-email >= 0.6feature/parts

1 files changed, 13 insertions, 1 deletions

diff --git a/src/Data/MIME/Extended.hs b/src/Data/MIME/Extended.hs
index 74ceaf5..a58b9f5 100644
--- a/src/Data/MIME/Extended.hs
+++ b/src/Data/MIME/Extended.hs
@@ -7,6 +7,7 @@ module Data.MIME.Extended
     ( module Data.MIME
     ) where
 
+import Control.Arrow (left)
 import Control.Lens hiding ((.=))
 import Data.Aeson
 import Data.ByteString (ByteString)
@@ -121,8 +122,15 @@ makeMultipart h =
                                     maybeToRight
                                       (InvalidParameterValue "type" s)
                                       (preview (parsed parseContentType) s)
+                              >>= return . Just . setContentTypeParameters ()
+                              )
+                          <*> ( getOptionalParam "start" ct
+                              >>= traverse
+                                    (\s ->
+                                      left
+                                        (InvalidParameterValue "start" . ((s <> ": ") <>))
+                                        (makeContentID s))
                               )
-                          <*> getOptionalParam "start" ct
                           <*> getOptionalParam "start-info" ct
       unrecognised    -> pure $ Unrecognised unrecognised
 
@@ -141,6 +149,10 @@ makeMultipart h =
     getOptionalParam k =
       Right . preview (rawParameter k)
 
+    setContentTypeParameters :: b -> ContentTypeWith a -> ContentTypeWith b
+    setContentTypeParameters p (ContentType t st _) =
+      ContentType t st p
+
 data MIMEParseError
   = RequiredParameterMissing (CI ByteString)
   | InvalidParameterValue (CI ByteString) ByteString