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

Merge branch 'candrews-review' into 0.8.x

Browse Source 
* candrews-review:
  Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0).
This commit is contained in:
Zach Copley 2009-07-09 11:28:21 -07:00
commit db58756275
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/Notice.php
View File

@ -1164,6 +1164,18 @@ class Notice extends Memcached_DataObject
}
$tag->free();
# Enclosures
$attachments = $this->attachments();
if($attachments){
foreach($attachments as $attachment){
$attributes = array('rel'=>'enclosure','href'=>$attachment->url,'type'=>$attachment->mimetype,'length'=>$attachment->size);
if($attachment->title){
$attributes['title']=$attachment->title;
}
$xs->element('link', $attributes, null);
}
}
$xs->elementEnd('entry');
return $xs->getString();

9
lib/rssaction.php
View File

@ -216,6 +216,13 @@ class Rss10Action extends Action
$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
$this->element('sioc:reply_of', array('rdf:resource' => $replyurl));
}
$attachments = $notice->attachments();
if($attachments){
foreach($attachments as $attachment){
$this->element('enc:enclosure', array('rdf:resource'=>$attachment->url,'enc:type'=>$attachment->mimetype,'enc:length'=>$attachment->size), null);
}
}
$this->elementEnd('item');
$this->creators[$creator_uri] = $profile;
}
@ -251,6 +258,8 @@ class Rss10Action extends Action
'http://creativecommons.org/ns#',
'xmlns:content' =>
'http://purl.org/rss/1.0/modules/content/',
'xmlns:enc' =>
'http://purl.oclc.org/net/rss_2.0/enc#',
'xmlns:foaf' =>
'http://xmlns.com/foaf/0.1/',
'xmlns:sioc' =>

21
lib/twitterapi.php
View File

@ -207,7 +207,6 @@ class TwitterapiAction extends Action
function twitter_rss_entry_array($notice)
{
$profile = $notice->getProfile();
$entry = array();
@ -224,6 +223,19 @@ class TwitterapiAction extends Action
$entry['updated'] = $entry['published'];
$entry['author'] = $profile->getBestName();
# Enclosure
$attachments = $notice->attachments();
if($attachments){
$entry['enclosures']=array();
foreach($attachments as $attachment){
$enclosure=array();
$enclosure['url']=$attachment->url;
$enclosure['mimetype']=$attachment->mimetype;
$enclosure['size']=$attachment->size;
$entry['enclosures'][]=$enclosure;
}
}
# RSS Item specific
$entry['description'] = $entry['content'];
$entry['pubDate'] = common_date_rfc2822($notice->created);
@ -378,6 +390,13 @@ class TwitterapiAction extends Action
$this->element('pubDate', null, $entry['pubDate']);
$this->element('guid', null, $entry['guid']);
$this->element('link', null, $entry['link']);
# RSS only supports 1 enclosure per item
if($entry['enclosures']){
$enclosure = $entry['enclosures'][0];
$this->element('enclosure', array('url'=>$enclosure['url'],'type'=>$enclosure['mimetype'],'length'=>$enclosure['size']), null);
}
$this->elementEnd('item');
}