Twitter-compatible API - /statuses/show and /statuses/update now work

darcs-hash:20080717054411-ca946-e839882ebec3f6d6a12a3f5ecdc1cc403e8afe51.gz

diff --git a/actions/api.php b/actions/api.php
index 6a420c95e2eb3d0e045b77a855164acd95c67cda..ea24cbe4a125be09ebf147bc8d257a52c89011d2 100644 (file)
--- a/actions/api.php
+++ b/actions/api.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 class ApiAction extends Action {
 
-       var $nickname;
+       var $user;
        var $content_type;
        var $api_arg;
        var $api_method;
@@ -63,7 +63,7 @@ class ApiAction extends Action {
                                $user = common_check_user($nickname, $password);
                                
                                if ($user) {
-                                       $this->nickname = $nickname;
+                                       $this->user = $user;
                                        $this->process_command();
                                } else {
                                        # basic authentication failed
@@ -88,7 +88,7 @@ class ApiAction extends Action {
                                $apidata = array(       'content-type' => $this->content_type,
                                                                        'api_method' => $this->api_method,
                                                                        'api_arg' => $this->api_arg,
-                                                                       'nickanme' => $htis->nickanme);
+                                                                       'user' => $this->user);
                                
                                call_user_func(array($action_obj, $this->api_method), $_REQUEST, $apidata);
                                # all API methods should exit()

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 98ca299f6ddc54a35b99985d3209d04d3234bb74..252bfe5d552a6d5015a6f87e2115ddaaccbc1ccf 100644 (file)
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -23,18 +23,10 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 /* XXX: Please don't freak out about all the ugly comments in this file.
  * They are mostly in here for reference while I work on the
- * API. I'll fix things up to make them look better later. -- Zach 
+ * API. I'll fix things up later to make them look better later. -- Zach 
  */
 class TwitapistatusesAction extends TwitterapiAction {
        
-       /*
-        *  Returns the MAX_PUBSTATUSES most recent statuses from non-protected users who 
-        *  have set a custom avatar. Does not require authentication.
-        *      
-        *      URL: http://server/api/statuses/public_timeline.format
-     *
-        *      Formats: xml, json, rss, atom
-        */
        function public_timeline($args, $apidata) {
                parent::handle($args);
 
@@ -225,41 +217,19 @@ class TwitapistatusesAction extends TwitterapiAction {
                
                exit(); 
        }
-       
-       /*
-        * Returns a single notice, specified by the id parameter below. 
-        * The status's author will be returned inline.
-        *      
-        * URL: http://server/api/statuses/show/id.format
-        *      
-        * Formats: xml, json
-        *      
-     * Parameters:
-     *         
-     * id. Required. The numerical ID of the status you're trying to retrieve. 
-        * Ex: http://server/api/statuses/show/123.xml
-        *
-        */     
+
        function show($args, $apidata) {
                parent::handle($args);
-
-               $id = $apidata['api_arg'];
+               
+               $id = $apidata['api_arg'];              
                $notice = Notice::staticGet($id);
 
                if ($notice) {
 
                        if ($apidata['content-type'] == 'xml') { 
-                               header('Content-Type: application/xml; charset=utf-8');         
-                       
-                               common_start_xml();
-                               $twitter_status = $this->twitter_status_array($notice);                                         
-                               $this->show_twitter_xml_status($twitter_status);
-                               common_end_xml();
-                       
+                               $this->show_single_xml_status($notice);
                        } elseif ($apidata['content-type'] == 'json') {
-                               header('Content-Type: application/json; charset=utf-8');
-                               $status = $this->twitter_status_array($notice);
-                               $this->show_twitter_json_statuses($status);
+                               $this->show_single_json_status($notice);
                        }
                } else {
                        header('HTTP/1.1 404 Not Found');
@@ -267,23 +237,83 @@ class TwitapistatusesAction extends TwitterapiAction {
                
                exit();
        }
+               
+       function show_single_xml_status($notice) {
+               header('Content-Type: application/xml; charset=utf-8');         
+               common_start_xml();
+               $twitter_status = $this->twitter_status_array($notice);                                         
+               $this->show_twitter_xml_status($twitter_status);
+               common_end_xml();
+               exit();
+       }
        
-       /*
-               Updates the authenticating user's status.  Requires the status parameter specified below.  Request must be a POST.
+       function show_single_json_status($notice) {
+               header('Content-Type: application/json; charset=utf-8');
+               $status = $this->twitter_status_array($notice);
+               $this->show_twitter_json_statuses($status);
+               exit();
+       }
+               
+       function update($args, $apidata) {
+               parent::handle($args);
+               
+               $user = $apidata['user'];
+                               
+               $notice = DB_DataObject::factory('notice');             
+               
+               $notice->profile_id = $user->id; # user id *is* profile id
+               $notice->created = DB_DataObject_Cast::dateTime();      
+               $notice->content = $this->trimmed('status');
 
-               URL: http://server/api/statuses/update.format
+               if (!$notice->content) {
+                       
+                       // XXX: Note: In this case, Twitter simply returns '200 OK'
+                       // No error is given, but the status is not posted to the 
+                       // user's timeline.  Seems bad.  Shouldn't we throw an 
+                       // errror? -- Zach
+                       exit();
+                       
+               } else if (strlen($notice->content) > 140) {
+
+                       // XXX: Twitter truncates anything over 140, flags the status 
+                   // as "truncated."  Sending this error may screw up some clients
+                   // that assume Twitter will truncate for them.  Should we just
+                   // truncate too? -- Zach
+                       header('HTTP/1.1 406 Not Acceptable');                  
+                       print "That's too long. Max notice size is 140 chars.\n";
+                       exit();
+               }
 
-               Formats: xml, json.  Returns the posted status in requested format when successful.
+               $notice->rendered = common_render_content($notice->content, $notice);
 
-               Parameters:
+               $id = $notice->insert();
 
-                   * status. Required. The text of your status update. Be sure to URL encode as necessary. Must not be more than 160
-            characters and should not be more than 140 characters to ensure optimal display.
+               if (!$id) {
+                       common_server_error('Could not update status!', 500);
+                       exit();
+               }
 
-       */
-       function update($args, $apidata) {
-               parent::handle($args);
-               common_server_error("API method under construction.", $code=501);
+               $orig = clone($notice);
+               $notice->uri = common_notice_uri($notice);
+
+               if (!$notice->update($orig)) {
+                       common_server_error('Could not save status!', 500);
+                       exit();
+               }
+
+        common_save_replies($notice);
+               common_broadcast_notice($notice);
+
+               // FIXME: Bad Hack 
+               // I should be able to just sent this notice off for display,
+               // but $notice->created does not contain a string at this
+               // point and I don't know how to convert it to one here. So
+               // I'm forced to have DBObject pull the notice back out of the
+               // DB before printing. --Zach
+               $apidata['api_arg'] = $id;
+               $this->show($args, $apidata);
+
+               exit();
        }
        
        /*

diff --git a/htaccess.sample b/htaccess.sample
index 4ee0d62122212532e6293167d04cfce82172711e..da1355c065044fc3c82459443c5d82454ac8275c 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -62,7 +62,7 @@ RewriteRule ^api/statuses/public_timeline(.*)$ index.php?action=api&apiaction=st
 RewriteRule ^api/statuses/friends_timeline(.*)$ index.php?action=api&apiaction=statuses&method=friends_timeline$1 [L,QSA]
 RewriteRule ^api/statuses/user_timeline(.*)$ index.php?action=api&apiaction=statuses&method=user_timeline$1 [L,QSA]
 RewriteRule ^api/statuses/show/(.*)$ index.php?action=api&apiaction=statuses&method=show&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/update/(.*)$ index.php?action=api&apiaction=statuses&method=update&argument=$1 [L,QSA]
+RewriteRule ^api/statuses/update(.*)$ index.php?action=api&apiaction=statuses&method=update$1 [L,QSA]
 RewriteRule ^api/statuses/replies/(.*)$ index.php?action=api&apiaction=statuses&method=replies&argument=$1 [L,QSA]
 RewriteRule ^api/statuses/destroy/(.*)$ index.php?action=api&apiaction=statuses&method=destroy&argument=$1 [L,QSA]
 RewriteRule ^api/statuses/friends(.*)$ index.php?action=api&apiaction=statuses&method=friends$1 [L,QSA]

diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index e886f1822cc368fdfcd1b00147636bc3613e4cd0..ff46a28f6480a9b0de414d95b2254478989c9f94 100644 (file)
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -141,6 +141,8 @@ class TwitterapiAction extends Action {
        function show_twitter_json_statuses($twitter_statuses) {
                print(json_encode($twitter_statuses));
        }
+       
+       
                
        // Anyone know what date format this is? 
        // Twitter's dates look like this: "Mon Jul 14 23:52:38 +0000 2008" -- Zach