provide a broken feed for services which require a broken feed

6 files changed, 83 insertions, 70 deletions

diff --git a/Zotlabs/Module/Feed.php b/Zotlabs/Module/Feed.php
index 47871eafb..06637b6d2 100644
--- a/Zotlabs/Module/Feed.php
+++ b/Zotlabs/Module/Feed.php
@@ -1,40 +1,41 @@
 <?php
+
 namespace Zotlabs\Module;
 
 
 require_once('include/items.php');
 
-
 class Feed extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
-		$params = array();
-	
-		$params['begin']     = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin']      : NULL_DATE);
-		$params['end']       = ((x($_REQUEST,'date_end'))   ? $_REQUEST['date_end']        : '');
-		$params['type']      = ((stristr(argv(0),'json'))   ? 'json'                       : 'xml');
-		$params['pages']     = ((x($_REQUEST,'pages'))      ? intval($_REQUEST['pages'])   : 0);
-		$params['top']       = ((x($_REQUEST,'top'))        ? intval($_REQUEST['top'])     : 0);
-		$params['start']     = ((x($params,'start'))        ? intval($params['start'])     : 0);
-		$params['records']   = ((x($params,'records'))      ? intval($params['records'])   : 40);
-		$params['direction'] = ((x($params,'direction'))    ? dbesc($params['direction'])  : 'desc');
-		$params['cat']       = ((x($_REQUEST,'cat'))        ? escape_tags($_REQUEST['cat'])  : '');
-	
-		$channel = '';
+		$params = [];
+	
+		$params['begin']     = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin']       : NULL_DATE);
+		$params['end']       = ((x($_REQUEST,'date_end'))   ? $_REQUEST['date_end']         : '');
+		$params['type']      = ((stristr(argv(0),'json'))   ? 'json'                        : 'xml');
+		$params['pages']     = ((x($_REQUEST,'pages'))      ? intval($_REQUEST['pages'])    : 0);
+		$params['top']       = ((x($_REQUEST,'top'))        ? intval($_REQUEST['top'])      : 0);
+		$params['start']     = ((x($params,'start'))        ? intval($params['start'])      : 0);
+		$params['records']   = ((x($params,'records'))      ? intval($params['records'])    : 40);
+		$params['direction'] = ((x($params,'direction'))    ? dbesc($params['direction'])   : 'desc');
+		$params['cat']       = ((x($_REQUEST,'cat'))        ? escape_tags($_REQUEST['cat']) : '');
+		$params['compat']    = ((x($_REQUEST,'compat'))     ? intval($_REQUEST['compat'])   : 0);	
+
+
 		if(argc() > 1) {
-			$r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1",
-				dbesc(argv(1))
-			);
-			if(!($r && count($r)))
+
+			if(observer_prohibited(true)) {
 				killme();
-	
-			$channel = $r[0];
-	
-			if(observer_prohibited(true))
+			}
+
+			$channel = channelx_by_nick(argv(1));
+			if(! $channel) {
 				killme();
+			}
+	
 	 
