diff options
| -rw-r--r-- | actions/twitapistatuses.php | 28 | ||||
| -rw-r--r-- | lib/twitterapi.php | 26 |
2 files changed, 49 insertions, 5 deletions
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 3a495a129..f9b804bd1 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -101,7 +101,33 @@ class TwitapistatusesAction extends TwitterapiAction { $this->end_twitter_rss(); } elseif ($apidata['content-type'] == 'atom') { - common_server_error("API method under construction.", $code=501); + + header('Content-Type: application/atom+xml; charset=utf-8'); + + $this->init_twitter_atom(); + + $sitename = common_config('site', 'name'); + $siteserver = common_config('site', 'server'); + + common_element('title', NULL, "$sitename public timeline"); + common_element('id', NULL, "tag:$siteserver:Statuses"); + common_element('link', array('href' => "http://$siteserver", 'rel' => 'alternate', 'type' => 'text/html'), NULL); + common_element('subtitle', NULL, "$sitename updates from everyone!"); + + if ($cnt > 0) { + for ($i = 0; $i < 20; $i++) { + if ($notice->fetch()) { + $entry = $this->twitter_rss_entry_array($notice); + $this->show_twitter_atom_entry($entry); + } else { + // shouldn't happen! + break; + } + } + } + + $this->end_twitter_atom(); + } elseif ($apidata['content-type'] == 'json') { header('Content-Type: application/json; charset=utf-8'); diff --git a/lib/twitterapi.php b/lib/twitterapi.php index b11c04876..2c4ddbbd5 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -77,7 +77,7 @@ class TwitterapiAction extends Action { $entry['title'] = $entry['content']; $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));; $entry['published'] = $this->date_iso8601($notice->created); - $entry['id'] = "tag:http://$server,$entry[published]:$entry[link]"; + $entry['id'] = "tag:$server,$entry[published]:$entry[link]"; $entry['updated'] = $entry['published']; # RSS Item specific @@ -127,6 +127,17 @@ class TwitterapiAction extends Action { common_element('link', NULL, $entry['link']); common_element_end('item'); } + + function show_twitter_atom_entry($entry) { + common_element_start('entry'); + common_element('title', NULL, $entry['title']); + common_element('content', array('type' => 'html'), $entry['title']); + common_element('id', NULL, $entry['id']); + common_element('published', NULL, $entry['published']); + common_element('updated', NULL, $entry['updated']); + common_element('link', array('href' => $entry['link'], 'rel' => 'alternate', 'type' => 'text/html'), NULL); + common_element_end('entry'); + } function render_twitter_json_statuses($twitter_statuses) { print(json_encode($twitter_statuses)); @@ -197,20 +208,27 @@ class TwitterapiAction extends Action { } function init_twitter_rss() { - common_start_xml(); common_element_start('rss', array('version' => '2.0')); } function end_twitter_rss() { - common_element_end('rss'); common_end_xml(); - } function get_twitter_channel() { } + + function init_twitter_atom() { + common_start_xml(); + common_element_start('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', 'xml:lang' => 'en-US')); + } + + function end_twitter_atom() { + common_end_xml(); + common_element_end('feed'); + } }
\ No newline at end of file |