X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FTwitter%2FHttp.hs;h=14d156395426eed5bf40af35942ec220aa646762;hp=be10b8697a5be241a23b22ca0e8b5b197ab54013;hb=eed0d7b0f8ef28864c00925beef5c8853bcd44cc;hpb=4f1ecbb17ed0e0a9506187630374468a46179514

diff --git a/src/Twitter/Http.hs b/src/Twitter/Http.hs
index be10b86..14d1563 100644
--- a/src/Twitter/Http.hs
+++ b/src/Twitter/Http.hs
@@ -7,9 +7,13 @@ 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 Network.HTTP.Client (
+  httpLbs,
+  newManager,
+  parseUrl,
+  responseBody)
+import Network.HTTP.Client.TLS (
+  tlsManagerSettings)
 import Web.Authenticate.OAuth (
   OAuth(..),
   Credential,
@@ -66,13 +70,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)