X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FTwitter%2FHttp.hs;h=be10b8697a5be241a23b22ca0e8b5b197ab54013;hp=c8b8e470b5d0f9cfafdaea0df39b89fbf26f495a;hb=7bb00e04c15781d889f950d00babf3f183047bff;hpb=cf0e5470657c80d2e4db116b309e8ca35b4136ad

diff --git a/src/Twitter/Http.hs b/src/Twitter/Http.hs
index c8b8e47..be10b86 100644
--- a/src/Twitter/Http.hs
+++ b/src/Twitter/Http.hs
@@ -1,4 +1,8 @@
-module Twitter.Http
+module Twitter.Http (
+  get_user_new_statuses,
+  get_user_timeline,
+  http_get
+  )
 where
 
 import qualified Data.ByteString.Lazy as B
@@ -13,6 +17,8 @@ import Web.Authenticate.OAuth (
   newOAuth,
   signOAuth)
 
+import Configuration (Cfg(..))
+
 -- |The API URL of username's timeline.
 --
 -- See,
@@ -30,47 +36,36 @@ user_timeline_url username =
            "&include_rts=true&",
            "count=10" ]
 
-status_url :: Integer -> String
-status_url status_id =
-  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.
 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) ]
-
-
-get_status :: Integer -> IO B.ByteString
-get_status status_id = do
-  let uri = status_url status_id
-  http_get uri
+  url ++ "&since_id=" ++ since_id
+  where
+    url = user_timeline_url username
+    since_id = show last_status_id
 
 
 -- | Return's username's timeline.
-get_user_timeline :: String -> IO B.ByteString
-get_user_timeline username = do
+get_user_timeline :: Cfg -> String -> IO B.ByteString
+get_user_timeline cfg username = do
   let uri = user_timeline_url username
-  http_get uri
+  http_get cfg uri
 
 
 -- | 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
+get_user_new_statuses :: Cfg -> String -> Integer -> IO B.ByteString
+get_user_new_statuses cfg username last_status_id = do
   let uri = user_new_statuses_url username last_status_id
-  http_get uri
+  http_get cfg uri
 
 
 -- | Retrieve a URL, or crash.
-http_get :: String -> IO B.ByteString
-http_get url = do
+http_get :: Cfg -> String -> IO B.ByteString
+http_get cfg url = do
   manager <- newManager def
   request <- parseUrl url
 
@@ -80,16 +75,16 @@ http_get url = do
     responseBody response C.$$+- sinkLbs
 
   where
-    consumer_key = BC.pack ""
-    consumer_secret = BC.pack ""
-    access_token = BC.pack ""
-    access_secret = BC.pack ""
+    consumer_key' = BC.pack (consumer_key cfg)
+    consumer_secret' = BC.pack (consumer_secret cfg)
+    access_token' = BC.pack (access_token cfg)
+    access_secret' = BC.pack (access_secret cfg)
 
     oauth :: OAuth
     oauth = newOAuth {
-              oauthConsumerKey = consumer_key,
-              oauthConsumerSecret = consumer_secret
+              oauthConsumerKey = consumer_key',
+              oauthConsumerSecret = consumer_secret'
             }
 
     credential :: Credential
-    credential = newCredential access_token access_secret
+    credential = newCredential access_token' access_secret'