X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTwitter%2FHttp.hs;h=112c2ea2fa293f75aa16382ab7770b07c9607c2f;hb=9b6d95a82745ced2a58d9bc4ded555ee36b36673;hp=bff4288776ad59a80e5aa822253f4b510bac1984;hpb=27c6a7e62a428ceb1d2a60d456b075feee196da9;p=dead%2Fhalcyon.git

diff --git a/src/Twitter/Http.hs b/src/Twitter/Http.hs
index bff4288..112c2ea 100644
--- a/src/Twitter/Http.hs
+++ b/src/Twitter/Http.hs
@@ -1,69 +1,98 @@
 module Twitter.Http
 where
 
-import Network.Curl
-import System.IO (hPutStrLn, stderr)
+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 Web.Authenticate.OAuth (
+  OAuth(..),
+  Credential,
+  newCredential,
+  newOAuth,
+  signOAuth)
 
 -- |The API URL of username's timeline.
 --
 -- See,
 --
---   <http://dev.twitter.com/doc/get/statuses/user_timeline>
+--   <https://dev.twitter.com/docs/api/1.1/get/statuses/user_timeline>
 --
 user_timeline_url :: String -> String
 user_timeline_url username =
-    concat [ "http://api.twitter.com/1/statuses/user_timeline.xml",
-             "?screen_name=" ++ username,
-             "&include_rts=true",
-             "&count=10" ]
+  concat [ "https://api.twitter.com/",
+           "1.1/",
+           "statuses/",
+           "user_timeline.json?",
+           "screen_name=",
+           username,
+           "&include_rts=true&",
+           "count=10" ]
 
 status_url :: Integer -> String
 status_url status_id =
-    concat [ "http://api.twitter.com/1/statuses/show/",
-             (show status_id),
-             ".xml" ]
+  concat [ "https://api.twitter.com/",
+           "1.1/",
+           "statuses/",
+           "show.json?id=",
+           (show status_id) ]
 
--- |Given username's last status id, constructs the API URL for
--- username's new statuses. Essentially, 'user_timeline_url' with a
--- "since_id" parameter tacked on.
+-- | Given username's last status id, constructs the API URL for
+--   username's new statuses. Essentially, 'user_timeline_url' with a
+--   "since_id" parameter tacked on.
 user_new_statuses_url :: String -> Integer -> String
 user_new_statuses_url username last_status_id =
-    concat [ user_timeline_url username,
-             "&since_id=" ++ (show last_status_id) ]
+  concat [ user_timeline_url username,
+           "&since_id=" ++ (show last_status_id) ]
 
 
-get_status :: Integer -> IO (Maybe String)
+get_status :: Integer -> IO B.ByteString
 get_status status_id = do
-    let uri = (status_url status_id)
-    status <- (http_get uri)
-    return status
+  let uri = (status_url status_id)
+  status <- (http_get uri)
+  return status
 
 
--- |Return's username's timeline, or 'Nothing' if there was an error.
-get_user_timeline :: String -> IO (Maybe String)
+-- | Return's username's timeline.
+get_user_timeline :: String -> IO B.ByteString
 get_user_timeline username = do
   let uri = (user_timeline_url username)
   timeline <- (http_get uri)
   return timeline
 
 
--- Returns the XML representing all of username's statuses that are
--- newer than last_status_id.
-get_user_new_statuses :: String -> Integer -> IO (Maybe String)
+-- | Returns the JSON representing all of username's statuses that are
+--   newer than last_status_id.
+get_user_new_statuses :: String -> Integer -> IO B.ByteString
 get_user_new_statuses username last_status_id = do
   let uri = (user_new_statuses_url username last_status_id)
   new_statuses <- (http_get uri)
   return new_statuses
 
 
--- |Uses the CURL API to retrieve uri. Returns 'Nothing' if there was
--- an error.
-http_get :: String -> IO (Maybe String)
-http_get uri = withCurlDo $ do
-  resp <- curlGetString uri [CurlTimeout 45]
+-- | Retrieve a URL, or crash.
+http_get :: String -> IO B.ByteString
+http_get url = do
+  manager <- newManager def
+  request <- parseUrl url
 
-  case resp of
-    (CurlOK, body) -> return (Just body)
-    (code, _) -> do
-        hPutStrLn stderr ("HTTP Error: " ++ (show code))
-        return Nothing
+  C.runResourceT $ do
+    signed_request <- signOAuth oauth credential request
+    response <- http signed_request manager
+    responseBody response C.$$+- sinkLbs
+
+  where
+    consumer_key = BC.pack ""
+    consumer_secret = BC.pack ""
+    access_token = BC.pack ""
+    access_secret = BC.pack ""
+
+    oauth :: OAuth
+    oauth = newOAuth {
+              oauthConsumerKey = consumer_key,
+              oauthConsumerSecret = consumer_secret
+            }
+
+    credential :: Credential
+    credential = newCredential access_token access_secret