twitter timelines

diff --git a/extra/twitter/twitter.factor b/extra/twitter/twitter.factor
index 707bcceda6afe2c8e3a94db97572fe80d4028c14..f9806a7c4fd53602547172d1c70efed5a17c3b5d 100644 (file)
--- a/extra/twitter/twitter.factor
+++ b/extra/twitter/twitter.factor
@@ -1,9 +1,67 @@
-USING: accessors assocs hashtables http http.client json.reader
-kernel namespaces urls.secure urls.encoding ;
+USING: accessors assocs combinators hashtables http
+http.client json.reader kernel macros namespaces sequences
+urls.secure urls.encoding ;
 IN: twitter
 
 SYMBOLS: twitter-username twitter-password ;
 
+TUPLE: twitter-status
+    created-at
+    id
+    text
+    source
+    truncated?
+    in-reply-to-status-id
+    in-reply-to-user-id
+    favorited?
+    user ;
+TUPLE: twitter-user
+    id
+    name
+    screen-name
+    description
+    location
+    profile-image-url 
+    url
+    protected?
+    followers-count ;
+
+MACRO: keys-boa ( keys class -- )
+    [ [ \ swap \ at [ ] 3sequence ] map \ cleave ] dip \ boa [ ] 4sequence ;
+
+: <twitter-user> ( assoc -- user )
+    {
+        "id"
+        "name"
+        "screen_name"
+        "description"
+        "location"
+        "profile_image_url"
+        "url"
+        "protected"
+        "followers_count"
+    } twitter-user keys-boa ;
+
+: <twitter-status> ( assoc -- tweet )
+    clone "user" over [ <twitter-user> ] change-at 
+    {
+        "created_at"
+        "id"
+        "text"
+        "source"
+        "truncated"
+        "in_reply_to_status_id"
+        "in_reply_to_user_id"
+        "favorited"
+        "user"
+    } twitter-status keys-boa ;
+
+: json>twitter-statuses ( json-array -- tweets )
+    json> [ <twitter-status> ] map ;
+
+: json>twitter-status ( json-object -- tweet )
+    json> <twitter-status> ;
+
 : set-twitter-credentials ( username password -- )
     [ twitter-username set ] [ twitter-password set ] bi* ; 
 
@@ -13,10 +71,27 @@ SYMBOLS: twitter-username twitter-password ;
 : update-post-data ( update -- assoc )
     "status" associate ;
 
-: tweet* ( string -- result )
+: (tweet) ( string -- json )
     update-post-data "https://twitter.com/statuses/update.json" <post-request>
         set-request-twitter-auth 
-    http-request nip json> ;
+    http-request nip ;
+
+: tweet* ( string -- tweet )
+    (tweet) json>twitter-status ;
+
+: tweet ( string -- ) (tweet) drop ;
+
+: public-timeline ( -- tweets )
+    "https://twitter.com/statuses/public_timeline.json" <get-request>
+        set-request-twitter-auth
+    http-request nip json>twitter-statuses ;
 
-: tweet ( string -- ) tweet* drop ;
+: friends-timeline ( -- tweets )
+    "https://twitter.com/statuses/friends_timeline.json" <get-request>
+        set-request-twitter-auth
+    http-request nip json>twitter-statuses ;
 
+: user-timeline ( username -- tweets )
+    "https://twitter.com/statuses/user_timeline/" ".json" surround <get-request>
+        set-request-twitter-auth
+    http-request nip json>twitter-statuses ;