-			logger('mod_feed: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
+			logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
 	
 			echo get_public_feed($channel,$params);
 	
@@ -43,6 +44,4 @@ class Feed extends \Zotlabs\Web\Controller {
 	
 	}
 	
-	
-	
 }
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 5c22772c4..3fdff691b 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -94,33 +94,39 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			$result['links'] = [
 	
 				[
-					'rel' => 'http://webfinger.net/rel/avatar',
+					'rel'  => 'http://webfinger.net/rel/avatar',
 					'type' => $r[0]['xchan_photo_mimetype'],
 					'href' => $r[0]['xchan_photo_l']	
 				],
 	
 				[
-					'rel' => 'http://webfinger.net/rel/profile-page',
+					'rel'  => 'http://webfinger.net/rel/profile-page',
 					'href' => z_root() . '/profile/' . $r[0]['channel_address'],
 				],
 	
 				[
-					'rel' => 'http://webfinger.net/rel/blog',
+					'rel'  => 'http://schemas.google.com/g/2010#updates-from', 
+					'type' => 'application/atom+xml', 
+					'href' => z_root() . '/feed/'  . $r[0]['channel_address'] . '?f=&compat=1'
+				],
+
+				[
+					'rel'  => 'http://webfinger.net/rel/blog',
 					'href' => z_root() . '/channel/' . $r[0]['channel_address'],
 				],
 	
 				[
-					'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+					'rel'      => 'http://ostatus.org/schema/1.0/subscribe',
 					'template' => z_root() . '/follow/url={uri}',
 				],
 	
 				[
-					'rel' => 'http://purl.org/zot/protocol',
+					'rel'  => 'http://purl.org/zot/protocol',
 					'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],
 				],
 	
 				[
-					'rel' => 'magic-public-key',
+					'rel'  => 'magic-public-key',
 					'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
 				]
 			];
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 3ed19962b..ba650be55 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 			'$aliases'     => $aliases,
 			'$profile_url' => z_root() . '/channel/'       . $r[0]['channel_address'],
 			'$hcard_url'   => z_root() . '/hcard/'         . $r[0]['channel_address'],
-			'$atom'        => z_root() . '/feed/'          . $r[0]['channel_address'],
+			'$atom'        => z_root() . '/feed/'          . $r[0]['channel_address'] . '?f=&compat=1',
 			'$zot_post'    => z_root() . '/post/'          . $r[0]['channel_address'],
 			'$poco_url'    => z_root() . '/poco/'          . $r[0]['channel_address'],
 			'$photo'       => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
