some work to fix r_preview in list mode

8 files changed, 316 insertions, 299 deletions

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 024502d2a..b7eecbd94 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -35,7 +35,7 @@ class ThreadItem {
 
 
 	public function __construct($data) {
-				
+
 		$this->data = $data;
 		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
 		$this->threaded = get_config('system','thread_allow');
@@ -98,7 +98,7 @@ class ThreadItem {
  		$conv = $this->get_conversation();
 		$observer = $conv->get_observer();
 
-		$lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+		$lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
 			: false);
@@ -151,9 +151,9 @@ class ThreadItem {
 
 
 		if($observer && $observer['xchan_hash']
-			&& ($observer['xchan_hash'] == $this->get_data_value('author_xchan') 
-			|| $observer['xchan_hash'] == $this->get_data_value('owner_xchan') 
-			|| $observer['xchan_hash'] == $this->get_data_value('source_xchan') 
+			&& ($observer['xchan_hash'] == $this->get_data_value('author_xchan')
+			|| $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
+			|| $observer['xchan_hash'] == $this->get_data_value('source_xchan')
 			|| $this->get_data_value('uid') == local_channel()))
 			$dropping = true;
 
@@ -169,15 +169,15 @@ class ThreadItem {
 				'dropping' => $dropping,
 				'delete' => t('Delete'),
 			);
-		}		
+		}
 		elseif(is_site_admin()) {
 			$drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ];
 		}
 
 // FIXME
-		if($observer_is_pageowner) {		
+		if($observer_is_pageowner) {
 			$multidrop = array(
-				'select' => t('Select'), 
+				'select' => t('Select'),
 			);
 		}
 
@@ -223,7 +223,7 @@ class ThreadItem {
 
 		if(! feature_enabled($conv->get_profile_owner(),'dislike'))
 			unset($conv_responses['dislike']);
-  
+
 		$responses = get_responses($conv_responses,$response_verbs,$this,$item);
 
 		$my_responses = [];
@@ -254,7 +254,7 @@ class ThreadItem {
 		}
 
 		$showlike    = ((x($conv_responses['like'],$item['mid'])) ? format_like($conv_responses['like'][$item['mid']],$conv_responses['like'][$item['mid'] . '-l'],'like',$item['mid']) : '');
-		$showdislike = ((x($conv_responses['dislike'],$item['mid']) && feature_enabled($conv->get_profile_owner(),'dislike'))  
+		$showdislike = ((x($conv_responses['dislike'],$item['mid']) && feature_enabled($conv->get_profile_owner(),'dislike'))
 				? format_like($conv_responses['dislike'][$item['mid']],$conv_responses['dislike'][$item['mid'] . '-l'],'dislike',$item['mid']) : '');
 
 		/*
@@ -264,7 +264,7 @@ class ThreadItem {
 		 */
 
 		$this->check_wall_to_wall();
-		
+
 		if($this->is_toplevel()) {
 			// FIXME check this permission
 			if(($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) {
@@ -275,7 +275,7 @@ class ThreadItem {
 				);
 
 			}
-		} 
+		}
 		else {
 			$is_comment = true;
 		}
@@ -349,7 +349,7 @@ class ThreadItem {
 
 		// $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
 		// since we can't depend on llink or plink pointing to the right local location.
- 
+
 		$owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@'));
 		$viewthread = $item['llink'];
 		if($conv->get_mode() === 'channel')
@@ -357,7 +357,7 @@ class ThreadItem {
 
 		$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
 		$list_unseen_txt = (($unseen_comments) ? sprintf( t('%d unseen'),$unseen_comments) : '');
-		
+
 		$children = $this->get_children();
 
 		$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
@@ -386,7 +386,7 @@ class ThreadItem {
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			'mode' => $mode,
-			'item_type' => intval($item['item_type']),			
+			'item_type' => intval($item['item_type']),
 			//'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 			'body' => $body['html'],
 			'tags' => $body['tags'],
@@ -518,8 +518,8 @@ class ThreadItem {
 
 //		needed for scroll to comment from notification but needs more work
 //		as we do not want to open all comments unless there is actually an #item_xx anchor
-//		and the url fragment is not sent to the server. 
-//		if(in_array(\App::$module,['display','update_display'])) 
+//		and the url fragment is not sent to the server.
+//		if(in_array(\App::$module,['display','update_display']))
 //			$visible_comments = 99999;
 
 		if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
@@ -539,7 +539,7 @@ class ThreadItem {
 				}
 			}
 		}
-		
+
 		$result['private'] = $item['item_private'];
 		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
 
@@ -554,7 +554,7 @@ class ThreadItem {
 
 		return $result;
 	}
-	
+
 	public function get_id() {
 		return $this->get_data_value('id');
 	}
@@ -609,7 +609,7 @@ class ThreadItem {
 		if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
 			return false;
 		}
-		
+
 		$item->set_parent($this);
 		$this->children[] = $item;
 		return end($this->children);
@@ -683,7 +683,7 @@ class ThreadItem {
 	 */
 	public function set_conversation($conv) {
 		$previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
-		
+
 		$this->conversation = $conv;
 
 		// Set it on our children too
@@ -792,7 +792,7 @@ class ThreadItem {
 		if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
 			return '';
 		}
-		
+
 		$comment_box = '';
 		$conv = $this->get_conversation();
 
@@ -808,7 +808,7 @@ class ThreadItem {
 		$arr = array('comment_buttons' => '','id' => $this->get_id());
 		call_hooks('comment_buttons',$arr);
 		$comment_buttons = $arr['comment_buttons'];
-		
+
 		$comment_box = replace_macros($template,array(
 			'$return_path' => '',
 			'$threaded' => $this->is_threaded(),
@@ -865,7 +865,7 @@ class ThreadItem {
 
 		if($conv->get_mode() === 'channel')
 			return;
-		
+
 		if($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) {
 			$this->owner_url = chanlink_hash($this->data['owner']['xchan_hash']);
 			$this->owner_photo = $this->data['owner']['xchan_photo_m'];
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 7ff394750..fe7341e52 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -25,7 +25,7 @@ class Channel extends Controller {
 
 	function init() {
 
-		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))	
+		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))
 			goaway('search' . '?f=&search=' . $_GET['search']);
 
 		$which = null;
@@ -56,10 +56,10 @@ class Channel extends Controller {
 			http_status_exit(404, 'Not found');
 		}
 
-		// handle zot6 channel discovery 
+		// handle zot6 channel discovery
 
 		if(Libzot::is_zot_request()) {
-	
+
 			$sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
 
 			if($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
@@ -76,8 +76,8 @@ class Channel extends Controller {
 				$data = json_encode(Libzot::zotinfo([ 'address' => $channel['channel_address'] ]));
 			}
 
-			$headers = [ 
-				'Content-Type'     => 'application/x-zot+json', 
+			$headers = [
+				'Content-Type'     => 'application/x-zot+json',
 				'Digest'           => HTTPSig::generate_digest_header($data),
 				'(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
 			 ];
@@ -93,15 +93,15 @@ class Channel extends Controller {
 			$profile = argv(1);
 		}
 
-		head_add_link( [ 
-			'rel'   => 'alternate', 
+		head_add_link( [
+			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Posts and comments'),
 			'href'  => z_root() . '/feed/' . $which
 		]);
 
-		head_add_link( [ 
-			'rel'   => 'alternate', 
+		head_add_link( [
+			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Only posts'),
 			'href'  => z_root() . '/feed/' . $which . '?f=&top=1'
@@ -111,18 +111,18 @@ class Channel extends Controller {
 		// Run profile_load() here to make sure the theme is set before
 		// we start loading content
 		profile_load($which,$profile);
-		
+
 		// Add Opengraph markup
 		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
 		if(strpos($mid,'b64.') === 0)
 		    $mid = @base64url_decode(substr($mid,4));
-		    
+
 		if($mid)
 		    $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
 		        dbesc($mid),
 		        intval($channel['channel_id'])
 		    );
-		    
+
 		opengraph_add_meta($r ? $r[0] : [], $channel);
 	}
 
@@ -233,7 +233,7 @@ class Channel extends Controller {
 		/**
 		 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 		 */
-		 
+
 		 $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
 		    and item.item_unpublished = 0 and item.item_pending_remove = 0
 		    and item.item_blocked = 0 ";
@@ -266,7 +266,7 @@ class Channel extends Controller {
 			}
 		}
 
-		head_add_link([ 
+		head_add_link([
 			'rel'   => 'alternate',
 			'type'  => 'application/json+oembed',
 			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
@@ -333,12 +333,12 @@ class Channel extends Controller {
 					}
 				}
 				else {
-					$r = q("SELECT DISTINCT item.parent AS item_id, $ordering FROM item 
+					$r = q("SELECT DISTINCT item.parent AS item_id, $ordering FROM item
 						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
 						WHERE true and item.uid = %d $item_normal
 						AND (abook.abook_blocked = 0 or abook.abook_flags is null)
 						AND item.item_wall = 1 AND item.item_thread_top = 1
-						$sql_extra $sql_extra2 
+						$sql_extra $sql_extra2
 						ORDER BY $ordering DESC, item_id $pager_sql ",
 						intval(App::$profile['profile_uid'])
 					);
@@ -375,6 +375,15 @@ class Channel extends Controller {
 			$items = array();
 		}
 
+		// Add pinned content
+		if(! x($_REQUEST,'mid') && ! $search) {
+			$pinned = new \Zotlabs\Widget\Pinned;
+			$r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
+			$o .= $r['html'];
+		}
+
+		$mode = (($search) ? 'search' : 'channel');
+
 		if((! $update) && (! $load)) {
 
 			if($decoded)
@@ -421,20 +430,11 @@ class Channel extends Controller {
 				'$net' => '',
 				'$dend' => $datequery,
 				'$dbegin' => $datequery2,
-				'$conv_mode' => 'channel'
+				'$conv_mode' => 'channel',
+				'$page_mode' => $page_mode
 			));
-
 		}
 
-		// Add pinned content
-		if(! x($_REQUEST,'mid') && ! $search) {
-			$pinned = new \Zotlabs\Widget\Pinned;
-			$r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
-			$o .= $r['html'];
-		}
-
-		$mode = (($search) ? 'search' : 'channel');
-
 		if($update) {
 			$o .= conversation($items,$mode,$update,$page_mode);
 		}
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 81ac0f7b8..04aeb6d5c 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -19,21 +19,21 @@ class Display extends \Zotlabs\Web\Controller {
 		if(argc() > 1) {
 			$module_format = substr(argv(1),strrpos(argv(1),'.') + 1);
 			if(! in_array($module_format,['atom','zot','json']))
-				$module_format = 'html';			
+				$module_format = 'html';
 		}
 
 		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}
-	
+
 		if(argc() > 1) {
 			$item_hash = argv(1);
 			if($module_format !== 'html') {
 				$item_hash = substr($item_hash,0,strrpos($item_hash,'.'));
 			}
 		}
-	
+
 		if($_REQUEST['mid'])
 			$item_hash = $_REQUEST['mid'];
 
@@ -42,19 +42,19 @@ class Display extends \Zotlabs\Web\Controller {
 			notice( t('Item not found.') . EOL);
 			return;
 		}
-	
+
 		$observer_is_owner = false;
 
 		if(local_channel() && (! $update)) {
-	
+
 			$channel = \App::get_channel();
 
 			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid'  => $channel['channel_deny_cid'], 
+				'allow_cid' => $channel['channel_allow_cid'],
+				'allow_gid' => $channel['channel_allow_gid'],
+				'deny_cid'  => $channel['channel_deny_cid'],
 				'deny_gid'  => $channel['channel_deny_gid']
-			); 
+			);
 
 			$x = array(
 				'is_owner'            => true,
@@ -62,7 +62,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'default_location'    => $channel['channel_location'],
 				'nickname'            => $channel['channel_address'],
 				'lockstate'           => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-				'acl'                 => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),	
+				'acl'                 => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
 				'permissions'         => $channel_acl,
 				'bang'                => '',
 				'visitor'             => true,
@@ -75,21 +75,21 @@ class Display extends \Zotlabs\Web\Controller {
 				'jotnets'             => true,
 				'reset'               => t('Reset form')
 			);
-	
+
 			$o = '<div id="jot-popup">';
 			$o .= status_editor($a,$x,false,'Display');
 			$o .= '</div>';
 		}
-	
+
 		// This page can be viewed by anybody so the query could be complicated
 		// First we'll see if there is a copy of the item which is owned by us - if we're logged in locally.
-		// If that fails (or we aren't logged in locally), 
+		// If that fails (or we aren't logged in locally),
 		// query an item in which the observer (if logged in remotely) has cid or gid rights
-		// and if that fails, look for a copy of the post that has no privacy restrictions.  
+		// and if that fails, look for a copy of the post that has no privacy restrictions.
 		// If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported.
-	
+
 		// find a copy of the item somewhere
-	
+
 		$target_item = null;
 
 		if(strpos($item_hash,'b64.') === 0)
@@ -100,7 +100,7 @@ class Display extends \Zotlabs\Web\Controller {
 		$r = q("select id, uid, mid, parent, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1",
 			dbesc($item_hash . '%')
 		);
-	
+
 		if($r) {
 			$target_item = $r[0];
 		}
@@ -117,14 +117,14 @@ class Display extends \Zotlabs\Web\Controller {
 		if($target_item['item_blocked'] == ITEM_MODERATED) {
 			goaway(z_root() . '/moderate/' . $target_item['id']);
 		}
-	
+
 		$r = null;
-	
+
 		if($target_item['item_type']  == ITEM_TYPE_WEBPAGE) {
 			$x = q("select * from channel where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['parent'])
@@ -141,7 +141,7 @@ class Display extends \Zotlabs\Web\Controller {
 			$x = q("select * from channel where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['parent'])
@@ -160,7 +160,7 @@ class Display extends \Zotlabs\Web\Controller {
 				intval($target_item['uid'])
 			);
 
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['parent'])
@@ -179,7 +179,7 @@ class Display extends \Zotlabs\Web\Controller {
 			notice( t('Page not found.') . EOL);
 			return '';
 		}
-		
+
 		$simple_update = '';
 		if($update && $_SESSION['loadtime'])
 			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
@@ -191,14 +191,14 @@ class Display extends \Zotlabs\Web\Controller {
 			//$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
 			$mid = $target_item['mid'];
 
-			// if we got a decoded hash we must encode it again before handing to javascript 
+			// if we got a decoded hash we must encode it again before handing to javascript
 			if($decoded)
 				$mid = 'b64.' . base64url_encode($mid);
 
 			$o .= '<div id="live-display"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1))
 				. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n";
-	
+
 			\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
 				'$baseurl' => z_root(),
 				'$pgtype'  => 'display',
@@ -230,7 +230,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'$mid'     => (($mid) ? urlencode($mid) : '')
 			));
 
-			head_add_link([ 
+			head_add_link([
 				'rel'   => 'alternate',
 				'type'  => 'application/json+oembed',
 				'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string),
@@ -270,8 +270,8 @@ class Display extends \Zotlabs\Web\Controller {
 
 				$r = q("SELECT item.id as item_id from item
 					WHERE mid = '%s'
-					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' 
-					AND item.deny_gid  = '' AND item_private = 0 ) 
+					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
+					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 					OR uid = %d )
 					$sql_extra )
@@ -282,7 +282,7 @@ class Display extends \Zotlabs\Web\Controller {
 				);
 			}
 		}
-	
+
 		elseif($update && !$load) {
 			$r = null;
 
@@ -307,8 +307,8 @@ class Display extends \Zotlabs\Web\Controller {
 					$sysid = 0;
 				$r = q("SELECT item.parent AS item_id from item
 					WHERE parent_mid = '%s'
-					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' 
-					AND item.deny_gid  = '' AND item_private = 0 ) 
+					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
+					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 					OR uid = %d )
 					$sql_extra )
@@ -320,7 +320,7 @@ class Display extends \Zotlabs\Web\Controller {
 				);
 			}
 		}
-	
+
 		else {
 			$r = array();
 		}
@@ -328,7 +328,7 @@ class Display extends \Zotlabs\Web\Controller {
 		if($r) {
 			$parents_str = ids_to_querystr($r,'item_id');
 			if($parents_str) {
-				$items = q("SELECT item.*, item.id AS item_id 
+				$items = q("SELECT item.*, item.id AS item_id
 					FROM item
 					WHERE parent in ( %s ) $item_normal ",
 					dbesc($parents_str)
@@ -341,10 +341,10 @@ class Display extends \Zotlabs\Web\Controller {
 		else {
 			$items = array();
 		}
-	
+
 
 		switch($module_format) {
-			
+
 		case 'html':
 
 			if ($update) {
@@ -363,7 +363,7 @@ class Display extends \Zotlabs\Web\Controller {
 				\App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . \App::$page['title'] : \App::$page['title']);
 
 				$o .= conversation($items, 'display', $update, 'client');
-			} 
+			}
 
 			break;
 
@@ -380,7 +380,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'$owner'         => '',
 				'$profile_page'  => xmlify(z_root() . '/display/' . $target_item['mid']),
 			));
-				
+
 			$x = [ 'xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params ];
 			call_hooks('atom_feed_top',$x);
 
@@ -406,13 +406,13 @@ class Display extends \Zotlabs\Web\Controller {
 			header('Content-type: application/atom+xml');
 			echo $atom;
 			killme();
-			
+
 		}
 
 		$o .= '<div id="content-complete"></div>';
 
 		if((($update && $load) || $noscript_content) && (! $items)) {
-			
+
 			$r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
 				dbesc($item_hash)
 			);
@@ -421,14 +421,14 @@ class Display extends \Zotlabs\Web\Controller {
 				if(intval($r[0]['item_deleted'])) {
 					notice( t('Item has been removed.') . EOL );
 				}
-				else {	
-					notice( t('Permission denied.') . EOL ); 
+				else {
+					notice( t('Permission denied.') . EOL );
 				}
 			}
 			else {
 				notice( t('Item not found.') . EOL );
 			}
-	
+
 		}
 
 		$_SESSION['loadtime'] = datetime_convert();
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 358611b1b..f5f3515c0 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -41,41 +41,52 @@ class Like extends \Zotlabs\Web\Controller {
 
 	private function like_response($arr) {
 
-		if($arr['conv_mode'] === 'channel') {
+		$page_mode = (($arr['item']['item_thread_top'] && $_REQUEST['page_mode']) ? $_REQUEST['page_mode'] : 'r_preview');
+		$conv_mode = (($_REQUEST['conv_mode']) ? $_REQUEST['conv_mode'] : 'network');
+
+		if($conv_mode === 'channel') {
 			$parts = explode('@', $arr['owner_xchan']['xchan_addr']);
 			profile_load($parts[0]);
 		}
 
-
 		$item_normal = item_normal();
 
-		$activities = q("SELECT item.*, item.id AS item_id FROM item
-			WHERE uid = %d $item_normal
-			AND thr_parent = '%s'
-			AND verb IN ('%s', '%s', '%s', '%s', '%s')",
-			intval($arr['item']['uid']),
-			dbesc($arr['item']['mid']),
-			dbesc(ACTIVITY_LIKE),
-			dbesc(ACTIVITY_DISLIKE),
-			dbesc(ACTIVITY_ATTEND),
-			dbesc(ACTIVITY_ATTENDNO),
-			dbesc(ACTIVITY_ATTENDMAYBE)
-		);
-
-		xchan_query($activities,true);
-
-		$convitems[] = $arr['item'];
-		$convitems = array_merge($convitems, $activities);
+		if($page_mode === 'list') {
+			$items = q("SELECT item.*, item.id AS item_id FROM item
+				WHERE uid = %d $item_normal
+				AND parent = %d",
+				intval($arr['item']['uid']),
+				intval($arr['item']['parent'])
+			);
+			xchan_query($items,true);
+			$items = fetch_post_tags($items, true);
+			$items = conv_sort($items, 'commented');
+		}
+		else {
+			$activities = q("SELECT item.*, item.id AS item_id FROM item
+				WHERE uid = %d $item_normal
+				AND thr_parent = '%s'
+				AND verb IN ('%s', '%s', '%s', '%s', '%s')",
+				intval($arr['item']['uid']),
+				dbesc($arr['item']['mid']),
+				dbesc(ACTIVITY_LIKE),
+				dbesc(ACTIVITY_DISLIKE),
+				dbesc(ACTIVITY_ATTEND),
+				dbesc(ACTIVITY_ATTENDNO),
+				dbesc(ACTIVITY_ATTENDMAYBE)
+			);
+			xchan_query($activities,true);
+			$items = array_merge([$arr['item']], $activities);
+			$items = fetch_post_tags($items, true);
+		}
 
-		$convitems = fetch_post_tags($convitems,true);
 
 		$ret = [
 			'success' => 1,
 			'orig_id' => $arr['orig_item_id'], //this is required for pubstream items where $item_id != $item['id']
 			'id' => $arr['item']['id'],
-			'html' => conversation($convitems, $arr['conv_mode'], true, 'r_preview'),
+			'html' => conversation($items, $conv_mode, true, $page_mode),
 		];
-
 		return $ret;
 
 	}
@@ -102,7 +113,7 @@ class Like extends \Zotlabs\Web\Controller {
 		}
 
 		$verb = notags(trim($_GET['verb']));
-		$mode = (($_GET['conv_mode'] === 'channel') ? 'channel' : 'network');
+		$mode = (($_GET['conv_mode']) ? $_GET['conv_mode'] : '');
 
 		if(! $verb)
 			$verb = 'like';
@@ -407,8 +418,7 @@ class Like extends \Zotlabs\Web\Controller {
 					$ret = self::like_response([
 						'item' => $item,
 						'orig_item_id' => $item_id,
-						'owner_xchan' => $thread_owner,
-						'conv_mode' => $mode
+						'owner_xchan' => $thread_owner
 					]);
 					json_return_and_die($ret);
 				}
@@ -597,8 +607,7 @@ class Like extends \Zotlabs\Web\Controller {
 		$ret = self::like_response([
 			'item' => $item,
 			'orig_item_id' => $item_id,
-			'owner_xchan' => $thread_owner,
-			'conv_mode' => $mode
+			'owner_xchan' => $thread_owner
 		]);
 		json_return_and_die($ret);
 
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 4a1692d64..e9edd8de3 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -22,42 +22,42 @@ class Network extends \Zotlabs\Web\Controller {
 
 		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))
 			goaway('search' . '?f=&search=' . $_GET['search']);
-	
+
 		if(count($_GET) < 2) {
 			$network_options = get_pconfig(local_channel(),'system','network_page_default');
 			if($network_options)
 				goaway('network' . '?f=&' . $network_options);
 		}
-	
+
 		$channel = App::get_channel();
 		App::$profile_uid = local_channel();
 		head_set_icon($channel['xchan_photo_s']);
-	
+
 	}
-	
+
 	function get($update = 0, $load = false) {
-	
+
 		if(! local_channel()) {
 			$_SESSION['return_url'] = App::$query_string;
 			return login(false);
 		}
-	
+
 		$o = '';
 
 		$arr = array('query' => App::$query_string);
-	
+
 		call_hooks('network_content_init', $arr);
-	
+
 		$channel = App::get_channel();
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
-	
+
 		$datequery = $datequery2 = '';
-	
+
 		$group = 0;
-	
+
 		$nouveau    = false;
-	
+
 		$datequery  = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
 		$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
 		$gid        = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0);
@@ -87,13 +87,13 @@ class Network extends \Zotlabs\Web\Controller {
 				$search = '';
 			}
 		}
-	
+
 		if($datequery)
 			$order = 'post';
-	
-	
+
+
 		// filter by collection (e.g. group)
-	
+
 		if($gid) {
 			$r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
 				intval($gid),
@@ -106,12 +106,12 @@ class Network extends \Zotlabs\Web\Controller {
 				goaway(z_root() . '/network');
 				// NOTREACHED
 			}
-	
+
 			$group      = $gid;
 			$group_hash = $r[0]['hash'];
 			$def_acl    = array('allow_gid' => '<' . $r[0]['hash'] . '>');
 		}
-	
+
 		$default_cmin = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1));
 		$default_cmax = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1));
 
@@ -127,7 +127,7 @@ class Network extends \Zotlabs\Web\Controller {
 		$net      = ((x($_GET,'net'))   ? $_GET['net']           : '');
 		$pf       = ((x($_GET,'pf'))    ? $_GET['pf']            : '');
 		$unseen   = ((x($_GET,'unseen'))    ? $_GET['unseen']            : '');
-		
+
                 if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
 			$affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
 			if ($affinity_locked) {
@@ -155,16 +155,16 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 			$def_acl = [ 'allow_cid' => '<' . $cid_r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
 		}
-	
+
 		if(! $update) {
-	
+
 			// search terms header
 			if($search || $hashtags) {
 				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
 					'$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT,'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8'))
 				));
 			}
-	
+
 			nav_set_selected('Network');
 
 			$bang = '!';
@@ -179,14 +179,14 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid'  => $channel['channel_deny_cid'], 
+				'allow_cid' => $channel['channel_allow_cid'],
+				'allow_gid' => $channel['channel_allow_gid'],
+				'deny_cid'  => $channel['channel_deny_cid'],
 				'deny_gid'  => $channel['channel_deny_gid']
 			);
 
 			$private_editing = (($group || $cid) ? true : false);
-	
+
 			$x = array(
 				'is_owner'         => true,
 				'allow_location'   => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
@@ -204,28 +204,28 @@ class Network extends \Zotlabs\Web\Controller {
 				'jotnets' => true,
 				'reset' => t('Reset form')
 			);
-	
+
 			$status_editor = status_editor($a,$x,false,'Network');
 			$o .= $status_editor;
 
 		}
-	
-	
+
+
 		// We don't have to deal with ACL's on this page. You're looking at everything
 		// that belongs to you, hence you can see all of it. We will filter by group if
 		// desired.
-	
-	
+
+
 		$sql_options  = (($star)
 			? " and item_starred = 1 "
 			: '');
-	
+
 		$sql_nets = '';
 
 		$item_thread_top = ' AND item_thread_top = 1 ';
-	
+
 		$sql_extra = '';
-	
+
 		if($group) {
 
 			$contact_str = '';
@@ -241,18 +241,18 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 			$item_thread_top = '';
 			$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
-	
+
 			$x = group_rec_byhash(local_channel(), $group_hash);
-	
+
 			if($x) {
 				$title = replace_macros(get_markup_template("section_title.tpl"),array(
 					'$title' => t('Privacy group: ') . $x['gname']
 				));
 			}
-	
+
 			$o = $title;
 			$o .= $status_editor;
-	
+
 		}
 		elseif($cid_r) {
 			$item_thread_top = '';
@@ -324,75 +324,26 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 		}
-	
+
 		if(x($category)) {
 			$sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
 		}
 		if(x($hashtags)) {
 			$sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
 		}
-	
-		if(! $update) {
-			// The special div is needed for liveUpdate to kick in for this page.
-			// We only launch liveUpdate if you aren't filtering in some incompatible
-			// way and also you aren't writing a comment (discovered in javascript).
 
-			$maxheight = get_pconfig(local_channel(),'system','network_divmore_height');
-			if(! $maxheight)
-				$maxheight = 400;
-	
-	
-			$o .= '<div id="live-network"></div>' . "\r\n";
-			$o .= "<script> var profile_uid = " . local_channel() 
-				. "; var profile_page = " . App::$pager['page'] 
-				. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
-	
-			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
-				'$baseurl' => z_root(),
-				'$pgtype'  => 'network',
-				'$uid'     => ((local_channel()) ? local_channel() : '0'),
-				'$gid'     => (($gid) ? $gid : '0'),
-				'$cid'     => (($cid) ? $cid : '0'),
-				'$cmin'    => (($cmin) ? $cmin : '(-1)'),
-				'$cmax'    => (($cmax) ? $cmax : '(-1)'),
-				'$star'    => (($star) ? $star : '0'),
-				'$liked'   => (($liked) ? $liked : '0'),
-				'$conv'    => (($conv) ? $conv : '0'),
-				'$spam'    => (($spam) ? $spam : '0'),
-				'$fh'      => '0',
-				'$dm'      => (($dm) ? $dm : '0'),
-				'$nouveau' => (($nouveau) ? $nouveau : '0'),
-				'$wall'    => '0',
-				'$list'    => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
-				'$page'    => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-				'$search'  => (($search) ? urlencode($search) : ''),
-				'$xchan'   => (($xchan) ? urlencode($xchan) : ''),
-				'$order'   => $order,
-				'$file'    => (($file) ? urlencode($file) : ''),
-				'$cats'    => (($category) ? urlencode($category) : ''),
-				'$tags'    => (($hashtags) ? urlencode($hashtags) : ''),
-				'$dend'    => $datequery,
-				'$mid'     => '',
-				'$verb'    => (($verb) ? urlencode($verb) : ''),
-				'$net'     => (($net) ? urlencode($net) : ''),
-				'$dbegin'  => $datequery2,
-				'$pf'      => (($pf) ? intval($pf) : 0),
-				'$unseen'  => (($unseen) ? urlencode($unseen) : '')
-			));
-		}
-	
 		$sql_extra3 = '';
-	
+
 		if($datequery) {
 			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
 		}
 		if($datequery2) {
 			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
-	
+
 		$sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id ");
 		$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
-	
+
 		if(x($_GET,'search')) {
 			$search = escape_tags($_GET['search']);
 			if(strpos($search,'#') === 0) {
@@ -405,7 +356,7 @@ class Network extends \Zotlabs\Web\Controller {
 				);
 			}
 		}
-	
+
 		if ($verb) {
 
 			// the presence of a leading dot in the verb determines
@@ -425,7 +376,7 @@ class Network extends \Zotlabs\Web\Controller {
 				);
 			}
 		}
-	
+
 		if(strlen($file)) {
 			$sql_extra .= term_query('item',$file,TERM_FILE);
 		}
@@ -433,52 +384,52 @@ class Network extends \Zotlabs\Web\Controller {
 		if ($dm) {
 			$sql_extra .= " AND item_private = 2 ";
 		}
-	
+
 		if($conv) {
 			$item_thread_top = '';
 			$sql_extra .= " AND ( author_xchan = '" . dbesc($channel['channel_hash']) . "' OR item_mentionsme = 1 ) ";
 		}
-	
+
 		if($update && ! $load) {
-	
+
 			// only setup pagination on initial page view
 			$pager_sql = '';
-	
+
 		}
 		else {
 			$itemspage = get_pconfig(local_channel(),'system','itemspage');
 			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 		}
-	
+
 		// cmin and cmax are both -1 when the affinity tool is disabled
 
 		if(($cmin != (-1)) || ($cmax != (-1))) {
-	
+
 			// Not everybody who shows up in the network stream will be in your address book.
 			// By default those that aren't are assumed to have closeness = 99; but this isn't
 			// recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
 			// the stream with a NULL address book entry.
-	
+
 			$sql_nets .= " AND ";
-	
+
 			if($cmax == 99)
 				$sql_nets .= " ( ";
-	
+
 			$sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " ";
 			$sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) ";
-	
+
 			if($cmax == 99)
 				$sql_nets .= " OR abook.abook_closeness IS NULL ) ";
-	
+
 		}
 
-		$net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); 
+		$net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
 		$net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
 
 		$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
 		$uids = " and item.uid = " . local_channel() . " ";
-	
+
 		if(feature_enabled(local_channel(), 'network_list_mode'))
 			$page_mode = 'list';
 		else
@@ -504,7 +455,7 @@ class Network extends \Zotlabs\Web\Controller {
 
 		if($nouveau && $load) {
 			// "New Item View" - show all items unthreaded in reverse created date order
-			$items = q("SELECT item.*, item.id AS item_id, created FROM item 
+			$items = q("SELECT item.*, item.id AS item_id, created FROM item
 				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
 				$net_query
 				WHERE true $uids $item_normal
@@ -517,23 +468,23 @@ class Network extends \Zotlabs\Web\Controller {
 			$parents_str = ids_to_querystr($items,'item_id');
 
 			require_once('include/items.php');
-	
+
 			xchan_query($items);
-	
+
 			$items = fetch_post_tags($items,true);
 		}
 		elseif($update) {
-	
+
 			// Normal conversation view
-	
+
 			if($order === 'post')
 				$ordering = "created";
 			else
 				$ordering = "commented";
-	
+
 			if($load) {
 				// Fetch a page full of parent items for this page
-				$r = q("SELECT item.parent AS item_id FROM item 
+				$r = q("SELECT item.parent AS item_id FROM item
 					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
 					$net_query
 					WHERE true $uids $item_thread_top $item_normal
@@ -557,18 +508,18 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 			// Then fetch all the children of the parents that are on this page
-	
+
 			if($r) {
-	
+
 				$parents_str = ids_to_querystr($r,'item_id');
-	
+
 				$items = q("SELECT item.*, item.id AS item_id FROM item
 					WHERE true $uids $item_normal
 					AND item.parent IN ( %s )
 					$sql_extra ",
 					dbesc($parents_str)
 				);
-	
+
 				xchan_query($items,true);
 				$items = fetch_post_tags($items,true);
 				$items = conv_sort($items,$ordering);
@@ -578,20 +529,70 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 		}
-	
+
 		$mode = (($nouveau) ? 'network-new' : 'network');
 
 		if($search)
 			$mode = 'search';
-	
+
+		if(! $update) {
+			// The special div is needed for liveUpdate to kick in for this page.
+			// We only launch liveUpdate if you aren't filtering in some incompatible
+			// way and also you aren't writing a comment (discovered in javascript).
+
+			$maxheight = get_pconfig(local_channel(),'system','network_divmore_height');
+			if(! $maxheight)
+				$maxheight = 400;
+
+
+			$o .= '<div id="live-network"></div>' . "\r\n";
+			$o .= "<script> var profile_uid = " . local_channel()
+				. "; var profile_page = " . App::$pager['page']
+				. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
+
+			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
+				'$baseurl' => z_root(),
+				'$pgtype'  => 'network',
+				'$uid'     => ((local_channel()) ? local_channel() : '0'),
+				'$gid'     => (($gid) ? $gid : '0'),
+				'$cid'     => (($cid) ? $cid : '0'),
+				'$cmin'    => (($cmin) ? $cmin : '(-1)'),
+				'$cmax'    => (($cmax) ? $cmax : '(-1)'),
+				'$star'    => (($star) ? $star : '0'),
+				'$liked'   => (($liked) ? $liked : '0'),
+				'$conv'    => (($conv) ? $conv : '0'),
+				'$spam'    => (($spam) ? $spam : '0'),
+				'$fh'      => '0',
+				'$dm'      => (($dm) ? $dm : '0'),
+				'$nouveau' => (($nouveau) ? $nouveau : '0'),
+				'$wall'    => '0',
+				'$list'    => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
+				'$page'    => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+				'$search'  => (($search) ? urlencode($search) : ''),
+				'$xchan'   => (($xchan) ? urlencode($xchan) : ''),
+				'$order'   => $order,
+				'$file'    => (($file) ? urlencode($file) : ''),
+				'$cats'    => (($category) ? urlencode($category) : ''),
+				'$tags'    => (($hashtags) ? urlencode($hashtags) : ''),
+				'$dend'    => $datequery,
+				'$mid'     => '',
+				'$verb'    => (($verb) ? urlencode($verb) : ''),
+				'$net'     => (($net) ? urlencode($net) : ''),
+				'$dbegin'  => $datequery2,
+				'$pf'      => (($pf) ? intval($pf) : 0),
+				'$unseen'  => (($unseen) ? urlencode($unseen) : ''),
+				'$page_mode' => $page_mode
+			));
+		}
+
 		$o .= conversation($items,$mode,$update,$page_mode);
-	
+
 		if(($items) && (! $update))
 			$o .= alt_pager(count($items));
 
 		$_SESSION['loadtime'] = datetime_convert();
-	
+
 		return $o;
 	}
-	
+
 }
diff --git a/include/conversation.php b/include/conversation.php
index 6615b04c3..087e8c135 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -90,18 +90,18 @@ function item_redir_and_replace_images($body, $images, $cid) {
 function localize_item(&$item){
 
 	if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
-	
+
 		if(! $item['obj'])
 			return;
 
 		if(intval($item['item_thread_top']))
-			return;	
+			return;
 
 		$obj = json_decode($item['obj'],true);
 		if((! $obj) && ($item['obj'])) {
 			logger('localize_item: failed to decode object: ' . print_r($item['obj'],true));
 		}
-		
+
 		if(is_array($obj['author']) && $obj['author']['link'])
 			$author_link = get_rel_link($obj['author']['link'],'alternate');
 		elseif(is_array($obj['actor']) && $obj['actor']['url'])
@@ -167,7 +167,7 @@ function localize_item(&$item){
 		if($author_link && $author_name && $item_url) {
 			$author	 = '[zrl=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/zrl]';
 			$objauthor =  '[zrl=' . chanlink_url($author_link) . ']' . $author_name . '[/zrl]';
-		
+
 			$plink = '[zrl=' . zid($item_url) . ']' . $post_type . '[/zrl]';
 
 			if(activity_match($item['verb'],ACTIVITY_LIKE)) {
@@ -189,7 +189,7 @@ function localize_item(&$item){
 			$item['shortlocalize'] = sprintf($shortbodyverb, '[bdi]' . $author_name . '[/bdi]', $post_type);
 
 			$item['body'] = $item['localize'] = sprintf($bodyverb, '[bdi]' . $author . '[/bdi]', '[bdi]' . $objauthor . '[/bdi]', $plink);
-			if($Bphoto != "") 
+			if($Bphoto != "")
 				$item['body'] .= "\n\n\n" . '[zrl=' . chanlink_url($author_link) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';
 
 		}
@@ -201,7 +201,7 @@ function localize_item(&$item){
 
 	if (activity_match($item['verb'],ACTIVITY_FRIEND)) {
 
-		if ($item['obj_type'] == "" || $item['obj_type'] !== ACTIVITY_OBJ_PERSON) 
+		if ($item['obj_type'] == "" || $item['obj_type'] !== ACTIVITY_OBJ_PERSON)
 			return;
 
 		$Aname = $item['author']['xchan_name'];
@@ -209,7 +209,7 @@ function localize_item(&$item){
 
 
 		$obj= json_decode($item['obj'],true);
-		
+
 		$Blink = $Bphoto = '';
 
 		if($obj['link']) {
@@ -282,7 +282,7 @@ function localize_item(&$item){
 		$Alink = $item['author']['xchan_url'];
 
 		$A = '[zrl=' . chanlink_url($Alink) . '][bdi]' . $Aname . '[/bdi][/zrl]';
-		
+
 		$txt = t('%1$s is %2$s','mood');
 
 		$item['body'] = sprintf($txt, $A, t($verb));
@@ -295,15 +295,15 @@ function localize_item(&$item){
 // (and update to json storage)
 
  	if (activity_match($item['verb'],ACTIVITY_TAG)) {
-		$r = q("SELECT * from item,contact WHERE 
+		$r = q("SELECT * from item,contact WHERE
 		item.contact-id=contact.id AND item.mid='%s';",
 		 dbesc($item['parent_mid']));
 		if(count($r)==0) return;
 		$obj=$r[0];
-		
+
 		$author	 = '[zrl=' . zid($item['author-link']) . ']' . $item['author-name'] . '[/zrl]';
 		$objauthor =  '[zrl=' . zid($obj['author-link']) . ']' . $obj['author-name'] . '[/zrl]';
-		
+
 		switch($obj['verb']){
 			case ACTIVITY_POST:
 				switch ($obj['obj_type']){
@@ -416,7 +416,7 @@ function count_descendants($item) {
  * likes (etc.) can apply to other things besides posts. Check if they are post
  * children, in which case we handle them specially. Activities which are unrecognised
  * as having special meaning and hidden will be treated as posts or comments and visible
- * in the stream.  
+ * in the stream.
  *
  * @param array $item
  * @return boolean
@@ -438,14 +438,14 @@ function visible_activity($item) {
 	}
 
 	// We only need edit activities for other federated protocols
-	// which do not support edits natively. While this does federate 
+	// which do not support edits natively. While this does federate
 	// edits, it presents a number of issues locally - such as #757 and #758.
 	// The SQL check for an edit activity would not perform that well so to fix these issues
-	// requires an additional item flag (perhaps 'item_edit_activity') that we can add to the 
+	// requires an additional item flag (perhaps 'item_edit_activity') that we can add to the
 	// query for searches and notifications.
 
-	// For now we'll just forget about trying to make edits work on network protocols that 
-	// don't support them.  
+	// For now we'll just forget about trying to make edits work on network protocols that
+	// don't support them.
 
 	// if(is_edit_activity($item))
 	//	return false;
@@ -455,7 +455,7 @@ function visible_activity($item) {
 
 /**
  * @brief Check if a given activity is an edit activity
- * 
+ *
  *
  * @param array $item
  * @return boolean
@@ -463,11 +463,11 @@ function visible_activity($item) {
 
 function is_edit_activity($item) {
 
-	$post_types = [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, basename(ACTIVITY_OBJ_NOTE), basename(ACTIVITY_OBJ_COMMENT)]; 
+	$post_types = [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, basename(ACTIVITY_OBJ_NOTE), basename(ACTIVITY_OBJ_COMMENT)];
 
-	// In order to share edits with networks which have no concept of editing, we'll create 
+	// In order to share edits with networks which have no concept of editing, we'll create
 	// separate activities to indicate the edit. Our network will not require them, since our
-	// edits are automatically applied and the activity indicated.  
+	// edits are automatically applied and the activity indicated.
 
 	if(($item['verb'] === ACTIVITY_UPDATE) && (in_array($item['obj_type'],$post_types)))
 		return true;
@@ -678,12 +678,12 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 
 			foreach($items as $item) {
 
-				$x = [ 
-					'mode' => $mode, 
-					'item' => $item 
+				$x = [
+					'mode' => $mode,
+					'item' => $item
 				];
 				call_hooks('stream_item',$x);
-				
+
 				if($x['item']['blocked'])
 					continue;
 
@@ -699,7 +699,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 				$is_new      = false;
 
 				if($mode === 'search' || $mode === 'community') {
-					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
 						&& ($item['id'] != $item['parent']))
 						continue;
 				}
@@ -726,7 +726,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 				$drop = array(
 					'pagedropping' => $page_dropping,
 					'dropping' => $dropping,
-					'select' => t('Select'), 
+					'select' => t('Select'),
 					'delete' => t('Delete'),
 				);
 
@@ -769,7 +769,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 				$tmp_item = array(
 					'template' => $tpl,
 					'toplevel' => 'toplevel_item',
-					'item_type' => intval($item['item_type']),			
+					'item_type' => intval($item['item_type']),
 					'mode' => $mode,
 					'approve' => t('Approve'),
 					'delete' => t('Delete'),
@@ -844,7 +844,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 
 			$conv = new Zotlabs\Lib\ThreadStream($mode, $preview, $uploading, $prepared_item);
 
-			// In the display mode we don't have a profile owner. 
+			// In the display mode we don't have a profile owner.
 
 			if($mode === 'display' && $items)
 				$conv->set_profile_owner($items[0]['uid']);
@@ -861,7 +861,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 
 				$x = [ 'mode' => $mode, 'item' => $item ];
 				call_hooks('stream_item',$x);
-				
+
 				if($x['item']['blocked'])
 					continue;
 
@@ -970,9 +970,9 @@ function best_link_url($item) {
 function thread_action_menu($item,$mode = '') {
 
 	$menu = [];
-	
+
 	if((local_channel()) && local_channel() == $item['uid']) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'view_source',
 			'title' => t('View Source'),
 			'icon' => 'code',
@@ -982,7 +982,7 @@ function thread_action_menu($item,$mode = '') {
 
 		if(! in_array($mode, [ 'network-new', 'search', 'community'])) {
 			if($item['parent'] == $item['id'] && (get_observer_hash() != $item['author_xchan'])) {
-				$menu[] = [ 
+				$menu[] = [
 					'menu' => 'follow_thread',
 					'title' => t('Follow Thread'),
 					'icon' => 'plus',
@@ -991,7 +991,7 @@ function thread_action_menu($item,$mode = '') {
 				];
 			}
 
-			$menu[] = [ 
+			$menu[] = [
 				'menu' => 'unfollow_thread',
 				'title' => t('Unfollow Thread'),
 				'icon' => 'minus',
@@ -1018,7 +1018,7 @@ function author_is_pmable($xchan, $abook) {
 	call_hooks('author_is_pmable',$x);
 	if($x['result'] !== 'unset')
 		return $x['result'];
-	
+
 	if($xchan['xchan_network'] === 'zot' && get_observer_hash())
 		return true;
 	return false;
@@ -1063,7 +1063,7 @@ function thread_author_menu($item, $mode = '') {
 
 	if($contact) {
 		$poke_link = ((Apps::system_app_installed($local_channel, 'Poke')) ? z_root() . '/poke/?f=&c=' . $contact['abook_id'] : '');
-		if (! intval($contact['abook_self']))  
+		if (! intval($contact['abook_self']))
 			$contact_url = z_root() . '/connedit/' . $contact['abook_id'];
 		$posts_link = z_root() . '/network/?cid=' . $contact['abook_id'];
 
@@ -1075,7 +1075,7 @@ function thread_author_menu($item, $mode = '') {
 	$ratings_url = (($rating_enabled) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : '');
 
 	if($profile_link) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'view_profile',
 			'title' => t('View Profile'),
 			'icon' => 'fw',
@@ -1085,7 +1085,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	if($posts_link) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'view_posts',
 			'title' => t('Recent Activity'),
 			'icon' => 'fw',
@@ -1095,7 +1095,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	if($follow_url) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'follow',
 			'title' => t('Connect'),
 			'icon' => 'fw',
@@ -1105,7 +1105,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	if($contact_url) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'connedit',
 			'title' => t('Edit Connection'),
 			'icon' => 'fw',
@@ -1115,7 +1115,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	if($pm_url) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'prv_message',
 			'title' => t('Message'),
 			'icon' => 'fw',
@@ -1125,7 +1125,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	if($ratings_url) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'ratings',
 			'title' => t('Ratings'),
 			'icon' => 'fw',
@@ -1135,7 +1135,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	if($poke_link) {
-		$menu[] = [ 
+		$menu[] = [
 			'menu' => 'poke',
 			'title' => t('Poke'),
 			'icon' => 'fw',
@@ -1209,8 +1209,8 @@ function builtin_activity_puller($item, &$conv_responses) {
 
 		if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
 			$name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown'));
-			$url = (($item['author_xchan'] && $item['author']['xchan_photo_s']) 
-				? '<a class="dropdown-item" href="' . chanlink_hash($item['author_xchan']) . '">' . '<img class="menu-img-1" src="' . zid($item['author']['xchan_photo_s'])  . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' 
+			$url = (($item['author_xchan'] && $item['author']['xchan_photo_s'])
+				? '<a class="dropdown-item" href="' . chanlink_hash($item['author_xchan']) . '">' . '<img class="menu-img-1" src="' . zid($item['author']['xchan_photo_s'])  . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>'
 				: '<a class="dropdown-item" href="#" class="disabled">' . $name . '</a>'
 			);
 
@@ -1222,7 +1222,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 			if($item['obj_type'] === 'Answer')
 				continue;
 
-			if(! ((isset($conv_responses[$mode][$item['thr_parent'] . '-l'])) 
+			if(! ((isset($conv_responses[$mode][$item['thr_parent'] . '-l']))
 				&& (is_array($conv_responses[$mode][$item['thr_parent'] . '-l']))))
 				$conv_responses[$mode][$item['thr_parent'] . '-l'] = array();
 
@@ -1297,9 +1297,9 @@ function status_editor($a, $x, $popup = false, $module='') {
 }
 
 /**
- * This is our general purpose content editor. 
+ * This is our general purpose content editor.
  * It was once nicknamed "jot" and you may see references to "jot" littered throughout the code.
- * They are referring to the content editor or components thereof. 
+ * They are referring to the content editor or components thereof.
  */
 
 function hz_status_editor($a, $x, $popup = false) {
@@ -1341,7 +1341,7 @@ function hz_status_editor($a, $x, $popup = false) {
 	$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
 	if(x($x, 'hide_weblink'))
 		$weblink = false;
-	
+
 	$embedPhotos = t('Embed (existing) photo from your photo albums');
 
 	$writefiles = (($mimetype === 'text/bbcode') ? perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage') : false);
@@ -1366,9 +1366,9 @@ function hz_status_editor($a, $x, $popup = false) {
 	$webpage = ((x($x,'webpage')) ? $x['webpage'] : '');
 
 	$reset = ((x($x,'reset')) ? $x['reset'] : '');
-	
+
 	$feature_auto_save_draft = ((feature_enabled($x['profile_uid'], 'auto_save_draft')) ? "true" : "false");
-	
+
 	$tpl = get_markup_template('jot-header.tpl');
 
 	$tplmacros = [
@@ -1394,7 +1394,7 @@ function hz_status_editor($a, $x, $popup = false) {
 		'$reset' => $reset
 	];
 
-	call_hooks('jot_header_tpl_filter',$tplmacros);	
+	call_hooks('jot_header_tpl_filter',$tplmacros);
 	App::$page['htmlhead'] .= replace_macros($tpl, $tplmacros);
 
 	$tpl = get_markup_template('jot.tpl');
@@ -1421,7 +1421,7 @@ function hz_status_editor($a, $x, $popup = false) {
 		$catsenabled = ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : '');
 
 	// avoid illegal offset errors
-	if(! array_key_exists('permissions',$x)) 
+	if(! array_key_exists('permissions',$x))
 		$x['permissions'] = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
 
 	$jotplugins = '';
@@ -1539,7 +1539,7 @@ function get_item_children($arr, $parent) {
 				$thr_parent = $item['thr_parent'];
 				if($thr_parent == '')
 					$thr_parent = $item['parent_mid'];
-				
+
 				if($thr_parent == $parent['mid']) {
 					$item['children'] = get_item_children($arr, $item);
 					$children[] = $item;
@@ -1698,9 +1698,9 @@ function prepare_page($item) {
 		return replace_macros(get_markup_template($tpl), array(
 			'$body' => $body['html']
 		));
-		
+
 	}
-	
+
 	$tpl = get_pconfig($item['uid'], 'system', 'pagetemplate');
 	if (! $tpl)
 		$tpl = 'page_display.tpl';
diff --git a/view/js/main.js b/view/js/main.js
index 3e3fd057c..cd95a8a0b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1152,7 +1152,10 @@ function dolike(ident, verb) {
 	if(typeof conv_mode == typeof undefined)
 		conv_mode = '';
 
-	$.get('like/' + ident.toString() + '?verb=' + verb + '&conv_mode=' + conv_mode, function (data) {
+	if(typeof page_mode == typeof undefined)
+		page_mode = '';
+
+	$.get('like/' + ident.toString() + '?verb=' + verb + '&conv_mode=' + conv_mode + '&page_mode=' + page_mode, function (data) {
 		if(data.success) {
 			// this is a bit tricky since the top level thread wrapper wraps the whole thread
 			if($('#thread-wrapper-' + data.orig_id).hasClass('toplevel_item')) {
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 83e756367..af70a9595 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -1,4 +1,4 @@
-<script> 
+<script>
 
 	var bParam_cmd = "{{$baseurl}}/update/{{$pgtype}}";
 
@@ -6,6 +6,10 @@
 	var conv_mode = '{{$conv_mode}}';
 	{{/if}}
 
+	{{if $page_mode}}
+	var page_mode = '{{$page_mode}}';
+	{{/if}}
+
 	var bParam_uid = {{$uid}};
 	var bParam_gid = {{$gid}};
 	var bParam_cid = {{$cid}};