Merge branch '6.4RC'6.4

8 files changed, 648 insertions, 516 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index a0a9a7c7f..664886fc2 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -8,8 +8,6 @@ use Zotlabs\Access\PermissionRoles;
 use Zotlabs\Access\Permissions;
 use Zotlabs\Daemon\Master;
 use Zotlabs\Web\HTTPSig;
-use Zotlabs\Lib\XConfig;
-use Zotlabs\Lib\Libzot;
 
 require_once('include/event.php');
 require_once('include/html2plain.php');
@@ -104,7 +102,7 @@ class Activity {
 		if ($x['success']) {
 			$m = parse_url($url);
 			if ($m) {
-				$y = [ 'scheme' => $m['scheme'], 'host' => $m['host'] ];
+				$y = ['scheme' => $m['scheme'], 'host' => $m['host']];
 				if (array_key_exists('port', $m))
 					$y['port'] = $m['port'];
 				$site_url = unparse_url($y);
@@ -288,21 +286,21 @@ class Activity {
 				'type' => $type . 'Page',
 			];
 
-			$numpages = $total / App::$pager['itemspage'];
-			$lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages);
+			$numpages  = $total / App::$pager['itemspage'];
+			$lastpage  = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages);
 			$url_parts = parse_url($id);
 
 			$ret['partOf'] = z_root() . '/' . $url_parts['path'];
 
 			$extra_query_args = '';
-			$query_args = null;
-			if(isset($url_parts['query'])) {
+			$query_args       = null;
+			if (isset($url_parts['query'])) {
 				parse_str($url_parts['query'], $query_args);
 			}
 
-			if(is_array($query_args)) {
+			if (is_array($query_args)) {
 				unset($query_args['page']);
-				foreach($query_args as $k => $v)
+				foreach ($query_args as $k => $v)
 					$extra_query_args .= '&' . urlencode($k) . '=' . urlencode($v);
 			}
 
@@ -376,11 +374,33 @@ class Activity {
 		return $ret;
 	}
 
-	static function encode_item($i) {
+	static function encode_simple_collection($items, $id, $type, $total = 0, $extra = null) {
 
-		$ret = [];
+		$ret = [
+			'id'         => z_root() . '/' . $id,
+			'type'       => $type,
+			'totalItems' => $total,
+		];
 
+		if ($extra) {
+			$ret = array_merge($ret, $extra);
+		}
+
+		if ($items) {
+			if ($type === 'OrderedCollection') {
+				$ret['orderedItems'] = $items;
+			}
+			else {
+				$ret['items'] = $items;
+			}
+		}
+
+		return $ret;
+	}
+
+	static function encode_item($i) {
 
+		$ret = [];
 
 		if ($i['verb'] === ACTIVITY_FRIEND) {
 			// Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note
@@ -1095,7 +1115,33 @@ class Activity {
 			'height'    => 300,
 			'width'     => 300,
 		];
-		$ret['url']     = $p['xchan_url'];
+
+/* This could be used to distinguish actors by protocol instead of tags,
+ * array urls are not supported by some AP projects (pixelfed) though.
+ *
+		$ret['url'] = [
+			[
+				'type' => 'Link',
+				'rel'  => 'alternate',
+				'mediaType' => 'application/x-zot+json',
+				'href' => $p['xchan_url']
+			],
+			[
+				'type' => 'Link',
+				'rel'  => 'alternate',
+				'mediaType' => 'application/activity+json',
+				'href' => $p['xchan_url']
+			],
+			[
+				'type' => 'Link',
+				'rel'  => 'alternate', // 'me'?
+				'mediaType' => 'text/html',
+				'href' => $p['xchan_url']
+			]
+		];
+*/
+
+		$ret['url'] = $p['xchan_url'];
 
 		$ret['publicKey'] = [
 			'id'           => $p['xchan_url'],
@@ -1103,15 +1149,24 @@ class Activity {
 			'publicKeyPem' => $p['xchan_pubkey']
 		];
 
+		if ($c) {
+			$ret['tag'][] = [
+				'type' => 'PropertyValue',
+				'name' => 'Protocol',
+				'value' => 'zot6'
+			];
+
+			$ret['outbox'] = z_root() . '/outbox/' . $c['channel_address'];
+		}
+
 		$arr = [
-			'xchan' => $p,
+			'xchan'   => $p,
 			'encoded' => $ret
 		];
 
 		call_hooks('encode_person', $arr);
 
 		$ret = $arr['encoded'];
-
 		return $ret;
 	}
 
@@ -1119,8 +1174,8 @@ class Activity {
 		$ret = [];
 
 		if ($item[$elm]) {
-			if (! is_array($item[$elm])) {
-				$item[$elm] = json_decode($item[$elm],true);
+			if (!is_array($item[$elm])) {
+				$item[$elm] = json_decode($item[$elm], true);
 			}
 			if ($item[$elm]['type'] === ACTIVITY_OBJ_PHOTO) {
 				$item[$elm]['id'] = $item['mid'];
@@ -1150,22 +1205,22 @@ class Activity {
 		}
 
 		$acts = [
-			'http://activitystrea.ms/schema/1.0/post'     => 'Create',
-			'http://activitystrea.ms/schema/1.0/share'    => 'Announce',
-			'http://activitystrea.ms/schema/1.0/update'   => 'Update',
-			'http://activitystrea.ms/schema/1.0/like'     => 'Like',
-			'http://activitystrea.ms/schema/1.0/favorite' => 'Like',
-			'http://purl.org/zot/activity/dislike'        => 'Dislike',
-			'http://activitystrea.ms/schema/1.0/tag'      => 'Add',
-			'http://activitystrea.ms/schema/1.0/follow'   => 'Follow',
-			'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow',
+			'http://activitystrea.ms/schema/1.0/post'           => 'Create',
+			'http://activitystrea.ms/schema/1.0/share'          => 'Announce',
+			'http://activitystrea.ms/schema/1.0/update'         => 'Update',
+			'http://activitystrea.ms/schema/1.0/like'           => 'Like',
+			'http://activitystrea.ms/schema/1.0/favorite'       => 'Like',
+			'http://purl.org/zot/activity/dislike'              => 'Dislike',
+			'http://activitystrea.ms/schema/1.0/tag'            => 'Add',
+			'http://activitystrea.ms/schema/1.0/follow'         => 'Follow',
+			'http://activitystrea.ms/schema/1.0/unfollow'       => 'Unfollow',
 			'http://activitystrea.ms/schema/1.0/stop-following' => 'Unfollow',
-			'http://purl.org/zot/activity/attendyes'      => 'Accept',
-			'http://purl.org/zot/activity/attendno'       => 'Reject',
-			'http://purl.org/zot/activity/attendmaybe'    => 'TentativeAccept',
-			'Invite'                                      => 'Invite',
-			'Delete'                                      => 'Delete',
-			'Undo'                                        => 'Undo'
+			'http://purl.org/zot/activity/attendyes'            => 'Accept',
+			'http://purl.org/zot/activity/attendno'             => 'Reject',
+			'http://purl.org/zot/activity/attendmaybe'          => 'TentativeAccept',
+			'Invite'                                            => 'Invite',
+			'Delete'                                            => 'Delete',
+			'Undo'                                              => 'Undo'
 		];
 
 		call_hooks('activity_mapper', $acts);
@@ -1198,22 +1253,22 @@ class Activity {
 	static function activity_decode_mapper($verb) {
 
 		$acts = [
-			'http://activitystrea.ms/schema/1.0/post'     => 'Create',
-			'http://activitystrea.ms/schema/1.0/share'    => 'Announce',
-			'http://activitystrea.ms/schema/1.0/update'   => 'Update',
-			'http://activitystrea.ms/schema/1.0/like'     => 'Like',
-			'http://activitystrea.ms/schema/1.0/favorite' => 'Like',
-			'http://purl.org/zot/activity/dislike'        => 'Dislike',
-			'http://activitystrea.ms/schema/1.0/tag'      => 'Add',
-			'http://activitystrea.ms/schema/1.0/follow'   => 'Follow',
-			'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow',
+			'http://activitystrea.ms/schema/1.0/post'           => 'Create',
+			'http://activitystrea.ms/schema/1.0/share'          => 'Announce',
+			'http://activitystrea.ms/schema/1.0/update'         => 'Update',
+			'http://activitystrea.ms/schema/1.0/like'           => 'Like',
+			'http://activitystrea.ms/schema/1.0/favorite'       => 'Like',
+			'http://purl.org/zot/activity/dislike'              => 'Dislike',
+			'http://activitystrea.ms/schema/1.0/tag'            => 'Add',
+			'http://activitystrea.ms/schema/1.0/follow'         => 'Follow',
+			'http://activitystrea.ms/schema/1.0/unfollow'       => 'Unfollow',
 			'http://activitystrea.ms/schema/1.0/stop-following' => 'Unfollow',
-			'http://purl.org/zot/activity/attendyes'      => 'Accept',
-			'http://purl.org/zot/activity/attendno'       => 'Reject',
-			'http://purl.org/zot/activity/attendmaybe'    => 'TentativeAccept',
-			'Invite'                                      => 'Invite',
-			'Delete'                                      => 'Delete',
-			'Undo'                                        => 'Undo'
+			'http://purl.org/zot/activity/attendyes'            => 'Accept',
+			'http://purl.org/zot/activity/attendno'             => 'Reject',
+			'http://purl.org/zot/activity/attendmaybe'          => 'TentativeAccept',
+			'Invite'                                            => 'Invite',
+			'Delete'                                            => 'Delete',
+			'Undo'                                              => 'Undo'
 		];
 
 		call_hooks('activity_decode_mapper', $acts);
@@ -1325,7 +1380,7 @@ class Activity {
 		 *
 		 */
 
-		if (in_array($act->type, [ 'Follow', 'Invite', 'Join'])) {
+		if (in_array($act->type, ['Follow', 'Invite', 'Join'])) {
 			$their_follow_id = $act->id;
 		}
 
@@ -1348,8 +1403,8 @@ class Activity {
 			}
 		}
 
-		$x = \Zotlabs\Access\PermissionRoles::role_perms('social');
-		$their_perms = \Zotlabs\Access\Permissions::FilledPerms($x['perms_connect']);
+		$x           = PermissionRoles::role_perms('social');
+		$their_perms = Permissions::FilledPerms($x['perms_connect']);
 
 		if ($contact && $contact['abook_id']) {
 
@@ -1423,7 +1478,7 @@ class Activity {
 		}
 		$ret = $r[0];
 
-		$p = \Zotlabs\Access\Permissions::connect_perms($channel['channel_id']);
+		$p         = Permissions::connect_perms($channel['channel_id']);
 		$my_perms  = $p['perms'];
 		$automatic = $p['automatic'];
 
@@ -1444,13 +1499,13 @@ class Activity {
 			]
 		);
 
-		if($my_perms)
-			foreach($my_perms as $k => $v)
-				set_abconfig($channel['channel_id'],$ret['xchan_hash'],'my_perms',$k,$v);
+		if ($my_perms)
+			foreach ($my_perms as $k => $v)
+				set_abconfig($channel['channel_id'], $ret['xchan_hash'], 'my_perms', $k, $v);
 
-		if($their_perms)
-			foreach($their_perms as $k => $v)
-				set_abconfig($channel['channel_id'],$ret['xchan_hash'],'their_perms',$k,$v);
+		if ($their_perms)
+			foreach ($their_perms as $k => $v)
+				set_abconfig($channel['channel_id'], $ret['xchan_hash'], 'their_perms', $k, $v);
 
 		if ($r) {
 			logger("New ActivityPub follower for {$channel['channel_name']}");
@@ -1540,16 +1595,16 @@ class Activity {
 			return;
 		}
 
-/* not implemented
-		if (array_key_exists('movedTo',$person_obj) && $person_obj['movedTo'] && ! is_array($person_obj['movedTo'])) {
-			$tgt = self::fetch($person_obj['movedTo']);
-			if (is_array($tgt)) {
-				self::actor_store($person_obj['movedTo'],$tgt);
-				ActivityPub::move($person_obj['id'],$tgt);
-			}
-			return;
-		}
-*/
+		/* not implemented
+				if (array_key_exists('movedTo',$person_obj) && $person_obj['movedTo'] && ! is_array($person_obj['movedTo'])) {
+					$tgt = self::fetch($person_obj['movedTo']);
+					if (is_array($tgt)) {
+						self::actor_store($person_obj['movedTo'],$tgt);
+						ActivityPub::move($person_obj['id'],$tgt);
+					}
+					return;
+				}
+		*/
 		$ap_hubloc = null;
 
 		$hublocs = self::get_actor_hublocs($url);
@@ -1567,7 +1622,7 @@ class Activity {
 
 		if ($ap_hubloc) {
 			// we already have a stored record. Determine if it needs updating.
-			if ($ap_hubloc['hubloc_updated'] < datetime_convert('UTC','UTC',' now - 3 days') || $force) {
+			if ($ap_hubloc['hubloc_updated'] < datetime_convert('UTC', 'UTC', ' now - 3 days') || $force) {
 				$person_obj = self::fetch($url);
 			}
 			else {
@@ -1579,7 +1634,7 @@ class Activity {
 			$url = $person_obj['id'];
 		}
 
-		if (! $url) {
+		if (!$url) {
 			return;
 		}
 
@@ -1602,6 +1657,19 @@ class Activity {
 			$name = t('Unknown');
 		}
 
+		$webfinger_addr = '';
+
+		$m = parse_url($url);
+		if ($m) {
+			$hostname = $m['host'];
+			$baseurl  = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
+			$site_url = $m['scheme'] . '://' . $m['host'];
+		}
+
+		if (!empty($person_obj['preferredUsername']) && isset($parsed_url['host'])) {
+			$webfinger_addr = escape_tags($person_obj['preferredUsername']) . '@' . $hostname;
+		}
+
 		$icon = z_root() . '/' . get_default_profile_photo(300);
 		if ($person_obj['icon']) {
 			if (is_array($person_obj['icon'])) {
@@ -1661,22 +1729,15 @@ class Activity {
 			}
 		}
 
-		$m = parse_url($url);
-		if($m) {
-			$hostname = $m['host'];
-			$baseurl = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
-			$site_url = $m['scheme'] . '://' . $m['host'];
-		}
-
 		$r = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s'",
 			dbesc($url)
 		);
 
-		if($r) {
+		if ($r) {
 			// Record exists. Cache existing records for one week at most
 			// then refetch to catch updated profile photos, names, etc.
 			$d = datetime_convert('UTC', 'UTC', 'now - 3 days');
-			if($r[0]['hubloc_updated'] > $d && !$force) {
+			if ($r[0]['hubloc_updated'] > $d && !$force) {
 				return;
 			}
 
@@ -1686,17 +1747,19 @@ class Activity {
 			);
 
 			// update existing xchan record
-			q("update xchan set xchan_name = '%s', xchan_guid = '%s', xchan_pubkey = '%s', xchan_network = 'activitypub', xchan_name_date = '%s' where xchan_hash = '%s'",
+			q("update xchan set xchan_name = '%s', xchan_guid = '%s', xchan_pubkey = '%s', xchan_addr = '%s', xchan_network = 'activitypub', xchan_name_date = '%s' where xchan_hash = '%s'",
 				dbesc(escape_tags($name)),
 				dbesc(escape_tags($url)),
 				dbesc(escape_tags($pubkey)),
+				dbesc(escape_tags($webfinger_addr)),
 				dbescdate(datetime_convert()),
 				dbesc($url)
 			);
 
 			// update existing hubloc record
-			q("update hubloc set hubloc_guid = '%s', hubloc_network = 'activitypub', hubloc_url = '%s', hubloc_host = '%s', hubloc_callback = '%s', hubloc_updated = '%s', hubloc_id_url = '%s' where hubloc_hash = '%s'",
+			q("update hubloc set hubloc_guid = '%s', hubloc_addr = '%s', hubloc_network = 'activitypub', hubloc_url = '%s', hubloc_host = '%s', hubloc_callback = '%s', hubloc_updated = '%s', hubloc_id_url = '%s' where hubloc_hash = '%s'",
 				dbesc(escape_tags($url)),
+				dbesc(escape_tags($webfinger_addr)),
 				dbesc(escape_tags($baseurl)),
 				dbesc(escape_tags($hostname)),
 				dbesc(escape_tags($inbox)),
@@ -1710,14 +1773,14 @@ class Activity {
 
 			xchan_store_lowlevel(
 				[
-					'xchan_hash'         => escape_tags($url),
-					'xchan_guid'         => escape_tags($url),
-					'xchan_pubkey'       => escape_tags($pubkey),
-					'xchan_addr'         => '',
-					'xchan_url'          => escape_tags($profile),
-					'xchan_name'         => escape_tags($name),
-					'xchan_name_date'    => datetime_convert(),
-					'xchan_network'      => 'activitypub'
+					'xchan_hash'      => escape_tags($url),
+					'xchan_guid'      => escape_tags($url),
+					'xchan_pubkey'    => escape_tags($pubkey),
+					'xchan_addr'      => $webfinger_addr,
+					'xchan_url'       => escape_tags($profile),
+					'xchan_name'      => escape_tags($name),
+					'xchan_name_date' => datetime_convert(),
+					'xchan_network'   => 'activitypub'
 				]
 			);
 
@@ -1725,7 +1788,7 @@ class Activity {
 				[
 					'hubloc_guid'     => escape_tags($url),
 					'hubloc_hash'     => escape_tags($url),
-					'hubloc_addr'     => '',
+					'hubloc_addr'     => $webfinger_addr,
 					'hubloc_network'  => 'activitypub',
 					'hubloc_url'      => escape_tags($baseurl),
 					'hubloc_host'     => escape_tags($hostname),
@@ -1737,6 +1800,19 @@ class Activity {
 			);
 		}
 
+		// We store all ActivityPub actors we can resolve. Some of them may be able to communicate over Zot6. Find them.
+		// Adding zot discovery urls to the actor record will cause federation to fail with the 20-30 projects which don't accept arrays in the url field.
+
+		$actor_protocols = self::get_actor_protocols($person_obj);
+		if (in_array('zot6', $actor_protocols)) {
+			$zx = q("select * from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6'",
+				dbesc($url)
+			);
+			if (!$zx && $webfinger_addr) {
+				Master::Summon(['Gprobe', bin2hex($webfinger_addr)]);
+			}
+		}
+
 		$photos = import_xchan_photo($icon, $url);
 		q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
 			dbescdate(datetime_convert('UTC', 'UTC', $photos[5])),
@@ -1784,9 +1860,9 @@ class Activity {
 
 	static function create_note($channel, $observer_hash, $act) {
 
-		$s = [];
+		$s              = [];
 		$is_sys_channel = is_sys_channel($channel['channel_id']);
-		$parent = ((array_key_exists('inReplyTo', $act->obj)) ? urldecode($act->obj['inReplyTo']) : '');
+		$parent         = ((array_key_exists('inReplyTo', $act->obj)) ? urldecode($act->obj['inReplyTo']) : '');
 
 		if ($parent) {
 
@@ -2138,7 +2214,7 @@ class Activity {
 		// Unfollow is not defined by ActivityStreams, which prefers Undo->Follow.
 		// This may have to be revisited if AP projects start using Follow for objects other than actors.
 
-		if (in_array($act->type, [ 'Follow', 'Unfollow' ])) {
+		if (in_array($act->type, ['Follow', 'Unfollow'])) {
 			return false;
 		}
 
@@ -2161,10 +2237,12 @@ class Activity {
 		$s['parent_mid'] = $act->parent_id;
 
 		if (array_key_exists('published', $act->data)) {
-			$s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']);
+			$s['created']   = datetime_convert('UTC', 'UTC', $act->data['published']);
+			$s['commented'] = $s['created'];
 		}
 		elseif (array_key_exists('published', $act->obj)) {
-			$s['created'] = datetime_convert('UTC', 'UTC', $act->obj['published']);
+			$s['created']   = datetime_convert('UTC', 'UTC', $act->obj['published']);
+			$s['commented'] = $s['created'];
 		}
 		if (array_key_exists('updated', $act->data)) {
 			$s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']);
@@ -2235,10 +2313,10 @@ class Activity {
 			}
 		}
 
-		if (! array_key_exists('created', $s))
+		if (!array_key_exists('created', $s))
 			$s['created'] = datetime_convert();
 
-		if (! array_key_exists('edited', $s))
+		if (!array_key_exists('edited', $s))
 			$s['edited'] = $s['created'];
 
 		$s['title']   = (($response_activity) ? EMPTY_STR : self::bb_content($content, 'name'));
@@ -2447,7 +2525,7 @@ class Activity {
 
 			}
 
-			if ($act->obj['type'] === 'Image' && strpos($s['body'],'zrl=') === false) {
+			if ($act->obj['type'] === 'Image' && strpos($s['body'], 'zrl=') === false) {
 
 				$ptr = null;
 
@@ -3115,7 +3193,7 @@ class Activity {
 
 	static function announce_note($channel, $observer_hash, $act) {
 
-		$s = [];
+		$s              = [];
 		$is_sys_channel = is_sys_channel($channel['channel_id']);
 
 		if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !$is_sys_channel) {
@@ -3375,7 +3453,7 @@ class Activity {
 		$ret = false;
 
 		foreach ($attach as $a) {
-			if (array_key_exists('type',$a) && stripos($a['type'], 'image') !== false) {
+			if (array_key_exists('type', $a) && stripos($a['type'], 'image') !== false) {
 				if (self::media_not_in_body($a['href'], $body)) {
 					$ret .= "\n\n" . '[img]' . $a['href'] . '[/img]';
 				}
@@ -3533,7 +3611,7 @@ class Activity {
 	static function find_best_identity($xchan) {
 
 		if (filter_var($xchan, FILTER_VALIDATE_URL)) {
-			$r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' and hubloc_deleted = 0",
+			$r = q("SELECT hubloc_hash, hubloc_network FROM hubloc WHERE hubloc_id_url = '%s' AND hubloc_network IN ('zot6', 'activitypub') AND hubloc_deleted = 0",
 				dbesc($xchan)
 			);
 			if ($r) {
@@ -3548,7 +3626,7 @@ class Activity {
 	}
 
 	static function get_cached_actor($id) {
-		$actor = XConfig::Get($id,'system', 'actor_record');
+		$actor = XConfig::Get($id, 'system', 'actor_record');
 
 		if ($actor) {
 			return $actor;
@@ -3556,7 +3634,7 @@ class Activity {
 
 		// try other get_cached_actor providers (e.g. diaspora)
 		$hookdata = [
-			'id' => $id,
+			'id'    => $id,
 			'actor' => false
 		];
 
@@ -3567,8 +3645,6 @@ class Activity {
 
 	static function get_actor_hublocs($url, $options = 'all') {
 
-		$hublocs = false;
-
 		switch ($options) {
 			case 'activitypub':
 				$hublocs = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' and hubloc_deleted = 0 ",
@@ -3593,21 +3669,41 @@ class Activity {
 	}
 
 	static function get_actor_collections($url) {
-		$ret = [];
-		$actor_record = XConfig::Get($url,'system','actor_record');
-		if (! $actor_record) {
+		$ret          = [];
+		$actor_record = XConfig::Get($url, 'system', 'actor_record');
+		if (!$actor_record) {
 			return $ret;
 		}
 
-		foreach ( [ 'inbox','outbox','followers','following' ] as $collection) {
+		foreach (['inbox', 'outbox', 'followers', 'following'] as $collection) {
 			if (isset($actor_record[$collection]) && $actor_record[$collection]) {
 				$ret[$collection] = $actor_record[$collection];
 			}
 		}
-		if (array_path_exists('endpoints/sharedInbox',$actor_record) && $actor_record['endpoints']['sharedInbox']) {
+		if (array_path_exists('endpoints/sharedInbox', $actor_record) && $actor_record['endpoints']['sharedInbox']) {
 			$ret['sharedInbox'] = $actor_record['endpoints']['sharedInbox'];
 		}
 
 		return $ret;
 	}
+
+
+	static function get_actor_protocols($actor) {
+		$ret = [];
+
+		if (!array_key_exists('tag', $actor) || empty($actor['tag']) || !is_array($actor['tag'])) {
+			return $ret;
+		}
+
+		foreach ($tag as $t) {
+			if ((isset($t['type']) && $t['type'] === 'PropertyValue') &&
+				(isset($t['name']) && $t['name'] === 'Protocol') &&
+				(isset($t['value']) && in_array($t['value'], ['zot6', 'activitypub', 'diaspora']))
+			) {
+				$ret[] = $t['value'];
+			}
+		}
+
+		return $ret;
+	}
 }
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 3c09adaa5..c4ddcff1b 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -3,7 +3,6 @@
 namespace Zotlabs\Lib;
 
 use App;
-use Zotlabs\Lib\Libsync;
 
 require_once('include/plugin.php');
 require_once('include/channel.php');
@@ -22,9 +21,10 @@ class Apps {
 	 * @brief
 	 *
 	 * @param boolean $translate (optional) default true
+	 * @param boolean $sync (optional) default false used if called from sync_sysapps()
 	 * @return array
 	 */
-	static public function get_system_apps($translate = true) {
+	static public function get_system_apps($translate = true, $sync = false) {
 		$ret = [];
 
 		if(is_dir('apps'))
@@ -34,7 +34,7 @@ class Apps {
 
 		if($files) {
 			foreach($files as $f) {
-				$x = self::parse_app_description($f,$translate);
+				$x = self::parse_app_description($f, $translate, $sync);
 				if($x) {
 					$ret[] = $x;
 				}
@@ -46,7 +46,7 @@ class Apps {
 				$path = explode('/',$f);
 				$plugin = trim($path[1]);
 				if(plugin_is_installed($plugin)) {
-					$x = self::parse_app_description($f,$translate);
+					$x = self::parse_app_description($f, $translate, $sync);
 					if($x) {
 						$x['plugin'] = $plugin;
 						$ret[] = $x;
@@ -210,9 +210,10 @@ class Apps {
 	 *
 	 * @param string $f filename
 	 * @param boolean $translate (optional) default true
+	 * @param boolean $sync (optional) default false
 	 * @return boolean|array
 	 */
-	static public function parse_app_description($f, $translate = true) {
+	static public function parse_app_description($f, $translate = true, $sync = false) {
 		$ret = [];
 		$matches = [];
 
@@ -258,7 +259,7 @@ class Apps {
 		if(array_key_exists('categories',$ret))
 			$ret['categories'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$ret['categories']);
 
-		if(array_key_exists('requires',$ret)) {
+		if(array_key_exists('requires',$ret) && !$sync) {
 			$requires = explode(',',$ret['requires']);
 			foreach($requires as $require) {
 				$require = trim(strtolower($require));
@@ -310,14 +311,16 @@ class Apps {
 				}
 			}
 		}
-		if(isset($ret)) {
-			if($translate)
-				self::translate_system_apps($ret);
 
-			return $ret;
+		if(empty($ret)) {
+			return false;
 		}
 
-		return false;
+		if($translate) {
+			self::translate_system_apps($ret);
+		}
+
+		return $ret;
 	}
 
 
@@ -624,10 +627,12 @@ class Apps {
 
 		$app['uid'] = $uid;
 
-		if(self::app_installed($uid,$app,true))
+		if(self::app_installed($uid,$app,true)) {
 			$x = self::app_update($app);
-		else
+		}
+		else {
 			$x = self::app_store($app);
+		}
 
 		if($x['success']) {
 			$r = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
@@ -635,13 +640,12 @@ class Apps {
 				intval($uid)
 			);
 			if($r) {
-				if(($app['uid']) && (! $r[0]['app_system'])) {
+				if($app['uid']) {
 					if($app['categories'] && (! $app['term'])) {
 						$r[0]['term'] = q("select * from term where otype = %d and oid = %d",
 							intval(TERM_OBJ_APP),
 							intval($r[0]['id'])
 						);
-						Libsync::build_sync_packet($uid,array('app' => $r[0]));
 					}
 				}
 			}
@@ -670,6 +674,7 @@ class Apps {
 				}
 			}
 		}
+
 		return true;
 	}
 
@@ -681,38 +686,35 @@ class Apps {
 				dbesc($app['guid']),
 				intval($uid)
 			);
-			if($x) {
-				if(! intval($x[0]['app_deleted'])) {
-					$x[0]['app_deleted'] = 1;
-					if(self::can_delete($uid,$app)) {
-						q("delete from app where app_id = '%s' and app_channel = %d",
-							dbesc($app['guid']),
-							intval($uid)
-						);
-						q("delete from term where otype = %d and oid = %d",
-							intval(TERM_OBJ_APP),
-							intval($x[0]['id'])
-						);
-						/**
-						 * @hooks app_destroy
-						 *  Called after app entry got removed from database
-						 *  and provide app array from database.
-						 */
-						call_hooks('app_destroy', $x[0]);
-					}
-					else {
-						q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
-							dbesc($app['guid']),
-							intval($uid)
-						);
-					}
-					if(! intval($x[0]['app_system'])) {
-						Libsync::build_sync_packet($uid,array('app' => $x));
-					}
-				}
-				else {
-					self::app_undestroy($uid,$app);
-				}
+
+			if($x && intval($x[0]['app_deleted'])) {
+				self::app_undestroy($uid, $app);
+				return;
+			}
+
+			if(self::can_delete($uid,$app)) {
+				q("delete from app where app_id = '%s' and app_channel = %d",
+					dbesc($app['guid']),
+					intval($uid)
+				);
+
+				q("delete from term where otype = %d and oid = %d",
+					intval(TERM_OBJ_APP),
+					intval($x[0]['id'])
+				);
+
+				/**
+				 * @hooks app_destroy
+				 *  Called after app entry got removed from database
+				 *  and provide app array from database.
+				 */
+				call_hooks('app_destroy', $x[0]);
+			}
+			else {
+				q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
+					dbesc($app['guid']),
+					intval($uid)
+				);
 			}
 		}
 	}
@@ -729,13 +731,11 @@ class Apps {
 				dbesc($app['guid']),
 				intval($uid)
 			);
-			if($x) {
-				if($x[0]['app_system']) {
-					q("update app set app_deleted = 0 where app_id = '%s' and app_channel = %d",
-						dbesc($app['guid']),
-						intval($uid)
-					);
-				}
+			if($x && intval($x[0]['app_deleted']) && $x[0]['app_system']) {
+				q("update app set app_deleted = 0 where app_id = '%s' and app_channel = %d",
+					dbesc($app['guid']),
+					intval($uid)
+				);
 			}
 		}
 	}
@@ -1194,9 +1194,9 @@ class Apps {
 			$y = explode(',',$arr['categories']);
 			if($y) {
 				foreach($y as $t) {
-					$t = trim($t);
+					$t = escape_tags(trim($t));
 					if($t) {
-						store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
+						store_item_tag($darray['app_channel'], $x[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, $t, z_root() . '/apps/?f=&cat=' . $t);
 					}
 				}
 			}
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 632848290..d02dab739 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -127,7 +127,7 @@ class Enotify {
 		logger('notification: mail');
 		$subject = 	sprintf( t('[$Projectname:Notify] New direct message received at %s'), $sitename);
 
-		$preamble = sprintf( t('%1$s sent you a new direct message at %2$s.'), $sender['xchan_name'], $sitename);
+		$preamble = sprintf( t('%1$s sent you a new direct message at %2$s'), $sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('%1$s sent you %2$s.'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a direct message') . '[/zrl]');
 		$sitelink = t('Please visit %s to view and/or reply to your direct messages.');
 		$tsitelink = sprintf( $sitelink, $siteurl . '/hq/' . gen_link_id($params['item']['mid']));
@@ -238,7 +238,7 @@ class Enotify {
 			$subject = sprintf( t('[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
 		else
 			$subject = sprintf( t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
-		$preamble = sprintf( t('%1$s commented on an item/conversation you have been following.'), $sender['xchan_name']);
+		$preamble = sprintf( t('%1$s commented on an item/conversation you have been following'), $sender['xchan_name']);
 		$epreamble = $dest_str;
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
@@ -318,7 +318,7 @@ class Enotify {
 		// differents subjects for messages on the same thread.
 
 		$subject = sprintf( t('[$Projectname:Notify] Like received to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
-		$preamble = sprintf( t('%1$s liked an item/conversation you created.'), $sender['xchan_name']);
+		$preamble = sprintf( t('%1$s liked an item/conversation you created'), $sender['xchan_name']);
 		$epreamble = $dest_str;
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index 67603a0e3..c4f1b20ea 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -141,7 +141,6 @@ class Libsync {
 		logger('Packet: ' . print_r($info, true), LOGGER_DATA, LOG_DEBUG);
 
 		$total = count($synchubs);
-
 		foreach ($synchubs as $hub) {
 			$hash = random_string();
 			$n    = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'hz', $hub['hubloc_sitekey'], $hub['site_crypto']);
@@ -186,7 +185,6 @@ class Libsync {
 		require_once('include/import.php');
 
 		$result = [];
-
 		$keychange = ((array_key_exists('keychange', $arr)) ? true : false);
 
 		foreach ($deliveries as $d) {
@@ -246,6 +244,10 @@ class Libsync {
 			if (array_key_exists('app', $arr) && $arr['app'])
 				sync_apps($channel, $arr['app']);
 
+			if (array_key_exists('sysapp',$arr) && $arr['sysapp']) {
+				sync_sysapps($channel, $arr['sysapp']);
+			}
+
 			if (array_key_exists('addressbook', $arr) && $arr['addressbook'])
 				sync_addressbook($channel, $arr['addressbook']);
 
@@ -255,8 +257,8 @@ class Libsync {
 			if (array_key_exists('chatroom', $arr) && $arr['chatroom'])
 				sync_chatrooms($channel, $arr['chatroom']);
 
-			if (array_key_exists('mail', $arr) && $arr['mail'])
-				sync_mail($channel, $arr['mail']);
+			//if (array_key_exists('mail', $arr) && $arr['mail'])
+			//	sync_mail($channel, $arr['mail']);
 
 			if (array_key_exists('event', $arr) && $arr['event'])
 				sync_events($channel, $arr['event']);
@@ -270,8 +272,8 @@ class Libsync {
 			// deprecated, maintaining for a few months for upward compatibility
 			// this should sync webpages, but the logic is a bit subtle
 
-			if (array_key_exists('item_id', $arr) && $arr['item_id'])
-				sync_items($channel, $arr['item_id']);
+			//if (array_key_exists('item_id', $arr) && $arr['item_id'])
+			//	sync_items($channel, $arr['item_id']);
 
 			if (array_key_exists('menu', $arr) && $arr['menu'])
 				sync_menus($channel, $arr['menu']);
@@ -704,6 +706,15 @@ class Libsync {
 
 		$ret = [];
 
+		// If a sender reports that the channel has been deleted, delete its hubloc
+		if (isset($arr['deleted_locally']) && intval($arr['deleted_locally'])) {
+			q("UPDATE hubloc SET hubloc_deleted = 1, hubloc_updated = '%s' WHERE hubloc_hash = '%s' AND hubloc_url = '%s'",
+				dbesc(datetime_convert()),
+				dbesc($sender['hash']),
+				dbesc($sender['site']['url'])
+			);
+		}
+
 		if ($arr['locations']) {
 
 			if ($absolute)
@@ -861,6 +872,7 @@ class Libsync {
 						$what    .= 'delete_hub ';
 						$changed = true;
 					}
+
 					continue;
 				}
 
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index e03f0173d..31b8f04de 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -266,7 +266,7 @@ class Libzot {
 					dbesc($them['xchan_addr'])
 				);
 			}
-			if (!$r) {
+			if (!$r && array_key_exists('xchan_hash', $them) && $them['xchan_hash']) {
 				$r = q("select hubloc_id_url, hubloc_primary from hubloc where hubloc_hash = '%s' order by hubloc_id desc",
 					dbesc($them['xchan_hash'])
 				);
@@ -275,8 +275,8 @@ class Libzot {
 			if ($r) {
 				foreach ($r as $rr) {
 					if (intval($rr['hubloc_primary'])) {
-						$url    = $rr['hubloc_id_url'];
-						$record = $rr;
+						$url = $rr['hubloc_id_url'];
+						break;
 					}
 				}
 				if (!$url) {
@@ -284,13 +284,17 @@ class Libzot {
 				}
 			}
 		}
+
 		if (!$url) {
 			logger('zot_refresh: no url');
 			return false;
 		}
 
+		$m = parse_url($url);
+		$site_url = unparse_url([ 'scheme' => $m['scheme'], 'host' => $m['host'] ]);
+
 		$s = q("select site_dead from site where site_url = '%s' limit 1",
-			dbesc($url)
+			dbesc($site_url)
 		);
 
 		if ($s && intval($s[0]['site_dead']) && (!$force)) {
@@ -299,25 +303,25 @@ class Libzot {
 		}
 
 		$record = Zotfinger::exec($url, $channel);
-		// Check the HTTP signature
 
+		// Check the HTTP signature
 		$hsig = $record['signature'];
-		if ($hsig && $hsig['signer'] === $url && $hsig['header_valid'] === true && $hsig['content_valid'] === true)
+		if ($hsig && $hsig['signer'] === $url && $hsig['header_valid'] === true && $hsig['content_valid'] === true) {
 			$hsig_valid = true;
+		}
 
 		if (!$hsig_valid) {
 			logger('http signature not valid: ' . print_r($hsig, true));
 			return false;
 		}
 
-
 		logger('zot-info: ' . print_r($record, true), LOGGER_DATA, LOG_DEBUG);
 
 		$x = self::import_xchan($record['data'], (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
 
-
-		if (!$x['success'])
+		if (!$x['success']) {
 			return false;
+		}
 
 		if ($channel && $record['data']['permissions']) {
 			$permissions = explode(',', $record['data']['permissions']);
@@ -357,8 +361,9 @@ class Libzot {
 				// we have as we may have updated the year after sending a notification; and resetting
 				// to the one we just received would cause us to create duplicated events.
 
-				if (substr($r[0]['abook_dob'], 5) == substr($next_birthday, 5))
+				if (substr($r[0]['abook_dob'], 5) == substr($next_birthday, 5)) {
 					$next_birthday = $r[0]['abook_dob'];
+				}
 
 				$y = q("update abook set abook_dob = '%s'
 					where abook_xchan = '%s' and abook_channel = %d
@@ -368,17 +373,19 @@ class Libzot {
 					intval($channel['channel_id'])
 				);
 
-				if (!$y)
+				if (!$y) {
 					logger('abook update failed');
+				}
 				else {
 					// if we were just granted read stream permission and didn't have it before, try to pull in some posts
-					if ((!$old_read_stream_perm) && (intval($permissions['view_stream'])))
+					if (!$old_read_stream_perm && intval($permissions['view_stream'])) {
 						Master::Summon(['Onepoll', $r[0]['abook_id']]);
+					}
 				}
 			}
 			else {
 
-				$p        = Permissions::connect_perms($channel['channel_id']);
+				$p = Permissions::connect_perms($channel['channel_id']);
 				$my_perms = $p['perms'];
 
 				$automatic = $p['automatic'];
@@ -419,8 +426,10 @@ class Libzot {
 					);
 
 					if ($new_connection) {
-						if (!Permissions::PermsCompare($new_perms, $previous_perms))
+						if (!Permissions::PermsCompare($new_perms, $previous_perms)) {
 							Master::Summon(['Notifier', 'permission_create', $new_connection[0]['abook_id']]);
+						}
+
 						Enotify::submit(
 							[
 								'type'       => NOTIFY_INTRO,
@@ -432,40 +441,47 @@ class Libzot {
 
 						if (intval($permissions['view_stream'])) {
 							if (intval(get_pconfig($channel['channel_id'], 'perm_limits', 'send_stream') & PERMS_PENDING)
-								|| (!intval($new_connection[0]['abook_pending'])))
+								|| (!intval($new_connection[0]['abook_pending']))) {
 								Master::Summon(['Onepoll', $new_connection[0]['abook_id']]);
+							}
 						}
 
-
 						// If there is a default group for this channel, add this connection to it
-						// for pending connections this will happens at acceptance time.
+						// for pending connections this will happen at acceptance time.
 
 						if (!intval($new_connection[0]['abook_pending'])) {
 							$default_group = $channel['channel_default_group'];
+
 							if ($default_group) {
 								$g = Group::rec_byhash($channel['channel_id'], $default_group);
-								if ($g)
+
+								if ($g) {
 									Group::member_add($channel['channel_id'], '', $x['hash'], $g['id']);
+								}
 							}
 						}
 
 						unset($new_connection[0]['abook_id']);
 						unset($new_connection[0]['abook_account']);
 						unset($new_connection[0]['abook_channel']);
+
 						$abconfig = load_abconfig($channel['channel_id'], $new_connection['abook_xchan']);
-						if ($abconfig)
+
+						if ($abconfig) {
 							$new_connection['abconfig'] = $abconfig;
+						}
 
 						Libsync::build_sync_packet($channel['channel_id'], ['abook' => $new_connection]);
+
 					}
 				}
-
 			}
 			return true;
 		}
 		return false;
 	}
 
+
 	/**
 	 * @brief Look up if channel is known and previously verified.
 	 *
@@ -479,6 +495,7 @@ class Libzot {
 	 *  * \e string \b id_sig => id signed with conversant's private key
 	 *  * \e string \b location => URL of the origination hub of this communication
 	 *  * \e string \b location_sig => URL signed with conversant's private key
+	 *  * \e string \b site_id => URL signed with conversant's private key
 	 * @param boolean $multiple (optional) default false
 	 *
 	 * @return array|null
@@ -488,7 +505,7 @@ class Libzot {
 
 	static function gethub($arr, $multiple = false) {
 
-		if ($arr['id'] && $arr['id_sig'] && $arr['location'] && $arr['location_sig']) {
+		if ($arr['id'] && $arr['id_sig'] && $arr['location'] && $arr['location_sig'] && $arr['site_id']) {
 
 			if (!check_siteallowed($arr['location'])) {
 				logger('blacklisted site: ' . $arr['location']);
@@ -512,9 +529,9 @@ class Libzot {
 				logger('Found', LOGGER_DEBUG);
 				return (($multiple) ? $r : $r[0]);
 			}
+			logger('Not found: ' . print_r($arr, true), LOGGER_DEBUG);
 		}
-		logger('Not found: ' . print_r($arr, true), LOGGER_DEBUG);
-
+		logger('Incomplete array: ' . print_r($arr, true), LOGGER_DEBUG);
 		return false;
 	}
 
@@ -616,7 +633,6 @@ class Libzot {
 	 */
 
 	static function import_xchan($arr, $ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
-
 		/**
 		 * @hooks import_xchan
 		 *   Called when processing the result of zot_finger() to store the result
@@ -666,6 +682,7 @@ class Libzot {
 			$arr['connect_url'] = '';
 
 		if ($r) {
+
 			if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $arr['photo']['updated'] > $r[0]['xchan_photo_date'])
 				$import_photos = true;
 
@@ -1339,7 +1356,7 @@ class Libzot {
 
 	static function find_parent($env, $act) {
 		if ($act) {
-			if (in_array($act->type, ['Like', 'Dislike'])) {
+			if (in_array($act->type, ['Like', 'Dislike']) && is_array($act->obj)) {
 				return $act->obj['id'];
 			}
 			if ($act->parent_id) {
@@ -1469,10 +1486,11 @@ class Libzot {
 	 * @param boolean $relay
 	 * @param boolean $public (optional) default false
 	 * @param boolean $request (optional) default false
+	 * @param boolean $force (optional) default false - should only be set for manual fetch
 	 * @return array
 	 */
 
-	static function process_delivery($sender, $act, $arr, $deliveries, $relay, $public = false, $request = false) {
+	static function process_delivery($sender, $act, $arr, $deliveries, $relay, $public = false, $request = false, $force = false) {
 
 		$result = [];
 
@@ -1574,7 +1592,7 @@ class Libzot {
 
 			if ((!$tag_delivery) && (!$local_public)) {
 				$allowed = (perm_is_allowed($channel['channel_id'], $sender, $perm));
-				if (!$allowed) {
+				if ((!$allowed) && $perm === 'post_comments') {
 					$parent = q("select * from item where mid = '%s' and uid = %d limit 1",
 						dbesc($arr['parent_mid']),
 						intval($channel['channel_id'])
@@ -1600,7 +1618,7 @@ class Libzot {
 					// doesn't exist.
 
 					if ($perm === 'send_stream') {
-						if (get_pconfig($channel['channel_id'], 'system', 'hyperdrive', false) || $arr['verb'] === ACTIVITY_SHARE) {
+						if ($force || get_pconfig($channel['channel_id'], 'system', 'hyperdrive', false) || $arr['verb'] === ACTIVITY_SHARE) {
 							$allowed = true;
 						}
 					}
@@ -1875,7 +1893,7 @@ class Libzot {
 		return $result;
 	}
 
-	static public function fetch_conversation($channel, $mid) {
+	static public function fetch_conversation($channel, $mid, $force = false) {
 
 		// Use Zotfinger to create a signed request
 
@@ -1979,7 +1997,7 @@ class Libzot {
 			logger('FOF Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
 			logger('FOF Activity recipient: ' . $channel['channel_hash'], LOGGER_DATA, LOG_DEBUG);
 
-			$result = self::process_delivery($arr['owner_xchan'], $AS, $arr, [$channel['channel_hash']], false, false, true);
+			$result = self::process_delivery($arr['owner_xchan'], $AS, $arr, [$channel['channel_hash']], false, false, true, $force);
 			if ($result) {
 				$ret = array_merge($ret, $result);
 			}
@@ -2880,8 +2898,9 @@ class Libzot {
 		if ($deleted)
 			$ret['deleted'] = $deleted;
 
-		if (intval($e['channel_removed']))
+		if (intval($e['channel_removed'])) {
 			$ret['deleted_locally'] = true;
+		}
 
 		// premium or other channel desiring some contact with potential followers before connecting.
 		// This is a template - %s will be replaced with the follow_url we discover for the return channel.
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
index 9e6a3ac85..bf4ac8e87 100644
--- a/Zotlabs/Lib/NativeWiki.php
+++ b/Zotlabs/Lib/NativeWiki.php
@@ -12,8 +12,8 @@ class NativeWiki {
 	public static function listwikis($channel, $observer_hash) {
 
 		$sql_extra = item_permissions_sql($channel['channel_id'], $observer_hash);
-		$wikis = q("SELECT * FROM item 
-			WHERE resource_type = '%s' AND mid = parent_mid AND uid = %d AND item_deleted = 0 $sql_extra", 
+		$wikis = q("SELECT * FROM item
+			WHERE resource_type = '%s' AND mid = parent_mid AND uid = %d AND item_deleted = 0 $sql_extra",
 			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
 			intval($channel['channel_id'])
 		);
@@ -49,7 +49,7 @@ class NativeWiki {
 		$mid = z_root() . '/item/' . $uuid;
 
 		$arr = array();	// Initialize the array of parameters for the post
-		$item_hidden = ((intval($wiki['postVisible']) === 0) ? 1 : 0); 
+		$item_hidden = ((intval($wiki['postVisible']) === 0) ? 1 : 0);
 		$wiki_url = z_root() . '/wiki/' . $channel['channel_address'] . '/' . $wiki['urlName'];
 		$arr['aid'] = $channel['channel_account_id'];
 		$arr['uuid'] = $uuid;
@@ -61,8 +61,8 @@ class NativeWiki {
 		$arr['resource_id'] = $resource_id;
 		$arr['owner_xchan'] = $channel['channel_hash'];
 		$arr['author_xchan'] = $observer_hash;
-		$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
-		$arr['llink'] = $arr['plink'];
+		$arr['plink'] = $mid;
+		$arr['llink'] = z_root() . '/display/' . gen_link_id($mid);
 		$arr['title'] = $wiki['htmlName'];  // name of new wiki;
 		$arr['allow_cid'] = $ac['allow_cid'];
 		$arr['allow_gid'] = $ac['allow_gid'];
@@ -133,13 +133,13 @@ class NativeWiki {
 		// update acl for any existing wiki pages
 
 		q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d where resource_type = 'nwikipage' and resource_id = '%s'",
-			dbesc($item['allow_cid']), 
-			dbesc($item['allow_gid']), 
-			dbesc($item['deny_cid']), 
-			dbesc($item['deny_gid']), 
-			dbesc($item['item_private']), 
+			dbesc($item['allow_cid']),
+			dbesc($item['allow_gid']),
+			dbesc($item['deny_cid']),
+			dbesc($item['deny_gid']),
+			dbesc($item['item_private']),
 			dbesc($arr['resource_id'])
-		); 
+		);
 
 
 		if($update['item_id']) {
@@ -211,12 +211,12 @@ class NativeWiki {
 
 
 	public static function get_wiki($channel_id, $observer_hash, $resource_id) {
-		
+
 		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
 
-		$item = q("SELECT * FROM item WHERE uid = %d AND resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0 
+		$item = q("SELECT * FROM item WHERE uid = %d AND resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0
 			$sql_extra ORDER BY id LIMIT 1",
-			intval($channel_id), 
+			intval($channel_id),
 			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
 			dbesc($resource_id)
 		);
@@ -224,7 +224,7 @@ class NativeWiki {
 			return [ 'wiki' => null ];
 		}
 		else {
-		
+
 			$w = $item[0];	// wiki item table record
 			// Get wiki metadata
 			$rawName  = get_iconfig($w, 'wiki', 'rawName');
@@ -246,20 +246,20 @@ class NativeWiki {
 
 	public static function exists_by_name($uid, $urlName) {
 
-		$sql_extra = item_permissions_sql($uid);		
+		$sql_extra = item_permissions_sql($uid);
 
-		$item = q("SELECT item.id, resource_id FROM item left join iconfig on iconfig.iid = item.id 
-			WHERE resource_type = '%s' AND iconfig.v = '%s' AND uid = %d 
-			AND item_deleted = 0 $sql_extra limit 1", 
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE), 
-			//dbesc(urldecode($urlName)), 
+		$item = q("SELECT item.id, resource_id FROM item left join iconfig on iconfig.iid = item.id
+			WHERE resource_type = '%s' AND iconfig.v = '%s' AND uid = %d
+			AND item_deleted = 0 $sql_extra limit 1",
+			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
+			//dbesc(urldecode($urlName)),
 			dbesc(self::name_decode($urlName)),
 			intval($uid)
 		);
 
 		if($item) {
 			return array('id' => $item[0]['id'], 'resource_id' => $item[0]['resource_id']);
-		} 
+		}
 		else {
 			return array('id' => null, 'resource_id' => null);
 		}
@@ -277,7 +277,7 @@ class NativeWiki {
 
 		$r = q("SELECT * FROM item WHERE uid = %d and resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1",
 			intval($owner_id),
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE), 
+			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
 			dbesc($resource_id)
 		);
 
@@ -285,8 +285,6 @@ class NativeWiki {
 			return array('read' => false, 'write' => false, 'success' => true);
 		}
 		else {
-			// TODO: Create a new permission setting for wiki analogous to webpages. Until
-			// then, use webpage permissions
 			$write = perm_is_allowed($owner_id, $observer_hash,'write_wiki');
 			return array('read' => true, 'write' => $write, 'success' => true);
 		}
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 3c61ea800..1e944f7ac 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -2,14 +2,15 @@
 
 namespace Zotlabs\Lib;
 
-use \Zotlabs\Lib as Zlib;
+use App;
+use Zotlabs\Access\PermissionLimits;
 
 class NativeWikiPage {
 
-	static public function page_list($channel_id,$observer_hash, $resource_id) {
+	static public function page_list($channel_id, $observer_hash, $resource_id) {
 
 		// TODO: Create item table records for pages so that metadata like title can be applied
-		$w = Zlib\NativeWiki::get_wiki($channel_id,$observer_hash,$resource_id);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 
 		$pages[] = [
 			'resource_id' => '',
@@ -18,134 +19,149 @@ class NativeWikiPage {
 			'link_id'     => 'id_wiki_home_0'
 		];
 
-		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
+		$sql_extra = item_permissions_sql($channel_id, $observer_hash);
 
-		$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0 
+		$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0
 			$sql_extra order by title asc",
 			dbesc($resource_id),
 			intval($channel_id)
 		);
-		if($r) {
+		if ($r) {
 			$x = [];
 			$y = [];
 
-			foreach($r as $rv) {
-				if(! in_array($rv['mid'],$x)) {
+			foreach ($r as $rv) {
+				if (!in_array($rv['mid'], $x)) {
 					$y[] = $rv;
 					$x[] = $rv['mid'];
 				}
 			}
 
-			$items = fetch_post_tags($y,true);
+			$items = fetch_post_tags($y, true);
 
-			foreach($items as $page_item) {
-				$title = get_iconfig($page_item['id'],'nwikipage','pagetitle',t('(No Title)'));
-				if(urldecode($title) !== 'Home') {
+			foreach ($items as $page_item) {
+				$title = get_iconfig($page_item['id'], 'nwikipage', 'pagetitle', t('(No Title)'));
+				if (urldecode($title) !== 'Home') {
 					$pages[] = [
 						'resource_id' => $resource_id,
 						'title'       => escape_tags($title),
 						//'url'         => str_replace('%2F','/',urlencode(str_replace('%2F','/',urlencode($title)))),
-						'url'		=> Zlib\NativeWiki::name_encode($title),
+						'url'         => NativeWiki::name_encode($title),
 						'link_id'     => 'id_' . substr($resource_id, 0, 10) . '_' . $page_item['id']
 					];
 				}
 			}
 		}
 
-		return array('pages' => $pages, 'wiki' => $w);
+		return ['pages' => $pages, 'wiki' => $w];
 	}
 
 
-	static public function create_page($channel_id, $observer_hash, $name, $resource_id, $mimetype = 'text/bbcode') {
+	static public function create_page($channel, $observer_hash, $name, $resource_id, $mimetype = 'text/bbcode') {
 
 		logger('mimetype: ' . $mimetype);
 
-		if(! in_array($mimetype,[ 'text/markdown','text/bbcode','text/plain','text/html' ]))
+		if (!in_array($mimetype, ['text/markdown', 'text/bbcode', 'text/plain', 'text/html']))
 			$mimetype = 'text/markdown';
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		$w = NativeWiki::get_wiki($channel['channel_id'], $observer_hash, $resource_id);
 
-		if (! $w['wiki']) {
-			return array('content' => null, 'message' => 'Error reading wiki', 'success' => false);
+		if (!$w['wiki']) {
+			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
 		}
 
 		// backslashes won't work well in the javascript functions
-		$name = str_replace('\\','',$name);
-
-		// create an empty activity
+		$name = str_replace('\\', '', $name);
 
-		$arr = [];
-		$arr['uid']           = $channel_id;
-		$arr['author_xchan']  = $observer_hash;
-		$arr['mimetype']      = $mimetype;
-		$arr['title']         = $name;
-		$arr['resource_type'] = 'nwikipage';
-		$arr['resource_id']   = $resource_id;
-		$arr['allow_cid']     = $w['wiki']['allow_cid'];
-		$arr['allow_gid']     = $w['wiki']['allow_gid'];
-		$arr['deny_cid']      = $w['wiki']['deny_cid'];
-		$arr['deny_gid']      = $w['wiki']['deny_gid'];
+		$uuid = new_uuid();
+		$mid  = z_root() . '/item/' . $uuid;
 
-		$arr['public_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel_id,'view_wiki'),true);
+		// create an empty activity
+		$arr                    = [];
+		$arr['aid']             = $channel['channel_account_id'];
+		$arr['uid']             = $channel['channel_id'];
+		$arr['mid']             = $mid;
+		$arr['parent_mid']      = $w['wiki']['mid'];
+		$arr['parent']          = $w['wiki']['parent'];
+		$arr['uuid']            = $uuid;
+		$arr['item_hidden']     = $w['wiki']['item_hidden'];
+		$arr['plink']           = $mid;
+		$arr['llink']           = z_root() . '/display/' . gen_link_id($mid);
+		$arr['author_xchan']    = $observer_hash;
+		$arr['mimetype']        = $mimetype;
+		$arr['title']           = $name;
+		$arr['resource_type']   = 'nwikipage';
+		$arr['resource_id']     = $resource_id;
+		$arr['allow_cid']       = $w['wiki']['allow_cid'];
+		$arr['allow_gid']       = $w['wiki']['allow_gid'];
+		$arr['deny_cid']        = $w['wiki']['deny_cid'];
+		$arr['deny_gid']        = $w['wiki']['deny_gid'];
+		$arr['item_private']    = $w['wiki']['item_private'];
+		$arr['item_wall']       = 1;
+		$arr['item_origin']     = 1;
+		$arr['item_thread_top'] = 1;
+		$arr['verb']            = ACTIVITY_CREATE;
+		$arr['obj_type']        = 'Document';
+		// TODO: add an object?
+		$arr['public_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'], 'view_wiki'), true);
 
 		// We may wish to change this some day.
 		$arr['item_unpublished'] = 1;
 
-		set_iconfig($arr,'nwikipage','pagetitle',(($name) ? $name : t('(No Title)')),true);
-
-		$p = post_activity_item($arr, false, false);
+		set_iconfig($arr, 'nwikipage', 'pagetitle', (($name) ? $name : t('(No Title)')), true);
+		$p = item_store($arr, false, false);
 
-		if($p['item_id']) {
-			$page = [ 
+		if ($p['item_id']) {
+			$page = [
 				'rawName'  => $name,
 				'htmlName' => escape_tags($name),
-				//'urlName'  => urlencode($name), 
-				'urlName' => Zlib\NativeWiki::name_encode($name)
+				//'urlName'  => urlencode($name),
+				'urlName'  => NativeWiki::name_encode($name)
 
 			];
 
-			return array('page' => $page, 'item_id' => $p['item_id'], 'item' => $p['activity'], 'wiki' => $w, 'message' => '', 'success' => true);
+			return ['page' => $page, 'item_id' => $p['item_id'], 'item' => $p['activity'], 'wiki' => $w, 'message' => '', 'success' => true];
 		}
-		return [ 'success' => false, 'message' => t('Wiki page create failed.') ];
+		return ['success' => false, 'message' => t('Wiki page create failed.')];
 	}
 
 
 	static public function rename_page($arr) {
 
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
-		$pageNewName   = ((array_key_exists('pageNewName',$arr))   ? $arr['pageNewName']   : '');
-		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']   : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
+		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
+		$pageNewName   = ((array_key_exists('pageNewName', $arr)) ? $arr['pageNewName'] : '');
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if(! $w['wiki']) {
-			return array('message' => t('Wiki not found.'), 'success' => false);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		if (!$w['wiki']) {
+			return ['message' => t('Wiki not found.'), 'success' => false];
 		}
 
 
-		$ic = q("select * from iconfig left join item on iconfig.iid = item.id 
+		$ic = q("select * from iconfig left join item on iconfig.iid = item.id
 			where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
 			intval($channel_id),
 			dbesc($pageNewName)
 		);
 
-		if($ic) {
-			return [ 'success' => false, 'message' => t('Destination name already exists') ];
+		if ($ic) {
+			return ['success' => false, 'message' => t('Destination name already exists')];
 		}
 
 
 		$ids = [];
 
-		$ic = q("select *, item.id as item_id from iconfig left join item on iconfig.iid = item.id 
+		$ic = q("select *, item.id as item_id from iconfig left join item on iconfig.iid = item.id
 			where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
 			intval($channel_id),
 			dbesc($pageUrlName)
 		);
 
-		if($ic) {
-			foreach($ic as $c) {
-				set_iconfig($c['item_id'],'nwikipage','pagetitle',$pageNewName);
+		if ($ic) {
+			foreach ($ic as $c) {
+				set_iconfig($c['item_id'], 'nwikipage', 'pagetitle', $pageNewName);
 				$ids[] = $c['item_id'];
 			}
 
@@ -154,105 +170,101 @@ class NativeWikiPage {
 				dbesc($pageNewName)
 			);
 
-			$page = [ 
-				'rawName'  => $pageNewName, 
-				'htmlName' => escape_tags($pageNewName), 
+			$page = [
+				'rawName'  => $pageNewName,
+				'htmlName' => escape_tags($pageNewName),
 				//'urlName'  => urlencode(escape_tags($pageNewName))
-				'urlName' => Zlib\NativeWiki::name_encode($pageNewName)
+				'urlName'  => NativeWiki::name_encode($pageNewName)
 			];
 
-			return [ 'success' => true, 'page' => $page ];
+			return ['success' => true, 'page' => $page];
 		}
 
-		return [ 'success' => false, 'message' => t('Page not found') ];
-	
+		return ['success' => false, 'message' => t('Page not found')];
+
 	}
 
 
 	static public function get_page_content($arr) {
 
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']        : '');
-		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']        : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash']      : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? intval($arr['channel_id']) : 0);
-		$revision      = ((array_key_exists('revision',$arr))      ? intval($arr['revision'])   : (-1));
-
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? intval($arr['channel_id']) : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (! $w['wiki']) {
-			return array('content' => null, 'message' => 'Error reading wiki', 'success' => false);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		if (!$w['wiki']) {
+			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
 		}
 
 		$item = self::load_page($arr);
 
-		if($item) {
+		if ($item) {
 			$content = $item['body'];
 
-			return [ 
+			return [
 				'content'      => $content,
 				'mimeType'     => $w['mimeType'],
-				'pageMimeType' => $item['mimetype'], 
-				'message'      => '', 
+				'pageMimeType' => $item['mimetype'],
+				'message'      => '',
 				'success'      => true
 			];
 		}
-	
-		return array('content' => null, 'message' => t('Error reading page content'), 'success' => false);
+
+		return ['content' => null, 'message' => t('Error reading page content'), 'success' => false];
 
 	}
 
 
 	static public function page_history($arr) {
 
-		$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
-		$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 		if (!$w['wiki']) {
-			return array('history' => null, 'message' => 'Error reading wiki', 'success' => false);
+			return ['history' => null, 'message' => 'Error reading wiki', 'success' => false];
 		}
 
 		$items = self::load_page_history($arr);
 
 		$history = [];
 
-		if($items) {
+		if ($items) {
 			$processed = 0;
-			foreach($items as $item) {
-				if($processed > 1000)
+			foreach ($items as $item) {
+				if ($processed > 1000)
 					break;
-				$processed ++;
-				$history[] = [ 
+				$processed++;
+				$history[] = [
 					'revision' => $item['revision'],
-					'date' => datetime_convert('UTC',date_default_timezone_get(),$item['edited']),
-					'name' => $item['author']['xchan_name'],
-					'title' => get_iconfig($item,'nwikipage','commit_msg') 
+					'date'     => datetime_convert('UTC', date_default_timezone_get(), $item['edited']),
+					'name'     => $item['author']['xchan_name'],
+					'title'    => get_iconfig($item, 'nwikipage', 'commit_msg')
 				];
 
 			}
 
-			return [ 'success' => true, 'history' => $history ];
+			return ['success' => true, 'history' => $history];
 		}
 
-		return [ 'success' => false ];
+		return ['success' => false];
 
 	}
-	
+
 
 	static public function load_page($arr) {
 
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']     : '');
-		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']     : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash']   : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']      : 0);
-		$revision      = ((array_key_exists('revision',$arr))      ? $arr['revision']        : (-1));
+		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
+		$revision      = ((array_key_exists('revision', $arr)) ? $arr['revision'] : (-1));
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 
-		if (! $w['wiki']) {
-			return array('content' => null, 'message' => 'Error reading wiki', 'success' => false);
+		if (!$w['wiki']) {
+			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
 		}
 
 		$ids = '';
@@ -262,32 +274,32 @@ class NativeWikiPage {
 			dbesc($pageUrlName)
 		);
 
-		if($ic) {
-			foreach($ic as $c) {
-				if($ids)
+		if ($ic) {
+			foreach ($ic as $c) {
+				if ($ids)
 					$ids .= ',';
 				$ids .= intval($c['iid']);
 			}
 		}
 
-		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
+		$sql_extra = item_permissions_sql($channel_id, $observer_hash);
 
-		if($revision == (-1))
+		if ($revision == (-1))
 			$sql_extra .= " order by revision desc ";
-		elseif($revision)
+		elseif ($revision)
 			$sql_extra .= " and revision = " . intval($revision) . " ";
 
 		$r = null;
 
 
-		if($ids) {
+		if ($ids) {
 			$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) $sql_extra limit 1",
 				dbesc($resource_id),
 				intval($channel_id)
 			);
 
-			if($r) {
-				$items = fetch_post_tags($r,true);
+			if ($r) {
+				$items = fetch_post_tags($r, true);
 				return $items[0];
 			}
 		}
@@ -298,15 +310,14 @@ class NativeWikiPage {
 
 	static public function load_page_history($arr) {
 
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']     : '');
-		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']     : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash']   : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']      : 0);
-		$revision      = ((array_key_exists('revision',$arr))      ? $arr['revision']        : (-1));
+		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (! $w['wiki']) {
-			return array('content' => null, 'message' => 'Error reading wiki', 'success' => false);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		if (!$w['wiki']) {
+			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
 		}
 
 		$ids = '';
@@ -315,28 +326,28 @@ class NativeWikiPage {
 			intval($channel_id),
 			dbesc($pageUrlName)
 		);
-	
-		if($ic) {
-			foreach($ic as $c) {
-				if($ids)
+
+		if ($ic) {
+			foreach ($ic as $c) {
+				if ($ids)
 					$ids .= ',';
 				$ids .= intval($c['iid']);
 			}
 		}
 
-		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
+		$sql_extra = item_permissions_sql($channel_id, $observer_hash);
 
 		$sql_extra .= " order by revision desc ";
 
 		$r = null;
-		if($ids) {
+		if ($ids) {
 			$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) and item_deleted = 0 $sql_extra",
 				dbesc($resource_id),
 				intval($channel_id)
 			);
-			if($r) {
+			if ($r) {
 				xchan_query($r);
-				$items = fetch_post_tags($r,true);
+				$items = fetch_post_tags($r, true);
 				return $items;
 			}
 		}
@@ -346,31 +357,30 @@ class NativeWikiPage {
 
 
 	static public function save_page($arr) {
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
-		$content       = ((array_key_exists('content',$arr))       ? $arr['content']       : '');
-		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']   : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
-		$revision      = ((array_key_exists('revision',$arr))      ? $arr['revision']      : 0);
+		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
+		$content       = ((array_key_exists('content', $arr)) ? $arr['content'] : '');
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 
 		if (!$w['wiki']) {
-			return array('message' => t('Error reading wiki'), 'success' => false);
+			return ['message' => t('Error reading wiki'), 'success' => false];
 		}
 
-	
-		// fetch the most recently saved revision. 
+
+		// fetch the most recently saved revision.
 
 		$item = self::load_page($arr);
 
-		if(! $item) {
-			return array('message' => t('Page not found'), 'success' => false);
+		if (!$item) {
+			return ['message' => t('Page not found'), 'success' => false];
 		}
 
 		$mimetype = $item['mimetype'];
 
-		// change just the fields we need to change to create a revision; 
+		// change just the fields we need to change to create a revision;
 
 		unset($item['id']);
 		unset($item['author']);
@@ -381,8 +391,8 @@ class NativeWikiPage {
 		$item['edited']       = datetime_convert();
 		$item['mimetype']     = $mimetype;
 
-		if($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
+		if ($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) {
+			for ($x = 0; $x < count($item['iconfig']); $x++) {
 				unset($item['iconfig'][$x]['id']);
 				unset($item['iconfig'][$x]['iid']);
 			}
@@ -390,168 +400,164 @@ class NativeWikiPage {
 
 		$ret = item_store($item, false, false);
 
-		if($ret['item_id'])
-			return array('message' => '', 'item_id' => $ret['item_id'], 'filename' => $pageUrlName, 'success' => true);
+		if ($ret['item_id'])
+			return ['message' => '', 'item_id' => $ret['item_id'], 'filename' => $pageUrlName, 'success' => true];
 		else
-			return array('message' => t('Page update failed.'), 'success' => false);
-	}	
+			return ['message' => t('Page update failed.'), 'success' => false];
+	}
 
 
 	static public function delete_page($arr) {
 
-		$pageUrlName   = (array_key_exists('pageUrlName',$arr) ? $arr['pageUrlName'] : '');
-		$resource_id   = (array_key_exists('resource_id',$arr) ? $arr['resource_id'] : '');
-		$observer_hash = (array_key_exists('observer_hash',$arr) ? $arr['observer_hash'] : '');
-		$channel_id    = (array_key_exists('channel_id',$arr) ? $arr['channel_id'] : 0);
+		$pageUrlName   = (array_key_exists('pageUrlName', $arr) ? $arr['pageUrlName'] : '');
+		$resource_id   = (array_key_exists('resource_id', $arr) ? $arr['resource_id'] : '');
+		$observer_hash = (array_key_exists('observer_hash', $arr) ? $arr['observer_hash'] : '');
+		$channel_id    = (array_key_exists('channel_id', $arr) ? $arr['channel_id'] : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if(! $w['wiki']) {
-			return [ 'success' => false, 'message' => t('Error reading wiki') ];
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		if (!$w['wiki']) {
+			return ['success' => false, 'message' => t('Error reading wiki')];
 		}
 
 		$ids = [];
 
-		$ic = q("select * from iconfig left join item on iconfig.iid = item.id 
+		$ic = q("select * from iconfig left join item on iconfig.iid = item.id
 			where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
 			intval($channel_id),
 			dbesc($pageUrlName)
 		);
 
-		if($ic) {
-			foreach($ic as $c) {
+		if ($ic) {
+			foreach ($ic as $c) {
 				$ids[] = intval($c['iid']);
 			}
 		}
 
-		if($ids) {
+		if ($ids) {
 			drop_items($ids, true, DROPITEM_PHASE1);
-			return [ 'success' => true ];
+			return ['success' => true];
 		}
 
-		return [ 'success' => false, 'message' => t('Nothing deleted') ];	
+		return ['success' => false, 'message' => t('Nothing deleted')];
 	}
-	
+
 
 	static public function revert_page($arr) {
 
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
-		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']   : '');
-		$commitHash    = ((array_key_exists('commitHash',$arr))    ? $arr['commitHash']    : null);
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$commitHash    = ((array_key_exists('commitHash', $arr)) ? $arr['commitHash'] : null);
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		if (! $commitHash) {
-			return array('message' => 'No commit was provided', 'success' => false);
+		if (!$commitHash) {
+			return ['message' => 'No commit was provided', 'success' => false];
 		}
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 		if (!$w['wiki']) {
-			return array('message' => 'Error reading wiki', 'success' => false);
+			return ['message' => 'Error reading wiki', 'success' => false];
 		}
 
 		$x = $arr;
 
-		if(intval($commitHash) > 0) {
+		if (intval($commitHash) > 0) {
 			unset($x['commitHash']);
 			$x['revision'] = intval($commitHash) - 1;
-			$loaded = self::load_page($x);
+			$loaded        = self::load_page($x);
 
-			if($loaded) {
+			if ($loaded) {
 				$content = $loaded['body'];
-				return [ 'content' => $content, 'success' => true ];
+				return ['content' => $content, 'success' => true];
 			}
-			return [ 'success' => false ];
+			return ['success' => false];
 		}
 	}
-	
+
 
 	static public function compare_page($arr) {
 
-		$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
-		$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
-		$currentCommit = ((array_key_exists('currentCommit',$arr)) ? $arr['currentCommit'] : (-1));
-		$compareCommit = ((array_key_exists('compareCommit',$arr)) ? $arr['compareCommit'] : 0);
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
+		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+		$compareCommit = ((array_key_exists('compareCommit', $arr)) ? $arr['compareCommit'] : 0);
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 
 		if (!$w['wiki']) {
-			return array('message' => t('Error reading wiki'), 'success' => false);
+			return ['message' => t('Error reading wiki'), 'success' => false];
 		}
 
-		$x = $arr;
+		$x             = $arr;
 		$x['revision'] = (-1);
 
 		$currpage = self::load_page($x);
-		if($currpage)
+		if ($currpage)
 			$currentContent = $currpage['body'];
 
 		$x['revision'] = $compareCommit;
-		$comppage = self::load_page($x);
-		if($comppage)
+		$comppage      = self::load_page($x);
+		if ($comppage)
 			$compareContent = $comppage['body'];
 
-		if($currpage && $comppage) {
+		if ($currpage && $comppage) {
 			require_once('library/class.Diff.php');
 			$diff = \Diff::toTable(\Diff::compare($currentContent, $compareContent));
 
-			return [ 'success' => true, 'diff' => $diff ];
+			return ['success' => true, 'diff' => $diff];
 		}
-		return [ 'success' => false, 'message' =>  t('Compare: object not found.') ];
+		return ['success' => false, 'message' => t('Compare: object not found.')];
 
 	}
-	
+
 
 	static public function commit($arr) {
 
-		$commit_msg    = ((array_key_exists('commit_msg', $arr))   ? $arr['commit_msg']    : t('Page updated'));
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
-		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : t('Untitled'));
+		$commit_msg    = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : t('Page updated'));
+		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
+		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
 
-		if(array_key_exists('resource_id', $arr)) {
+		if (array_key_exists('resource_id', $arr)) {
 			$resource_id = $arr['resource_id'];
 		}
 		else {
-			return array('message' => t('Wiki resource_id required for git commit'), 'success' => false);
+			return ['message' => t('Wiki resource_id required for git commit'), 'success' => false];
 		}
 
-		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (! $w['wiki']) {
-			return array('message' => t('Error reading wiki'), 'success' => false);
+		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+		if (!$w['wiki']) {
+			return ['message' => t('Error reading wiki'), 'success' => false];
 		}
 
 
 		$page = self::load_page($arr);
 
-		if($page) {
-			set_iconfig($page['id'],'nwikipage','commit_msg',escape_tags($commit_msg),true);
-			return [ 'success' => true, 'item_id' => $page['id'], 'page' => $page ];
+		if ($page) {
+			set_iconfig($page['id'], 'nwikipage', 'commit_msg', escape_tags($commit_msg), true);
+			return ['success' => true, 'item_id' => $page['id'], 'page' => $page];
 		}
 
-		return [ 'success' => false, 'message' => t('Page not found.') ];
+		return ['success' => false, 'message' => t('Page not found.')];
 
 	}
-	
+
 	static public function convert_links($s, $wikiURL) {
-		
-		if (strpos($s,'[[') !== false) {
+
+		if (strpos($s, '[[') !== false) {
 			preg_match_all("/\[\[(.*?)\]\]/", $s, $match);
-			$pages = $pageURLs = array();
+			$pages = $pageURLs = [];
 			foreach ($match[1] as $m) {
 				// TODO: Why do we need to double urlencode for this to work?
 				//$pageURLs[] = urlencode(urlencode(escape_tags($m)));
-				$titleUri = explode('|',$m);
-				$page = $titleUri[0] ?? '';
-				$title = $titleUri[1] ?? $page;
-				$pageURLs[] = Zlib\NativeWiki::name_encode(escape_tags($page));
-				$pages[] = $title;
+				$titleUri   = explode('|', $m);
+				$page       = $titleUri[0] ?? '';
+				$title      = $titleUri[1] ?? $page;
+				$pageURLs[] = NativeWiki::name_encode(escape_tags($page));
+				$pages[]    = $title;
 			}
 			$idx = 0;
-			while(strpos($s,'[[') !== false) {
-			$replace = '<a href="'.$wikiURL.'/'.$pageURLs[$idx].'">'.$pages[$idx].'</a>';
-				$s = preg_replace("/\[\[(.*?)\]\]/", $replace, $s, 1);
+			while (strpos($s, '[[') !== false) {
+				$replace = '<a href="' . $wikiURL . '/' . $pageURLs[$idx] . '">' . $pages[$idx] . '</a>';
+				$s       = preg_replace("/\[\[(.*?)\]\]/", $replace, $s, 1);
 				$idx++;
 			}
 		}
@@ -564,21 +570,21 @@ class NativeWikiPage {
 		$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
 
 		$pageHistory = self::page_history([
-			'channel_id'    => \App::$profile_uid, 
+			'channel_id'    => App::$profile_uid,
 			'observer_hash' => get_observer_hash(),
 			'resource_id'   => $resource_id,
 			'pageUrlName'   => $pageUrlName
 		]);
 
-		return replace_macros(get_markup_template('nwiki_page_history.tpl'), array(
+		return replace_macros(get_markup_template('nwiki_page_history.tpl'), [
 			'$pageHistory' => $pageHistory['history'],
 			'$permsWrite'  => $arr['permsWrite'],
 			'$name_lbl'    => t('Name'),
-			'$msg_label'   => t('Message','wiki_history'),
+			'$msg_label'   => t('Message', 'wiki_history'),
 			'$date_lbl'    => t('Date'),
 			'$revert_btn'  => t('Revert'),
 			'$compare_btn' => t('Compare')
-		));
+		]);
 
 	}
 
@@ -590,14 +596,14 @@ class NativeWikiPage {
 	 * @return string
 	 */
 	static public function generate_toc($s) {
-		if (strpos($s,'[toc]') !== false) {
+		if (strpos($s, '[toc]') !== false) {
 			//$toc_md = wiki_toc($s);	// Generate Markdown-formatted list prior to HTML render
 			$toc_md = '<ul id="wiki-toc"></ul>'; // use the available jQuery plugin http://ndabas.github.io/toc/
-			$s = preg_replace("/\[toc\]/", $toc_md, $s, -1);
+			$s      = preg_replace("/\[toc\]/", $toc_md, $s, -1);
 		}
 		return $s;
 	}
-	
+
 
 	/**
 	 *  Converts a select set of bbcode tags. Much of the code is copied from include/bbcode.php
@@ -605,27 +611,27 @@ class NativeWikiPage {
 	 * @return string
 	 */
 	static public function bbcode($s) {
-			
-		$s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s);
-			
-		$s = preg_replace_callback("/\[observer\.language\=(.*?)\](.*?)\[\/observer\]/ism",'oblanguage_callback', $s);
 
-		$s = preg_replace_callback("/\[observer\.language\!\=(.*?)\](.*?)\[\/observer\]/ism",'oblanguage_necallback', $s);
+		$s = str_replace(['[baseurl]', '[sitename]'], [z_root(), get_config('system', 'sitename')], $s);
+
+		$s = preg_replace_callback("/\[observer\.language\=(.*?)\](.*?)\[\/observer\]/ism", 'oblanguage_callback', $s);
 
+		$s = preg_replace_callback("/\[observer\.language\!\=(.*?)\](.*?)\[\/observer\]/ism", 'oblanguage_necallback', $s);
 
-		$observer = \App::get_observer();
+
+		$observer = App::get_observer();
 		if ($observer) {
-			$s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
-			$s2 = '</span>';
+			$s1         = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
+			$s2         = '</span>';
 			$obsBaseURL = $observer['xchan_connurl'];
 			$obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL);
-			$s = str_replace('[observer.baseurl]', $obsBaseURL, $s);
-			$s = str_replace('[observer.url]', $observer['xchan_url'], $s);
-			$s = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s);
-			$s = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s);
-			$s = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s);
-			$s = str_replace('[observer.photo]', '', $s);
-		} 
+			$s          = str_replace('[observer.baseurl]', $obsBaseURL, $s);
+			$s          = str_replace('[observer.url]', $observer['xchan_url'], $s);
+			$s          = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s);
+			$s          = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s);
+			$s          = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s);
+			$s          = str_replace('[observer.photo]', '', $s);
+		}
 		else {
 			$s = str_replace('[observer.baseurl]', '', $s);
 			$s = str_replace('[observer.url]', '', $s);
@@ -637,62 +643,63 @@ class NativeWikiPage {
 
 		return $s;
 	}
-	
+
 
 	static public function get_file_ext($arr) {
 
-		if($arr['mimetype'] === 'text/bbcode')
+		if ($arr['mimetype'] === 'text/bbcode')
 			return '.bb';
-		elseif($arr['mimetype'] === 'text/markdown')
+		elseif ($arr['mimetype'] === 'text/markdown')
 			return '.md';
-		elseif($arr['mimetype'] === 'text/plain')
+		elseif ($arr['mimetype'] === 'text/plain')
 			return '.txt';
 
 	}
-	
-	// This function is derived from 
+
+	// This function is derived from
 	// http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
 	static public function toc($content) {
-	  // ensure using only "\n" as line-break
-	  $source = str_replace(["\r\n", "\r"], "\n", $content);
-	
-	  // look for markdown TOC items
-	  preg_match_all(
-		'/^(?:=|-|#).*$/m',
-		$source,
-		$matches,
-		PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
-	  );
-	
-	  // preprocess: iterate matched lines to create an array of items
-	  // where each item is an array(level, text)
-	  $file_size = strlen($source);
-	  foreach ($matches[0] as $item) {
-		$found_mark = substr($item[0], 0, 1);
-		if ($found_mark == '#') {
-		  // text is the found item
-		  $item_text = $item[0];
-		  $item_level = strrpos($item_text, '#') + 1;
-		  $item_text = substr($item_text, $item_level);
-		} else {
-		  // text is the previous line (empty if <hr>)
-		  $item_offset = $item[1];
-		  $prev_line_offset = strrpos($source, "\n", -($file_size - $item_offset + 2));
-		  $item_text =
-			substr($source, $prev_line_offset, $item_offset - $prev_line_offset - 1);
-		  $item_text = trim($item_text);
-		  $item_level = $found_mark == '=' ? 1 : 2;
-		}
-		if (!trim($item_text) OR strpos($item_text, '|') !== FALSE) {
-		  // item is an horizontal separator or a table header, don't mind
-		  continue;
-		}
-		$raw_toc[] = ['level' => $item_level, 'text' => trim($item_text)];
-	  }
+		// ensure using only "\n" as line-break
+		$source = str_replace(["\r\n", "\r"], "\n", $content);
+
+		// look for markdown TOC items
+		preg_match_all(
+			'/^(?:=|-|#).*$/m',
+			$source,
+			$matches,
+			PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
+		);
+
+		// preprocess: iterate matched lines to create an array of items
+		// where each item is an array(level, text)
+		$file_size = strlen($source);
+		foreach ($matches[0] as $item) {
+			$found_mark = substr($item[0], 0, 1);
+			if ($found_mark == '#') {
+				// text is the found item
+				$item_text  = $item[0];
+				$item_level = strrpos($item_text, '#') + 1;
+				$item_text  = substr($item_text, $item_level);
+			}
+			else {
+				// text is the previous line (empty if <hr>)
+				$item_offset      = $item[1];
+				$prev_line_offset = strrpos($source, "\n", -($file_size - $item_offset + 2));
+				$item_text        =
+					substr($source, $prev_line_offset, $item_offset - $prev_line_offset - 1);
+				$item_text        = trim($item_text);
+				$item_level       = $found_mark == '=' ? 1 : 2;
+			}
+			if (!trim($item_text) or strpos($item_text, '|') !== FALSE) {
+				// item is an horizontal separator or a table header, don't mind
+				continue;
+			}
+			$raw_toc[] = ['level' => $item_level, 'text' => trim($item_text)];
+		}
 		$o = '';
-		foreach($raw_toc as $t) {
+		foreach ($raw_toc as $t) {
 			$level = intval($t['level']);
-			$text = $t['text'];
+			$text  = $t['text'];
 			switch ($level) {
 				case 1:
 					$li = '* ';
@@ -712,7 +719,7 @@ class NativeWikiPage {
 			}
 			$o .= $li . $text . "\n";
 		}
-	  return $o;
+		return $o;
 	}
 
 }
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index 35eb1e264..e03816f05 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -195,7 +195,7 @@ class Queue {
 			$channel = null;
 
 			if($outq['outq_channel']) {
-				$channel = channelx_by_n($outq['outq_channel']);
+				$channel = channelx_by_n($outq['outq_channel'], true);
 			}
 
 			$host_crypto = null;