diff --git a/include/feedutils.php b/include/feedutils.php
index 079d57072..36ab75287 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -22,24 +22,20 @@ function get_public_feed($channel, $params) {
 */
 
 	if(! $params)
-		$params = array();
+		$params = [];
 
-	$params['type']      = ((x($params,'type'))      ? $params['type']          : 'xml');
-	$params['begin']     = ((x($params,'begin'))     ? $params['begin']         : NULL_DATE);
-	$params['end']       = ((x($params,'end'))       ? $params['end']           : datetime_convert('UTC','UTC','now'));
-	$params['start']     = ((x($params,'start'))     ? $params['start']         : 0);
-	$params['records']   = ((x($params,'records'))   ? $params['records']       : 40);
-	$params['direction'] = ((x($params,'direction')) ? $params['direction']     : 'desc');
-	$params['pages']     = ((x($params,'pages'))     ? intval($params['pages']) : 0);
-	$params['top']       = ((x($params,'top'))       ? intval($params['top'])   : 0);
-	$params['cat']       = ((x($params,'cat'))       ? $params['cat']           : '');
+	$params['type']        = ((x($params,'type'))     ? $params['type']           : 'xml');
+	$params['begin']       = ((x($params,'begin'))    ? $params['begin']          : NULL_DATE);
+	$params['end']         = ((x($params,'end'))      ? $params['end']            : datetime_convert('UTC','UTC','now'));
+	$params['start']       = ((x($params,'start'))    ? $params['start']          : 0);
+	$params['records']     = ((x($params,'records'))  ? $params['records']        : 40);
+	$params['direction']   = ((x($params,'direction'))? $params['direction']      : 'desc');
+	$params['pages']       = ((x($params,'pages'))    ? intval($params['pages'])  : 0);
+	$params['top']         = ((x($params,'top'))      ? intval($params['top'])    : 0);
+	$params['cat']         = ((x($params,'cat'))      ? $params['cat']            : '');
+	$params['compat']      = ((x($params,'compat'))   ? intval($params['compat']) : 0);
 
 
-	// put a sane lower limit on feed requests if not specified
-
-//	if($params['begin'] <= NULL_DATE)
-//		$params['begin'] = datetime_convert('UTC','UTC','now - 1 month');
-
 	switch($params['type']) {
 		case 'json':
 			header("Content-type: application/atom+json");
@@ -61,6 +57,7 @@ function get_public_feed($channel, $params) {
  * @param array $params
  * @return string with an atom feed
  */
+
 function get_feed_for($channel, $observer_hash, $params) {
 
 	if(! $channel)
@@ -74,18 +71,24 @@ function get_feed_for($channel, $observer_hash, $params) {
 			http_status_exit(403);
 	}
 
+	// logger('params: ' . print_r($params,true));
+
 	$feed_template = get_markup_template('atom_feed.tpl');
 
 	$atom = '';
 
+	$feed_author = '';
+	if(intval($params['compat']) === 1) {
+		$feed_author = atom_author('author',$channel['channel_address'],$channel['xchan_url'],300,300,$channel['xchan_photo_mimetype'],$channel['xchan_photo_l']);
+	}
+
 	$atom .= replace_macros($feed_template, array(
 		'$version'      => xmlify(Zotlabs\Lib\System::get_project_version()),
 		'$red'          => xmlify(Zotlabs\Lib\System::get_platform_name()),
 		'$feed_id'      => xmlify($channel['xchan_url']),
 		'$feed_title'   => xmlify($channel['channel_name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
-		'$hub'          => '', // feed_hublinks(),
-		'$salmon'       => '', // feed_salmonlinks($channel['channel_address']),
+		'$author'       => $feed_author,
 		'$name'         => xmlify($channel['channel_name']),
 		'$profile_page' => xmlify($channel['xchan_url']),
 		'$mimephoto'    => xmlify($channel['xchan_photo_mimetype']),
@@ -107,18 +110,21 @@ function get_feed_for($channel, $observer_hash, $params) {
 	// a much simpler interface
 	call_hooks('atom_feed', $atom);
 
-	$items = items_fetch(array(
-		'wall' => '1',
-		'datequery' => $params['end'],
-		'datequery2' => $params['begin'],
-		'start' => $params['start'],          // FIXME
-		'records' => $params['records'],      // FIXME
-		'direction' => $params['direction'],  // FIXME
-		'pages' => $params['pages'],
-		'order' => 'post',
-		'top'   => $params['top'],
-		'cat'   => $params['cat']
-		), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
+	$items = items_fetch(
+		[
+			'wall' => '1',
+			'datequery'  => $params['end'],
+			'datequery2' => $params['begin'],
+			'start'      => intval($params['start']),
+			'records'    => intval($params['records']),
+			'direction'  => dbesc($params['direction']),
+			'pages'      => $params['pages'],
+			'order'      => dbesc('post'),
+			'top'        => $params['top'],
+			'cat'        => $params['cat'],
+			'compat'     => $params['compat']
+		], $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module
+	);
 
 	if($items) {
 		$type = 'html';
@@ -1247,10 +1253,11 @@ function atom_author($tag, $name, $uri, $h, $w, $type, $photo) {
 	$photo = xmlify($photo);
 
 	$o .= "<$tag>\r\n";
-	$o .= "<name>$name</name>\r\n";
-	$o .= "<uri>$uri</uri>\r\n";
-	$o .= '<link rel="photo"  type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-	$o .= '<link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= "  <id>$uri</id>\r\n";
+	$o .= "  <name>$name</name>\r\n";
+	$o .= "  <uri>$uri</uri>\r\n";
+	$o .= '  <link rel="photo"  type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= '  <link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
 
 	call_hooks('atom_author', $o);
 
diff --git a/include/items.php b/include/items.php
index a4862208e..1f79ee567 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3885,6 +3885,10 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 		}
 	}
 
+	if(intval($arr['compat']) === 1) {
+		$sql_extra = " AND author_xchan = owner_xchan and item_wall = 1 and item_private = 0 ";
+	}
+
 	if ($arr['datequery']) {
 		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('UTC','UTC',$arr['datequery']))));
 	}
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index fb606af27..ba50867ff 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -16,11 +16,8 @@
   <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   <link rel="alternate" type="text/html" href="{{$profile_page}}" />
-{{if $hub}}
-  {{$hub}}
-{{/if}}
-{{if $salmon}}
-  {{$salmon}}
+{{if $author}}
+{{$author}}
 {{/if}}
 
   <updated>{{$feed_updated}}</updated>