Merge remote-tracking branch 'origin/8.0RC'8.0

1 files changed, 34 insertions, 22 deletions

diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php
index 3c8dfa0a5..9d3a4f92b 100644
--- a/Zotlabs/Module/Pubstream.php
+++ b/Zotlabs/Module/Pubstream.php
@@ -12,6 +12,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 
 	function get($update = 0, $load = false) {
 
+
 		if(local_channel()) {
 			if(! Apps::system_app_installed(local_channel(), 'Public Stream')) {
 				//Do not display any associated widgets at this point
@@ -31,18 +32,16 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			}
 		}
 
-		$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
 		$net_firehose  = ((get_config('system','disable_discover_tab',1)) ? false : true);
 
-		if(! ($site_firehose || $net_firehose)) {
+		if(!$net_firehose) {
 			return '';
 		}
 
-		if($net_firehose) {
-			$site_firehose = false;
-		}
+		$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
+
+		$mid = (($_REQUEST['mid']) ? unpack_link_id($_REQUEST['mid']) : '');
 
-		$mid = ((x($_REQUEST, 'mid')) ? unpack_link_id($_REQUEST['mid']) : '');
 		if ($mid === false) {
 			notice(t('Malformed message id.') . EOL);
 			return;
@@ -160,15 +159,15 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		require_once('include/security.php');
 
 		$sys = get_sys_channel();
+		$uids = " and item.uid  = " . intval($sys['channel_id']) . " ";
 		$abook_uids = " and abook.abook_channel = " . intval($sys['channel_id']) . " ";
+		$sql_extra = item_permissions_sql($sys['channel_id']);
+		$sql_extra_order = '';
+		$site_firehose_sql = '';
+		$thread_top =  " and item.item_thread_top = 1 ";
 
 		if($site_firehose) {
-			$uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0  and item_wall = 1 ";
-		}
-		else {
-			$uids = " and item.uid  = " . intval($sys['channel_id']) . " ";
-			$sql_extra = item_permissions_sql($sys['channel_id']);
-			\App::$data['firehose'] = intval($sys['channel_id']);
+			$site_firehose_sql = " and owner_xchan in (select channel_hash from channel where channel_system = 0 and channel_removed = 0) ";
 		}
 
 		if(get_config('system','public_list_mode'))
@@ -179,6 +178,8 @@ class Pubstream extends \Zotlabs\Web\Controller {
 
 		if(x($hashtags)) {
 			$sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+			$sql_extra_order = " ORDER BY item.created DESC ";
+			$thread_top = '';
 		}
 
 		$net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
@@ -200,7 +201,9 @@ class Pubstream extends \Zotlabs\Web\Controller {
 					$r = q("SELECT parent AS item_id FROM item
 						left join abook on item.author_xchan = abook.abook_xchan
 						$net_query
-						WHERE mid = '%s' $uids $item_normal
+						WHERE item.mid = '%s' and item.item_private = 0
+						$uids $site_firehose_sql
+						$item_normal
 						and (abook.abook_blocked = 0 or abook.abook_flags is null)
 						$sql_extra $net_query2",
 						dbesc($mid)
@@ -208,10 +211,12 @@ class Pubstream extends \Zotlabs\Web\Controller {
 				}
 				else {
 					// Fetch a page full of parent items for this page
-					$r = dbq("SELECT item.id AS item_id FROM item
+					$r = dbq("SELECT parent AS item_id FROM item
 						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
 						$net_query
-						WHERE true $uids and item.item_thread_top = 1 $item_normal
+						WHERE item.item_private = 0 $thread_top
+						$uids $site_firehose_sql
+						$item_normal
 						and (abook.abook_blocked = 0 or abook.abook_flags is null)
 						$sql_extra $net_query2
 						ORDER BY $ordering DESC $pager_sql "
@@ -223,7 +228,8 @@ class Pubstream extends \Zotlabs\Web\Controller {
 					$r = q("SELECT parent AS item_id FROM item
 						left join abook on item.author_xchan = abook.abook_xchan
 						$net_query
-						WHERE mid = '%s' $uids $item_normal_update $simple_update
+						WHERE item.mid = '%s' and item.item_private = 0
+						$uids $site_firehose_sql $item_normal_update $simple_update
 						and (abook.abook_blocked = 0 or abook.abook_flags is null)
 						$sql_extra $net_query2",
 						dbesc($mid)
@@ -233,7 +239,8 @@ class Pubstream extends \Zotlabs\Web\Controller {
 					$r = dbq("SELECT parent AS item_id FROM item
 						left join abook on item.author_xchan = abook.abook_xchan
 						$net_query
-						WHERE true $uids $item_normal_update
+						WHERE item.item_private = 0 $thread_top
+						$uids $site_firehose_sql $item_normal_update
 						$simple_update
 						and (abook.abook_blocked = 0 or abook.abook_flags is null)
 						$sql_extra $net_query2"
@@ -251,21 +258,26 @@ class Pubstream extends \Zotlabs\Web\Controller {
 				$items = dbq("SELECT item.*, item.id AS item_id FROM item
 					WHERE true $uids $item_normal
 					AND item.parent IN ( $parents_str )
-					$sql_extra"
+					$sql_extra $sql_extra_order"
 				);
 
+
 				// use effective_uid param of xchan_query to help sort out comment permission
 				// for sys_channel owned items.
 
-				xchan_query($items,true,(($sys) ? local_channel() : 0));
+				xchan_query($items, true, local_channel());
 				$items = fetch_post_tags($items,true);
-				$items = conv_sort($items,$ordering);
+
+				if (!$hashtags) {
+					$items = conv_sort($items, $ordering);
+				}
+
+
 			}
 
 		}
 
-		// fake it
-		$mode = (($hashtags) ? 'search' : 'pubstream');
+		$mode = (($hashtags) ? 'pubstream-new' : 'pubstream');
 
 		$o .= conversation($items,$mode,$update,$page_mode);