Merge branch 'dev' into 'dev'

Dev sync

See merge request kostikov/core!2

22 files changed, 198 insertions, 245 deletions

diff --git a/Zotlabs/Daemon/Checksites.php b/Zotlabs/Daemon/Checksites.php
index a2081967a..3bcfdd7cf 100644
--- a/Zotlabs/Daemon/Checksites.php
+++ b/Zotlabs/Daemon/Checksites.php
@@ -2,8 +2,7 @@
 
 namespace Zotlabs\Daemon;
 
-require_once('include/zot.php');
-
+require_once('include/hubloc.php');
 
 class Checksites {
 
diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php
index 43f426eb7..c853af6a8 100644
--- a/Zotlabs/Daemon/Deliver.php
+++ b/Zotlabs/Daemon/Deliver.php
@@ -2,12 +2,8 @@
 
 namespace Zotlabs\Daemon;
 
-use Zotlabs\Lib\DReport;
-
-require_once('include/zot.php');
 require_once('include/queue_fn.php');
 
-
 class Deliver {
 	
 	static public function run($argc,$argv) {
@@ -22,72 +18,16 @@ class Deliver {
 			if(! $argv[$x])
 				continue;
 
-			$dresult = null;
-			$r = q("select * from outq where outq_hash = '%s' limit 1",
+			$r = q("select * from outq where outq_hash = '%s'",
 				dbesc($argv[$x])
 			);
-			if($r) {
-
-				$notify = json_decode($r[0]['outq_notify'],true);
-
-				// Messages without an outq_msg will need to go via the web, even if it's a
-				// local delivery. This includes conversation requests and refresh packets.
-
-				if(($r[0]['outq_posturl'] === z_root() . '/post') && ($r[0]['outq_msg'])) {
-					logger('deliver: local delivery', LOGGER_DEBUG);
-
-					// local delivery
-					// we should probably batch these and save a few delivery processes
-
-					if($r[0]['outq_msg']) {
-						$m = json_decode($r[0]['outq_msg'],true);
-						if(array_key_exists('message_list',$m)) {
-							foreach($m['message_list'] as $mm) {
-								$msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $mm)))));
-								zot_import($msg,z_root());
-							}
-						}	
-						else {	
-							$msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m)))));
-							$dresult = zot_import($msg,z_root());
-						}
-
-						remove_queue_item($r[0]['outq_hash']);
-
-						if($dresult && is_array($dresult)) {
-
-							// delivery reports for local deliveries do not require encryption
-
-							foreach($dresult as $xx) {
-								if(is_array($xx) && array_key_exists('message_id',$xx)) {
-									if(DReport::is_storable($xx)) {
-										q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
-											dbesc($xx['message_id']),
-											dbesc($xx['location']),
-											dbesc($xx['recipient']),
-											dbesc(($xx['name']) ? $xx['name'] : EMPTY_STR),
-											dbesc($xx['status']),
-											dbesc(datetime_convert($xx['date'])),
-											dbesc($xx['sender'])
-										);
-									}
-								}
-							}
-						}
-
-						q("delete from dreport where dreport_queue = '%s'",
-							dbesc($argv[$x])
-						);
-					
-						continue;
-					}
-				}
-
-				// otherwise it's a remote delivery - call queue_deliver() with the $immediate flag
 
+			if($r) {
 				queue_deliver($r[0],true);
-
 			}
+
 		}
+
 	}
+
 }
diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php
index c698995c2..ab58432de 100644
--- a/Zotlabs/Daemon/Directory.php
+++ b/Zotlabs/Daemon/Directory.php
@@ -58,7 +58,8 @@ class Directory {
 		// otherwise send the changes upstream
 
 		$directory = Libzotdir::find_upstream_directory($dirmode);
-		$url = $directory['url'] . '/post';
+
+		$url = $directory['url'] . '/zot';
 
 		// ensure the upstream directory is updated
 
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index f24eab773..28c512d4a 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -640,9 +640,16 @@ class Notifier {
 			}
 			else {
 				if(! in_array($hub['hubloc_url'],$urls)) {
-					$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
-					$dhubs[]   = $hub;
-					$urls[]    = $hub['hubloc_url'];
+					if($hub['hubloc_url'] === z_root()) {
+						//deliver to local hub first
+						array_unshift($hublist, $hub['hubloc_host'] . ' ' . $hub['hubloc_network']);
+						array_unshift($dhubs, $hub);
+					}
+					else {
+						$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
+						$dhubs[] = $hub;
+					}
+					$urls[] = $hub['hubloc_url'];
 				}
 			}
 		}
diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php
index c7bf79854..8afde2c4c 100644
--- a/Zotlabs/Daemon/Ratenotif.php
+++ b/Zotlabs/Daemon/Ratenotif.php
@@ -10,6 +10,11 @@ class Ratenotif {
 
 	static public function run($argc,$argv) {
 
+
+		// Deprecated
+		return;
+
+
 		require_once("datetime.php");
 		require_once('include/items.php');
 
diff --git a/Zotlabs/Identity/BasicId.php b/Zotlabs/Identity/BasicId.php
index 3c149808f..a7fb109cd 100644
--- a/Zotlabs/Identity/BasicId.php
+++ b/Zotlabs/Identity/BasicId.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zotlabs\Identity\BasicId;
+namespace Zotlabs\Identity;
 
 class BasicId {
 
diff --git a/Zotlabs/Identity/ProfilePhoto.php b/Zotlabs/Identity/ProfilePhoto.php
index 2891136c7..9c3ad81a5 100644
--- a/Zotlabs/Identity/ProfilePhoto.php
+++ b/Zotlabs/Identity/ProfilePhoto.php
@@ -1,5 +1,5 @@
 <?php
-namespace Zotlabs\Identity\ProfilePhoto;
+namespace Zotlabs\Identity;
 
 class ProfilePhoto {
 
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 5f222754b..807216400 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -168,7 +168,7 @@ class Activity {
 		);
 		if($r) {
 			xchan_query($r,true);
-			$r = fetch_post_tags($r,true);
+			$r = fetch_post_tags($r);
 			if (in_array($r[0]['verb'], ['Create', 'Invite']) && $r[0]['obj_type'] === ACTIVITY_OBJ_EVENT) {
 				$r[0]['verb'] = 'Invite';
 				return self::encode_activity($r[0]);
@@ -713,7 +713,7 @@ class Activity {
 			);
 			if($p) {
 				xchan_query($p,true);
-				$p = fetch_post_tags($p,true);
+				$p = fetch_post_tags($p);
 				$i['obj'] = self::encode_item($p[0]);
 
 				// convert to zot6 emoji reaction encoding which uses the target object to indicate the
@@ -800,7 +800,7 @@ class Activity {
 					$is_directmessage = false;
 					$recips = get_iconfig($i['parent'], 'activitypub', 'recips');
 
-					if(in_array($i['author']['xchan_url'], $recips['to'])) {
+					if(array_path_exists('to', $recips) && in_array($i['author']['xchan_url'], $recips['to'])) {
 						$reply_url = $d[0]['xchan_url'];
 						$is_directmessage = true;
 					}
@@ -2143,7 +2143,7 @@ class Activity {
 		if(! $s['edited'])
 			$s['edited'] = $s['created'];
 
-		$s['title']    = self::bb_content($content,'name');
+		$s['title']    = (($response_activity) ? EMPTY_STR : self::bb_content($content,'name'));
 		$s['summary']  = self::bb_content($content,'summary');
 		$s['body']     = ((self::bb_content($content,'bbcode') && (! $response_activity)) ? self::bb_content($content,'bbcode') : self::bb_content($content,'content'));
 
@@ -2648,7 +2648,7 @@ class Activity {
 		$current_item = $item;
 
 		while($current_item['parent_mid'] !== $current_item['mid']) {
-			$n = ActivityStreams::fetch($current_item['parent_mid'], $channel);
+			$n = self::fetch($current_item['parent_mid'], $channel);
 			if(! $n) {
 				break;
 			}
@@ -2660,6 +2660,10 @@ class Activity {
 				break;
 			}
 
+			if (is_array($a->actor) && array_key_exists('id',$a->actor)) {
+				self::actor_store($a->actor['id'],$a->actor);
+			}
+
 			$replies = null;
 			if(isset($a->obj['replies']['first']['items'])) {
 				$replies = $a->obj['replies']['first']['items'];
@@ -2725,7 +2729,7 @@ class Activity {
 
 		foreach($arr as $url) {
 
-			$n = ActivityStreams::fetch($url, $channel);
+			$n = self::fetch($url, $channel);
 			if(! $n) {
 				break;
 			}
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index dc8e9e1c5..7ff394750 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -130,9 +130,6 @@ class Channel extends Controller {
 
 		$noscript_content = get_config('system', 'noscript_content', '1');
 
-		if($load)
-			$_SESSION['loadtime'] = datetime_convert();
-
 		$category = $datequery = $datequery2 = '';
 
 		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
@@ -152,7 +149,6 @@ class Channel extends Controller {
 		$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
 		$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
 		$order    = ((x($_GET,'order')) ? notags($_GET['order']) : 'post');
-		$static   = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
 		$search   = ((x($_GET,'search')) ? $_GET['search'] : EMPTY_STR);
 
 		$groups = array();
@@ -187,8 +183,6 @@ class Channel extends Controller {
 
 			nav_set_selected('Channel Home');
 
-			$static = channel_manual_conv_update(App::$profile['profile_uid']);
-
 			// search terms header
 			if($search) {
 				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
@@ -255,7 +249,9 @@ class Channel extends Controller {
 
 		$abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
 
-		$simple_update = (($update) ? " AND item_unseen = 1 " : '');
+		$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']) . "' ) ";
 
 		if($search) {
 			$search = escape_tags($search);
@@ -270,7 +266,6 @@ class Channel extends Controller {
 			}
 		}
 
-
 		head_add_link([ 
 			'rel'   => 'alternate',
 			'type'  => 'application/json+oembed',
@@ -278,14 +273,6 @@ class Channel extends Controller {
 			'title' => 'oembed'
 		]);
 
-		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']) . "' ) ";
-		if($load)
-			$simple_update = '';
-
-		if($static && $simple_update)
-			$simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-
 		if(($update) && (! $load)) {
 
 			if($mid) {
@@ -294,7 +281,6 @@ class Channel extends Controller {
 					dbesc($mid . '%'),
 					intval(App::$profile['profile_uid'])
 				);
-				$_SESSION['loadtime'] = datetime_convert();
 			}
 			else {
 				$r = q("SELECT parent AS item_id from item
@@ -306,9 +292,7 @@ class Channel extends Controller {
 					ORDER BY created DESC",
 					intval(App::$profile['profile_uid'])
 				);
-				$_SESSION['loadtime'] = datetime_convert();
 			}
-
 		}
 		else {
 
@@ -406,7 +390,7 @@ class Channel extends Controller {
 			$o .= '<div id="live-channel"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . App::$profile['profile_uid']
 				. "; var netargs = '?f='; var profile_page = " . App::$pager['page']
-				. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
+				. "; divmore_height = " . intval($maxheight) . ";</script>\r\n";
 
 			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
 				'$baseurl' => z_root(),
@@ -424,7 +408,6 @@ class Channel extends Controller {
 				'$wall' => '1',
 				'$fh' => '0',
 				'$dm' => '0',
-				'$static'  => $static,
 				'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
 				'$search' => $search,
 				'$xchan' => '',
@@ -437,7 +420,8 @@ class Channel extends Controller {
 				'$verb' => '',
 				'$net' => '',
 				'$dend' => $datequery,
-				'$dbegin' => $datequery2
+				'$dbegin' => $datequery2,
+				'$conv_mode' => 'channel'
 			));
 
 		}
@@ -476,6 +460,8 @@ class Channel extends Controller {
 		if($mid)
 			$o .= '<div id="content-complete"></div>';
 
+		$_SESSION['loadtime'] = datetime_convert();
+
 		return $o;
 	}
 }
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 3d61d7018..81ac0f7b8 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -22,9 +22,6 @@ class Display extends \Zotlabs\Web\Controller {
 				$module_format = 'html';			
 		}
 
-		if($load)
-			$_SESSION['loadtime'] = datetime_convert();
-	
 		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
@@ -183,22 +180,11 @@ class Display extends \Zotlabs\Web\Controller {
 			return '';
 		}
 		
-		
-		$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
-
-		$simple_update = (($update) ? " AND item_unseen = 1 " : '');
-			
+		$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']) . "' ) ";
-		if($load)
-			$simple_update = '';
-	
-		if($static && $simple_update)
-			$simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-	
-		if((! $update) && (! $load)) {
 
-			$static  = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1);
+		if((! $update) && (! $load)) {
 
 			// if the target item is not a post (eg a like) we want to address its thread parent
 
@@ -229,7 +215,6 @@ class Display extends \Zotlabs\Web\Controller {
 				'$dm'      => '0',
 				'$nouveau' => '0',
 				'$wall'    => '0',
-				'$static'  => $static,
 				'$page'    => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
 				'$list'    => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
 				'$search'  => '',
@@ -315,7 +300,6 @@ class Display extends \Zotlabs\Web\Controller {
 					dbesc($target_item['parent_mid'])
 				);
 			}
-
 			if($r === null) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner_xchan can't match
@@ -335,7 +319,6 @@ class Display extends \Zotlabs\Web\Controller {
 					intval($sysid)
 				);
 			}
-			$_SESSION['loadtime'] = datetime_convert();
 		}
 	
 		else {
@@ -448,6 +431,8 @@ class Display extends \Zotlabs\Web\Controller {
 	
 		}
 
+		$_SESSION['loadtime'] = datetime_convert();
+
 		return $o;
 
 	}
diff --git a/Zotlabs/Module/Filer.php b/Zotlabs/Module/Filer.php
index af59f28fb..c2747e6c2 100644
--- a/Zotlabs/Module/Filer.php
+++ b/Zotlabs/Module/Filer.php
@@ -31,7 +31,8 @@ class Filer extends \Zotlabs\Web\Controller {
 				intval(local_channel())
 			);
 			if($r) {
-				$x = q("update item set item_retained = 1 where id = %d and uid = %d",
+				$x = q("update item set item_retained = 1, changed = '%s' where id = %d and uid = %d",
+					dbesc(datetime_convert()),
 					intval($r[0]['parent']),
 					intval(local_channel())
 				);
diff --git a/Zotlabs/Module/Filerm.php b/Zotlabs/Module/Filerm.php
index cbf6a118d..9fdfe6c46 100644
--- a/Zotlabs/Module/Filerm.php
+++ b/Zotlabs/Module/Filerm.php
@@ -28,10 +28,14 @@ class Filerm extends \Zotlabs\Web\Controller {
 				intval($item_id),
 				dbesc($term)
 			);
+
+			$x = q("update item set item_retained = 0, changed = '%s' where id = %d and uid = %d",
+				dbesc(datetime_convert()),
+				intval($item_id),
+				intval(local_channel())
+			);
+
 		}
-	
-		if(x($_SESSION,'return_url'))
-			goaway(z_root() . '/' . $_SESSION['return_url']);
 		
 		killme();
 	}
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index e2678c07f..4c2067299 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -38,9 +38,6 @@ class Hq extends \Zotlabs\Web\Controller {
 		if(!local_channel())
 			return;
 
-		if($load)
-			$_SESSION['loadtime'] = datetime_convert();
-	
 		if(argc() > 1 && argv(1) !== 'load') {
 			$item_hash = argv(1);
 		}
@@ -87,15 +84,9 @@ class Hq extends \Zotlabs\Web\Controller {
 				goaway(z_root() . '/moderate/' . $target_item['id']);
 			}
 		
-			$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
-
-			$simple_update = (($update) ? " AND item_unseen = 1 " : '');
-				
+			$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']) . "' ) ";
-		
-			if($static && $simple_update)
-				$simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
 
 			$sys = get_sys_channel();
 			$sql_extra = item_permissions_sql($sys['channel_id']);
@@ -148,8 +139,6 @@ class Hq extends \Zotlabs\Web\Controller {
 
 			nav_set_selected('HQ');
 
-			$static  = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1);
-
 			if($target_item) {
 				// if the target item is not a post (eg a like) we want to address its thread parent
 				//$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
@@ -182,8 +171,7 @@ class Hq extends \Zotlabs\Web\Controller {
 				'$dm'      => '0',
 				'$nouveau' => '0',
 				'$wall'    => '0',
-				'$static'  => $static,
-				'$page'    => 1,
+				'$page'    => '1',
 				'$list'    => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
 				'$search'  => '',
 				'$xchan'   => '',
@@ -249,8 +237,6 @@ class Hq extends \Zotlabs\Web\Controller {
 					intval($sys['channel_id'])
 				);
 			}
-
-			$_SESSION['loadtime'] = datetime_convert();
 		}
 		else {
 			$r = [];
@@ -275,6 +261,8 @@ class Hq extends \Zotlabs\Web\Controller {
 
 		$o .= '<div id="content-complete"></div>';
 
+		$_SESSION['loadtime'] = datetime_convert();
+
 		return $o;
 
 	}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 922a2ef06..7c438c309 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -20,6 +20,7 @@ use App;
 require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/security.php');
+require_once('include/conversation.php');
 
 
 /**
@@ -300,6 +301,7 @@ class Item extends Controller {
 	
 		$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
 		$parent_mid = ((x($_REQUEST,'parent_mid')) ? trim($_REQUEST['parent_mid']) : '');
+		$mode = (($_REQUEST['conv_mode'] === 'channel') ? 'channel' : 'network');
 	
 		$remote_xchan = ((x($_REQUEST,'remote_xchan')) ? trim($_REQUEST['remote_xchan']) : false);
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
@@ -1373,8 +1375,21 @@ class Item extends Controller {
 		if($return_path) {
 			goaway(z_root() . "/" . $return_path);
 		}
-	
-		$json = array('success' => 1);
+
+		if($mode === 'channel')
+			profile_load($channel['channel_address']);
+
+		$item[] = $datarray;
+		$item[0]['owner'] = $owner_xchan;
+		$item[0]['author'] = $observer;
+		$item[0]['attach'] = json_encode($datarray['attach']);
+
+		$json = [
+			'success' => 1,
+			'id' => $post_id,
+			'html' => conversation($item,$mode,true,'r_preview'),
+		];
+
 		if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
 			$json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
 	
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 8ffa7f66c..bb5c6db7a 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -7,13 +7,10 @@ use Zotlabs\Lib\Libsync;
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
-
-
+require_once('include/conversation.php');
 
 class Like extends \Zotlabs\Web\Controller {
 
-
-
 	private function reaction_to_activity($reaction) {
 
 		$acts = [
@@ -42,7 +39,46 @@ class Like extends \Zotlabs\Web\Controller {
 
 	}
 
+	private function like_response($arr) {
+
+		if($arr['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);
+
+		$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'),
+		];
+
+		return $ret;
+
+	}
 
 	public function get() {
 	
@@ -66,7 +102,8 @@ class Like extends \Zotlabs\Web\Controller {
 		}
 	
 		$verb = notags(trim($_GET['verb']));
-	
+		$mode = (($_GET['conv_mode'] === 'channel') ? 'channel' : 'network');
+
 		if(! $verb)
 			$verb = 'like';
 	
@@ -304,7 +341,7 @@ class Like extends \Zotlabs\Web\Controller {
 				$thread_owner = $r[0];
 			else
 				killme();
-	
+
 			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($item['author_xchan'])
 			);
@@ -312,8 +349,7 @@ class Like extends \Zotlabs\Web\Controller {
 				$item_author = $r[0];
 			else
 				killme();
-	
-			
+
 			$verbs = " '".dbesc($activity)."' ";
 	
 			$multi_undo = false;		
@@ -357,16 +393,27 @@ class Like extends \Zotlabs\Web\Controller {
 	
 					// drop_item was not done interactively, so we need to invoke the notifier
 					// in order to push the changes to connections
-	
+
 					\Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$rr['id']));
+
+
 	
 				}
 	
 				if($interactive)
 					return;
 	
-				if(! $multi_undo)
-					killme();
+				if(! $multi_undo) {
+					$ret = self::like_response([
+						'item' => $item,
+						'orig_item_id' => $item_id, 
+						'owner_xchan' => $thread_owner,
+						'conv_mode' => $mode
+					]);
+					json_return_and_die($ret);
+				}
+
+
 			}
 		}
 	
@@ -501,7 +548,6 @@ class Like extends \Zotlabs\Web\Controller {
 	
 		call_hooks('post_local',$arr);
 
-	
 		$post = item_store($arr);	
 		$post_id = $post['item_id'];
 
@@ -540,7 +586,6 @@ class Like extends \Zotlabs\Web\Controller {
 	
 		}
 	
-	
 		\Zotlabs\Daemon\Master::Summon(array('Notifier','like',$post_id));
 	
 		if($interactive) {
@@ -548,10 +593,15 @@ class Like extends \Zotlabs\Web\Controller {
 			$o .= t('Thank you.');
 			return $o;
 		}
-	
-		killme();
+
+		$ret = self::like_response([
+			'item' => $item,
+			'orig_item_id' => $item_id, 
+			'owner_xchan' => $thread_owner,
+			'conv_mode' => $mode
+		]);
+		json_return_and_die($ret);
+
 	}
 	
-	
-	
 }
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php
index 4c935a6a2..2dd359c95 100644
--- a/Zotlabs/Module/Locs.php
+++ b/Zotlabs/Module/Locs.php
@@ -8,55 +8,65 @@ use Zotlabs\Daemon\Master;
 class Locs extends Controller {
 
 	function post() {
-	
+
 		if(! local_channel())
 			return;
-	
+
 		$channel = App::get_channel();
-	
+
 		if($_REQUEST['primary']) {
 			$hubloc_id = intval($_REQUEST['primary']);
 			if($hubloc_id) {
-	
+
 				$r = q("select * from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1",
 					intval($hubloc_id),
 					dbesc($channel['channel_hash'])
 				);
-	
+
 				if(! $r) {
 					notice( t('Location not found.') . EOL);
 					return;
 				}
-	
+
 				q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
 					dbesc($channel['channel_hash']),
 					dbesc($channel['channel_portable_id'])
 				);
+
 				q("UPDATE hubloc SET hubloc_primary = 1 WHERE hubloc_id = %d AND hubloc_hash = '%s'",
 					intval($hubloc_id),
 					dbesc($channel['channel_hash'])
 				);
 
+				$x = q("select * from hubloc where hubloc_id = %d and hubloc_hash = '%s' ",
+					intval($hubloc_id),
+					dbesc($channel['channel_hash'])
+				);
+
+				if ($x) {
+					hubloc_change_primary($x[0]);
+				}
+
 				Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] );
 				return;
-			}			
+			}
 		}
-	
-	
+
 		if($_REQUEST['drop']) {
 			$hubloc_id = intval($_REQUEST['drop']);
-	
+
 			if($hubloc_id) {
 				$r = q("select * from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1",
 					intval($hubloc_id),
 					dbesc(z_root()),
 					dbesc($channel['channel_hash'])
 				);
-	
+
 				if(! $r) {
 					notice( t('Location not found.') . EOL);
 					return;
 				}
+
 				if(intval($r[0]['hubloc_primary'])) {
 					$x = q("select hubloc_id from hubloc where hubloc_primary = 1 and hubloc_hash = '%s'",
 						dbesc($channel['channel_hash'])
@@ -70,7 +80,7 @@ class Locs extends Controller {
 						return;
 					}
 				}
-	
+
 				q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
 					dbesc($r[0]['hubloc_id_url']),
 					dbesc($channel['channel_hash']),
@@ -78,44 +88,41 @@ class Locs extends Controller {
 				);
 				Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] );
 				return;
-			}			
+			}
 		}
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		$channel = App::get_channel();
-	
+
 		if($_REQUEST['sync']) {
 			Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] );
 			info( t('Syncing locations') . EOL);
 			goaway(z_root() . '/locs');
 		}
-	
-	
+
 		$r = q("select * from hubloc where hubloc_hash = '%s'",
 			dbesc($channel['channel_hash'])
 		);
-	
+
 		if(! $r) {
 			notice( t('No locations found.') . EOL);
 			return;
 		}
-	
-	
+
 		for($x = 0; $x < count($r); $x ++) {
 			$r[$x]['primary'] = (intval($r[$x]['hubloc_primary']) ? true : false);
 			$r[$x]['deleted'] = (intval($r[$x]['hubloc_deleted']) ? true : false);
 		}
-	
+
 		$o = replace_macros(get_markup_template('locmanage.tpl'), array(
 			'$header' => t('Manage Channel Locations'),
 			'$loc' => t('Location'),
@@ -129,8 +136,8 @@ class Locs extends Controller {
 			'$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),
 			'$hubs' => $r
 		));
-	
+
 		return $o;
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index bbacbb21e..4a1692d64 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -44,10 +44,6 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		$o = '';
 
-		if($load) {
-			$_SESSION['loadtime'] = datetime_convert();
-		}
-
 		$arr = array('query' => App::$query_string);
 	
 		call_hooks('network_content_init', $arr);
@@ -64,7 +60,6 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		$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']) : '');
-		$static     = ((x($_GET,'static')) ? intval($_GET['static']) : 0); 
 		$gid        = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0);
 		$category   = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
 		$hashtags   = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
@@ -213,8 +208,6 @@ class Network extends \Zotlabs\Web\Controller {
 			$status_editor = status_editor($a,$x,false,'Network');
 			$o .= $status_editor;
 
-			$static = channel_manual_conv_update(local_channel());
-	
 		}
 	
 	
@@ -370,7 +363,6 @@ class Network extends \Zotlabs\Web\Controller {
 				'$dm'      => (($dm) ? $dm : '0'),
 				'$nouveau' => (($nouveau) ? $nouveau : '0'),
 				'$wall'    => '0',
-				'$static'  => $static, 
 				'$list'    => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
 				'$page'    => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
 				'$search'  => (($search) ? urlencode($search) : ''),
@@ -494,8 +486,6 @@ class Network extends \Zotlabs\Web\Controller {
 
 		$parents_str = '';
 
-		$simple_update = (($update) ? " and item_unseen = 1 " : '');
-
 		// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
 		// or three and look at your matrix page - after opening up your browser. The first page loads just as it
 		// should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page
@@ -507,16 +497,11 @@ class Network extends \Zotlabs\Web\Controller {
 		// which "arrived as you were reading page 1". We're going to do this
 		// by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items
 		// which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers...
-	
+
+		$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']) . "' ) ";
 
-               if($load)
-                       $simple_update = '';
-
-		if($static && $simple_update)
-			$simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";	
-	
 		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 
@@ -524,7 +509,6 @@ class Network extends \Zotlabs\Web\Controller {
 				$net_query
 				WHERE true $uids $item_normal
 				and (abook.abook_blocked = 0 or abook.abook_flags is null)
-				$simple_update
 				$sql_extra $sql_options $sql_nets
 				$net_query2
 				ORDER BY item.created DESC $pager_sql "
@@ -570,7 +554,6 @@ class Network extends \Zotlabs\Web\Controller {
 					and (abook.abook_blocked = 0 or abook.abook_flags is null)
 					$sql_extra3 $sql_extra $sql_options $sql_nets $net_query2"
 				);
-				$_SESSION['loadtime'] = datetime_convert();
 			}
 
 			// Then fetch all the children of the parents that are on this page
@@ -605,6 +588,8 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		if(($items) && (! $update))
 			$o .= alt_pager(count($items));
+
+		$_SESSION['loadtime'] = datetime_convert();
 	
 		return $o;
 	}
diff --git a/Zotlabs/Module/Oauth2testvehicle.php b/Zotlabs/Module/OAuth2TestVehicle.php
index 5ae278e8c..5ae278e8c 100644
--- a/Zotlabs/Module/Oauth2testvehicle.php
+++ b/Zotlabs/Module/OAuth2TestVehicle.php
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php
index 55c96b23d..113f0a196 100644
--- a/Zotlabs/Module/Pubstream.php
+++ b/Zotlabs/Module/Pubstream.php
@@ -23,9 +23,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			}
 		}
 
-		if($load)
-			$_SESSION['loadtime'] = datetime_convert();
-
 		if((observer_prohibited(true))) {
 			return login();
 		}
@@ -59,7 +56,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
 
-		$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
 		$net    = ((array_key_exists('net',$_REQUEST))    ? escape_tags($_REQUEST['net']) : '');
 
 		$title = replace_macros(get_markup_template("section_title.tpl"),array(
@@ -103,11 +99,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			$o .= status_editor($a,$x,false,'Pubstream');
 			$o .= '</div>';
 		}
-
-
-
-
-
 	
 		if(! $update && !$load) {
 
@@ -116,8 +107,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			if(!$mid)
 				$_SESSION['static_loadtime'] = datetime_convert();
 
-			$static  = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1);
-	
 			$maxheight = get_config('system','home_divmore_height');
 			if(! $maxheight)
 				$maxheight = 400;
@@ -148,7 +137,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 				'$nouveau' => '0',
 				'$wall'    => '0',
 				'$list'    => '0',
-				'$static'  => $static,
 				'$page'    => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
 				'$search'  => '',
 				'$xchan'   => '',
@@ -200,14 +188,10 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		$net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
 
 		$abook_uids = " and abook.abook_channel = " . intval(\App::$profile['profile_uid']) . " ";
-	
-		$simple_update = (($_SESSION['loadtime']) ? " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' " : '');
-	
-		if($load)
-			$simple_update = '';
 
-		if($static && $simple_update)
-			$simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
+		$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']) . "' ) ";
 
 		//logger('update: ' . $update . ' load: ' . $load);
 
@@ -220,10 +204,10 @@ 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 like '%s' $uids $item_normal
+						WHERE mid = '%s' $uids $item_normal
 						and (abook.abook_blocked = 0 or abook.abook_flags is null)
-						$sql_extra3 $sql_extra $sql_nets $net_query2 LIMIT 1",
-						dbesc($mid . '%')
+						$sql_extra3 $sql_extra $sql_nets $net_query2",
+						dbesc($mid)
 					);
 				}
 				else {
@@ -243,10 +227,10 @@ 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 like '%s' $uids $item_normal_update $simple_update
+						WHERE mid = '%s' $uids $item_normal_update $simple_update
 						and (abook.abook_blocked = 0 or abook.abook_flags is null)
-						$sql_extra3 $sql_extra $sql_nets $net_query2 LIMIT 1",
-						dbesc($mid . '%')
+						$sql_extra3 $sql_extra $sql_nets $net_query2",
+						dbesc($mid)
 					);
 				}
 				else {
@@ -259,7 +243,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 						$sql_extra3 $sql_extra $sql_nets $net_query2"
 					);
 				}
-				$_SESSION['loadtime'] = datetime_convert();
 			}
 
 			// Then fetch all the children of the parents that are on this page
@@ -291,7 +274,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 	
 		// fake it
 		$mode = (($hashtags) ? 'search' : 'pubstream');
-	
+
 		$o .= conversation($items,$mode,$update,$page_mode);
 
 		if($mid)
@@ -300,6 +283,8 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		if(($items) && (! $update))
 			$o .= alt_pager(count($items));
 
+		$_SESSION['loadtime'] = datetime_convert();
+
 		return $o;
 	
 	}
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index d586ae12f..c22bf2836 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -19,9 +19,6 @@ class Search extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		if($load)
-			$_SESSION['loadtime'] = datetime_convert();
-	
 		nav_set_selected('Search');
 	
 		require_once("include/bbcode.php");
@@ -54,8 +51,6 @@ class Search extends \Zotlabs\Web\Controller {
 			$search = ((x($_GET,'tag')) ? trim(escape_tags(rawurldecode($_GET['tag']))) : '');
 		}
 
-		$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
-	
 		$o .= search($search,'search-box','/search',((local_channel()) ? true : false));
 	
 		if(strpos($search,'#') === 0) {
@@ -105,9 +100,6 @@ class Search extends \Zotlabs\Web\Controller {
 
 		if((! $update) && (! $load)) {
 	
-			$static  = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0);
-
-
 			// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
 			// because browser prefetching might change it on us. We have to deliver it with the page.
 	
@@ -131,7 +123,6 @@ class Search extends \Zotlabs\Web\Controller {
 				'$dm' => '0',
 				'$nouveau' => '0',
 				'$wall' => '0',
-				'$static' => $static,
 				'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
 				'$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
 				'$search' => (($tag) ? urlencode('#') : '') . $search,
diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php
index 01ae8652a..cade0a529 100644
--- a/Zotlabs/Module/Settings/Display.php
+++ b/Zotlabs/Module/Settings/Display.php
@@ -28,7 +28,6 @@ class Display {
 		$user_scalable     = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable'])  : 0);
 		$nosmile           = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);
 		$title_tosource    = ((x($_POST,'title_tosource')) ? intval($_POST['title_tosource'])  : 0);
-		$manual_update     = ((array_key_exists('manual_update',$_POST)) ? intval($_POST['manual_update']) : 0);
 		$start_menu        = ((x($_POST,'start_menu')) ? intval($_POST['start_menu']) : 0);
 
 		$browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
@@ -47,7 +46,6 @@ class Display {
 		set_pconfig(local_channel(),'system','itemspage', $itemspage);
 		set_pconfig(local_channel(),'system','no_smilies',1-intval($nosmile));
 		set_pconfig(local_channel(),'system','title_tosource',$title_tosource);
-		set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update);
 		set_pconfig(local_channel(),'system','channel_menu', $channel_menu);
 		set_pconfig(local_channel(),'system','start_menu', $start_menu);
 
@@ -200,7 +198,6 @@ class Display {
 			'$itemspage'   => array('itemspage',  t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 30 items')),
 			'$nosmile'	=> array('nosmile', t("Show emoticons (smilies) as images"), 1-intval($nosmile), '', $yes_no),
 			'$channel_menu' => [ 'channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(),'system','channel_menu',get_config('system','channel_menu',0)), t('Default: channel menu located in app menu'),$yes_no ],
-			'$manual_update'	=> array('manual_update', t('Manual conversation updates'), channel_manual_conv_update(local_channel()), t('Default is on, turning this off may increase screen jumping'), $yes_no),
 			'$title_tosource'	=> array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no),
 			'$theme_config' => $theme_config,
 			'$start_menu' => ['start_menu', t('New Member Links'), $start_menu, t('Display new member quick links menu'), $yes_no]
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index 42426afb1..792556a10 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -212,6 +212,9 @@ class HTTPSig {
 
 	static function get_key($key,$keytype,$id) {
 
+		if(is_array($key))
+			btlogger('key is array: ' . print_r($key,true));
+
 		if($key) {
 			if(function_exists($key)) {
 				return $key($id);