Clean up imports.

[dead/halcyon.git] / src / Twitter / Http.hs

diff --git a/src/Twitter/Http.hs b/src/Twitter/Http.hs
index be10b8697a5be241a23b22ca0e8b5b197ab54013..e3bb9fcc96ea3b90c2077b977a06d6cadb904063 100644 (file)
--- a/src/Twitter/Http.hs
+++ b/src/Twitter/Http.hs
@@ -1,25 +1,27 @@
 module Twitter.Http (
   get_user_new_statuses,
   get_user_timeline,
-  http_get
-  )
+  http_get )
 where
 
-import qualified Data.ByteString.Lazy as B
-import qualified Data.ByteString.Char8 as BC
-import qualified Data.Conduit as C
-import Data.Conduit.Binary (sinkLbs)
-import Network.HTTP.Conduit
+import qualified Data.ByteString.Lazy as B ( ByteString )
+import qualified Data.ByteString.Char8 as BC ( pack )
+import Network.HTTP.Client (
+  httpLbs,
+  newManager,
+  parseUrl,
+  responseBody )
+import Network.HTTP.Client.TLS ( tlsManagerSettings )
 import Web.Authenticate.OAuth (
   OAuth(..),
   Credential,
   newCredential,
   newOAuth,
-  signOAuth)
+  signOAuth )
 
-import Configuration (Cfg(..))
+import Configuration ( Cfg(..) )
 
--- |The API URL of username's timeline.
+-- | The API URL of username's timeline.
 --
 -- See,
 --
@@ -66,13 +68,11 @@ get_user_new_statuses cfg username last_status_id = do
 -- | Retrieve a URL, or crash.
 http_get :: Cfg -> String -> IO B.ByteString
 http_get cfg url = do
-  manager <- newManager def
+  manager <- newManager tlsManagerSettings
   request <- parseUrl url
-
-  C.runResourceT $ do
-    signed_request <- signOAuth oauth credential request
-    response <- http signed_request manager
-    responseBody response C.$$+- sinkLbs
+  signed_request <- signOAuth oauth credential request
+  response <- httpLbs signed_request manager
+  return $ responseBody response
 
   where
     consumer_key' = BC.pack (consumer_key cfg)