X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frssaction.php;h=76859a876ad0d31b3841ca02ad70da72d31e140d;hb=45983cc590cbac384cc1265f3eab66bbcbf80e77;hp=6e2efc1823cc784a6314ec2c95d69896637702cf;hpb=f5bddd414a73bce447ad0572e27b0968886ca7a3;p=quix0rs-gnu-social.git

diff --git a/lib/rssaction.php b/lib/rssaction.php
index 6e2efc1823..76859a876a 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -23,6 +23,13 @@ define('DEFAULT_RSS_LIMIT', 48);
 
 class Rss10Action extends Action {
 
+	# This will contain the details of each feed item's author and be used to generate SIOC data.
+	var $creators = array();
+
+	function is_readonly() {
+		return true;
+	}
+	
 	function handle($args) {
 		parent::handle($args);
 		$limit = (int) $this->trimmed('limit');
@@ -67,11 +74,11 @@ class Rss10Action extends Action {
 			$this->show_item($n);
 		}
 
+		$this->show_creators();
 		$this->end_rss();
 	}
 
 	function show_channel($notices) {
-		global $config;
 
 		$channel = $this->get_channel();
 		$image = $this->get_image();
@@ -80,7 +87,7 @@ class Rss10Action extends Action {
 		common_element('title', NULL, $channel['title']);
 		common_element('link', NULL, $channel['link']);
 		common_element('description', NULL, $channel['description']);
-		common_element('cc:licence', array('rdf:resource' => $config['license']['url']));
+		common_element('cc:licence', array('rdf:resource' => common_config('license','url')));
 
 		if ($image) {
 			common_element('image', array('rdf:resource' => $image));
@@ -90,7 +97,7 @@ class Rss10Action extends Action {
 		common_element_start('rdf:Seq');
 
 		foreach ($notices as $notice) {
-			common_element('rdf:li', array('rdf:resource' => $notice->uri));
+			common_element('sioct:MicroblogPost', array('rdf:resource' => $notice->uri));
 		}
 
 		common_element_end('rdf:Seq');
@@ -112,9 +119,9 @@ class Rss10Action extends Action {
 	}
 
 	function show_item($notice) {
-		global $config;
 		$profile = Profile::staticGet($notice->profile_id);
 		$nurl = common_local_url('shownotice', array('notice' => $notice->id));
+		$creator_uri = common_profile_uri($profile);
 		common_element_start('item', array('rdf:about' => $notice->uri));
 		$title = $profile->nickname . ': ' . $notice->content;
 		common_element('title', NULL, $title);
@@ -122,11 +129,33 @@ class Rss10Action extends Action {
 		common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));
 		common_element('dc:date', NULL, common_date_w3dtf($notice->created));
 		common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
-		common_element('cc:licence', array('rdf:resource' => $config['license']['url']));
+		common_element('sioc:has_creator', array('rdf:resource' => $creator_uri));
+		common_element('laconica:postIcon', array('rdf:resource' => common_profile_avatar_url($profile)));
+		common_element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
 		common_element_end('item');
+		$this->creators[$creator_uri] = $profile;
 	}
 
+	function show_creators() {
+		foreach ($this->creators as $uri => $profile) {
+			$id = $profile->id;
+			$nickname = $profile->nickname;
+			
+			common_element_start('sioc:User', array('rdf:about' => $uri));
+			common_element('foaf:nick', NULL, $nickname);                                                
+			if ($profile->fullname) {
+				common_element('foaf:name', NULL, $profile->fullname);
+			}
+			common_element('sioc:id', NULL, $id);
+			$avatar = common_profile_avatar_url($profile);
+			common_element('sioc:avatar', array('rdf:resource' => $avatar));
+			common_element_end('sioc:User');
+		}
+	}
+	
 	function init_rss() {
+		$channel = $this->get_channel();
+		
 		header('Content-Type: application/rdf+xml');
 
 		common_start_xml();
@@ -136,7 +165,23 @@ class Rss10Action extends Action {
 											  'http://purl.org/dc/elements/1.1/',
 											  'xmlns:cc' =>
 											  'http://web.resource.org/cc/',
+											  'xmlns:foaf' =>
+											  'http://xmlns.com/foaf/0.1/',
+											  'xmlns:sioc' =>
+											  'http://rdfs.org/sioc/ns#',
+		                                      'xmlns:sioct' =>
+		                                      'http://rdfs.org/sioc/types#',
+		                                      'xmlns:laconica' =>
+		                                      'http://laconi.ca/ont/',
 											  'xmlns' => 'http://purl.org/rss/1.0/'));
+		
+		common_element_start('sioc:Site', array('rdf:about' => common_root_url()));
+		common_element('sioc:name', NULL, common_config('site', 'name'));
+		common_element_start('sioc:container_of');
+		common_element('sioc:Container', array('rdf:about' =>
+		                                       $channel['url']));
+		common_element_end('sioc:container_of');
+		common_element_end('sioc:Site');
 	}
 
 	function end_rss() {