8 files changed, 69 insertions, 23 deletions
diff --git a/actions/apiaccount.php b/actions/apiaccount.php
index 6d5766916..2be53122e 100644
--- a/actions/apiaccount.php
+++ b/actions/apiaccount.php
@@ -19,9 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-# This naming convention looks real sick
-class ApiaccountAction extends Action {
+require_once(INSTALLDIR.'/lib/twitterapi.php');
 
+class ApiaccountAction extends TwitterapiAction {
 
 	function verify_credentials($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apiblocks.php b/actions/apiblocks.php
index be96e87e1..c9c7a0082 100644
--- a/actions/apiblocks.php
+++ b/actions/apiblocks.php
@@ -19,8 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-# This naming convention looks real sick
-class ApiblocksAction extends Action {
+require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+class ApiblocksAction extends TwitterapiAction {
 
 	function create($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apidirect_messages.php b/actions/apidirect_messages.php
index 477aa4329..351a4bb29 100644
--- a/actions/apidirect_messages.php
+++ b/actions/apidirect_messages.php
@@ -19,7 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class Apidirect_messagesAction extends Action {
+require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+class Apidirect_messagesAction extends TwitterapiAction {
 
 	function direct_messages($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apifavorites.php b/actions/apifavorites.php
index 358079c86..db8ad1062 100644
--- a/actions/apifavorites.php
+++ b/actions/apifavorites.php
@@ -19,8 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-# This naming convention looks real sick
-class ApifavoritesAction extends Action {
+require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+class ApifavoritesAction extends TwitterapiAction {
 
 	function favorites($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apifriendships.php b/actions/apifriendships.php
index feed86ef6..4368f84d5 100644
--- a/actions/apifriendships.php
+++ b/actions/apifriendships.php
@@ -19,8 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-# This naming convention looks real sick
-class ApifriendshipsAction extends Action {
+require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+class ApifriendshipsAction extends TwitterapiAction {
 
 
 	function create($args, $apidata) {
diff --git a/actions/apihelp.php b/actions/apihelp.php
index 8bcc09e69..66a08c99a 100644
--- a/actions/apihelp.php
+++ b/actions/apihelp.php
@@ -19,8 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-# This naming convention looks real sick
-class ApihelpAction extends Action {
+require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+class ApihelpAction extends TwitterapiAction {
 
 	/* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
 	 * URL:http://identi.ca/api/help/test.format
diff --git a/actions/apinotifications.php b/actions/apinotifications.php
index 9154cb3b9..98d96107d 100644
--- a/actions/apinotifications.php
+++ b/actions/apinotifications.php
@@ -19,8 +19,10 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once(INSTALLDIR.'/lib/twitterapi.php');
+
 # This naming convention looks real sick
-class ApinotificationsAction extends Action {
+class ApinotificationsAction extends TwitterapiAction {
 
 
 	function follow($args, $apidata) {
diff --git a/actions/apistatuses.php b/actions/apistatuses.php
index 89eabfcdc..b43823643 100644
--- a/actions/apistatuses.php
+++ b/actions/apistatuses.php
@@ -19,28 +19,66 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+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 develop the
+ * 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 
  */
-class ApistatusesAction extends Action {
+class ApistatusesAction extends TwitterapiAction {
 	
 	/*
-		Returns the 20 most recent statuses from non-protected users who have set a custom user icon. 
-		Does not require authentication.
-		
-		URL: http://identi.ca/api/statuses/public_timeline.format
-
-		Formats: xml, json, rss, atom
-	*/
+	 *  Returns the 20 most recent statuses from non-protected users who have set a custom
+	 *  user icon. Does not require authentication.
+	 *	
+	 *	URL: http://identi.ca/api/statuses/public_timeline.format
+     *
+	 *	Formats: xml, json, rss, atom
+	 */
 	function public_timeline($args, $apidata) {
 		parent::handle($args);
 
-		print "Public Timeline! requested content-type: " . $apidata['content-type'] . "\n";
+		if ($apidata['content-type'] == 'xml') {
+			header('Content-Type: application/xml; charset=utf-8');		
+			$notice = DB_DataObject::factory('notice');
+
+			# FIXME: bad performance
+			$notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
+			$notice->orderBy('created DESC, notice.id DESC');
+			$notice->limit(20);
+			$cnt = $notice->find();
+
+			common_start_xml();
+
+			// XXX: To really live up to the spec we need to build a list
+			// of notices by users who have custom avatars
+			if ($cnt > 0) {
+				common_element_start('statuses', array('type' => 'array'));
+				for ($i = 0; $i < 20; $i++) {
+					if ($notice->fetch()) {
+						$this->show_xml_status($notice);
+					} else {
+						// shouldn't happen!
+						break;
+					}
+				}
+				common_element_end('statuses');
+			}
 		
+			common_end_xml();
+		} elseif ($apidata['content-type'] == 'rss') {
+			common_server_error("API method under construction.", $code=501);
+		} elseif ($apidata['content-type'] == 'atom') {
+			common_server_error("API method under construction.", $code=501);	
+		} elseif ($apidata['content-type'] == 'json') {
+			common_server_error("API method under construction.", $code=501);
+		}
+
 		exit();
-	}
+	}	
 	
+
+		
 	/*
 	Returns the 20 most recent statuses posted by the authenticating user and that user's friends. 
 	This is the equivalent of /home on the Web.