GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

correctly show <source> for atom feeds

Browse Source
This commit is contained in:
Evan Prodromou
2010-08-03 15:50:21 -07:00
parent 744233c6dc
commit f83171824f
3 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
classes/Notice.php
View File

@@ -1215,29 +1215,45 @@ class Notice extends Memcached_DataObject
if ($source) {
$xs->elementStart('source');
$atom_feed = $profile->getAtomFeed();
$xs->element('id', null, $profile->profileurl);
$xs->element('title', null, $profile->nickname . " - " . common_config('site', 'name'));
$xs->element('link', array('href' => $profile->profileurl));
if (!empty($atom_feed)) {
$user = User::staticGet('id', $profile->id);
$xs->elementStart('source');
// XXX: we should store the actual feed ID
$xs->element('id', null, $atom_feed);
// XXX: we should store the actual feed title
$xs->element('title', null, $profile->getBestName());
$xs->element('link', array('rel' => 'alternate',
'type' => 'text/html',
'href' => $profile->profileurl));
if (!empty($user)) {
$atom_feed = common_local_url('ApiTimelineUser',
array('format' => 'atom',
'id' => $profile->nickname));
$xs->element('link', array('rel' => 'self',
'type' => 'application/atom+xml',
'href' => $profile->profileurl));
$xs->element('link', array('rel' => 'license',
'href' => common_config('license', 'url')));
'href' => $atom_feed));
$xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
$notice = $profile->getCurrentNotice();
if (!empty($notice)) {
$xs->element('updated', null, common_date_w3dtf($notice->created));
}
$user = User::staticGet('id', $profile->id);
if (!empty($user)) {
$xs->element('link', array('rel' => 'license',
'href' => common_config('license', 'url')));
}
$xs->elementEnd('source');
}
$xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
$xs->element('updated', null, common_date_w3dtf($this->created)); // FIXME: not true!
$xs->elementEnd('source');
}
Event::handle('EndActivitySource', array(&$this, &$xs));
}