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

Display linked oembed resources as enclosures if they are of non-html mime types

Browse Source
This commit is contained in:
Craig Andrews 2009-08-26 15:40:51 -04:00
parent d9e8dabaf4
commit 6d60d74093
4 changed files with 63 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
classes/File.php
View File

@ -195,17 +195,49 @@ class File extends Memcached_DataObject
return 'http://'.$server.$path.$filename;
}
function isEnclosure(){
function getEnclosure(){
$enclosure = (object) array();
$enclosure->title=$this->title;
$enclosure->url=$this->url;
$enclosure->title=$this->title;
$enclosure->date=$this->date;
$enclosure->modified=$this->modified;
$enclosure->size=$this->size;
$enclosure->mimetype=$this->mimetype;
if(isset($this->filename)){
return true;
return $enclosure;
}else{
$notEnclosureMimeTypes = array('text/html','application/xhtml+xml');
$mimetype = strtolower($this->mimetype);
$semicolon = strpos($mimetype,';');
if($semicolon){
$mimetype = substr($mimetype,0,$semicolon);
}
if(in_array($mimetype,$notEnclosureMimeTypes)){
$ombed = File_oembed::staticGet('file_id',$this->id);
if($oembed){
$mimetype = strtolower($ombed->mimetype);
$semicolon = strpos($mimetype,';');
if($semicolon){
$mimetype = substr($mimetype,0,$semicolon);
}
if(in_array($mimetype,$notEnclosureMimeTypes)){
return false;
}else{
if($ombed->mimetype) $enclosure->mimetype=$ombed->mimetype;
if($ombed->url) $enclosure->url=$ombed->url;
if($ombed->title) $enclosure->title=$ombed->title;
if($ombed->modified) $enclosure->modified=$ombed->modified;
unset($ombed->size);
}
}else{
return $enclosure;
}
}else{
return $enclosure;
}
}
$notEnclosureMimeTypes = array('text/html','application/xhtml+xml');
$mimetype = strtolower($this->mimetype);
$semicolon = strpos($mimetype,';');
if($semicolon){
$mimetype = substr($mimetype,0,$semicolon);
}
return(! in_array($mimetype,$notEnclosureMimeTypes));
}
}

9
classes/Notice.php
View File

@ -1199,10 +1199,11 @@ class Notice extends Memcached_DataObject
$attachments = $this->attachments();
if($attachments){
foreach($attachments as $attachment){
if ($attachment->isEnclosure()) {
$attributes = array('rel'=>'enclosure','href'=>$attachment->url,'type'=>$attachment->mimetype,'length'=>$attachment->size);
if($attachment->title){
$attributes['title']=$attachment->title;
$enclosure=$attachment->getEnclosure();
if ($enclosure) {
$attributes = array('rel'=>'enclosure','href'=>$enclosure->url,'type'=>$enclosure->mimetype,'length'=>$enclosure->size);
if($enclosure->title){
$attributes['title']=$enclosure->title;
}
$xs->element('link', $attributes, null);
}

23
lib/rssaction.php
View File

@ -258,26 +258,27 @@ class Rss10Action extends Action
$attachments = $notice->attachments();
if($attachments){
foreach($attachments as $attachment){
if ($attachment->isEnclosure()) {
$enclosure=$attachment->getEnclosure();
if ($enclosure) {
// DO NOT move xmlns declaration to root element. Making it
// the default namespace here improves compatibility with
// real-world feed readers.
$attribs = array(
'rdf:resource' => $attachment->url,
'url' => $attachment->url,
'rdf:resource' => $enclosure->url,
'url' => $enclosure->url,
'xmlns' => 'http://purl.oclc.org/net/rss_2.0/enc#'
);
if ($attachment->title) {
$attribs['dc:title'] = $attachment->title;
if ($enclosure->title) {
$attribs['dc:title'] = $enclosure->title;
}
if ($attachment->modified) {
$attribs['dc:date'] = common_date_w3dtf($attachment->modified);
if ($enclosure->modified) {
$attribs['dc:date'] = common_date_w3dtf($enclosure->modified);
}
if ($attachment->size) {
$attribs['length'] = $attachment->size;
if ($enclosure->size) {
$attribs['length'] = $enclosure->size;
}
if ($attachment->mimetype) {
$attribs['type'] = $attachment->mimetype;
if ($enclosure->mimetype) {
$attribs['type'] = $enclosure->mimetype;
}
$this->element('enclosure', $attribs);
}

9
lib/twitterapi.php
View File

@ -274,11 +274,12 @@ class TwitterapiAction extends Action
$enclosures = array();
foreach ($attachments as $attachment) {
if ($attachment->isEnclosure()) {
$enclosure_o=$attachment->getEnclosure();
if ($enclosure_o) {
$enclosure = array();
$enclosure['url'] = $attachment->url;
$enclosure['mimetype'] = $attachment->mimetype;
$enclosure['size'] = $attachment->size;
$enclosure['url'] = $enclosure_o->url;
$enclosure['mimetype'] = $enclosure_o->mimetype;
$enclosure['size'] = $enclosure_o->size;
$enclosures[] = $enclosure;
}
}