eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Make search API Atom feeds more valid

Browse Source
This commit is contained in:
Zach Copley 2009-03-10 18:17:20 -07:00
parent a989c58c11
commit 1e29cbd691
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actions/twitapisearchatom.php
View File

@ -52,7 +52,6 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
class TwitapisearchatomAction extends TwitterapiAction class TwitapisearchatomAction extends TwitterapiAction
{ {
var $notices;
var $cnt; var $cnt;
var $query; var $query;
var $lang; var $lang;
@ -156,6 +155,7 @@ class TwitapisearchatomAction extends TwitterapiAction
{ {
// TODO: Support search operators like from: and to:, boolean, etc. // TODO: Support search operators like from: and to:, boolean, etc.
$notices = array();
$notice = new Notice(); $notice = new Notice();
// lcase it for comparison // lcase it for comparison
@ -226,6 +226,10 @@ class TwitapisearchatomAction extends TwitterapiAction
$this->elementStart('feed', $this->elementStart('feed',
array('xmlns' => 'http://www.w3.org/2005/Atom', array('xmlns' => 'http://www.w3.org/2005/Atom',
// XXX: xmlns:twitter causes Atom validation to fail
// It's used for the source attr on notices
'xmlns:twitter' => 'http://api.twitter.com/', 'xmlns:twitter' => 'http://api.twitter.com/',
'xml:lang' => $lang)); 'xml:lang' => $lang));
@ -251,7 +255,8 @@ class TwitapisearchatomAction extends TwitterapiAction
// self link // self link
$self_uri = $search_uri . '&page=' . $this->page; $self_uri = $search_uri;
$self_uri .= ($this->page > 1) ? '&page=' . $this->page : '';
$this->element('link', array('type' => 'application/atom+xml', $this->element('link', array('type' => 'application/atom+xml',
'rel' => 'self', 'rel' => 'self',
@ -317,10 +322,11 @@ class TwitapisearchatomAction extends TwitterapiAction
'rel' => 'alternate', 'rel' => 'alternate',
'href' => $nurl)); 'href' => $nurl));
$this->element('title', null, common_xml_safe_str(trim($notice->content))); $this->element('title', null, common_xml_safe_str(trim($notice->content)));
$this->element('content', array('type' => 'text/html'), $notice->rendered); $this->element('content', array('type' => 'html'), $notice->rendered);
$this->element('updated', null, common_date_w3dtf($notice->created)); $this->element('updated', null, common_date_w3dtf($notice->created));
$this->element('link', array('type' => 'image/png', $this->element('link', array('type' => 'image/png',
'rel' => 'image', // XXX: Twitter uses rel="image" (not valid)
'rel' => 'related',
'href' => $profile->avatarUrl())); 'href' => $profile->avatarUrl()));
// TODO: Here is where we'd put in a link to an atom feed for threads // TODO: Here is where we'd put in a link to an atom feed for threads