Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

3 files changed, 275 insertions, 223 deletions

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 11f4d3a52..915e0ea60 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -4,10 +4,12 @@ namespace Zotlabs\Module;
 
 
 use App;
-use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Activity;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\PermissionDescription;
+use Zotlabs\Web\Controller;
 use Zotlabs\Web\HTTPSig;
-use Zotlabs\Lib\Libzot;
 
 require_once('include/items.php');
 require_once('include/security.php');
@@ -20,86 +22,116 @@ require_once('include/opengraph.php');
  * @brief Channel Controller
  *
  */
-
 class Channel extends Controller {
 
 	function init() {
 
-		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))
+		if (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
 			goaway('search' . '?f=&search=' . $_GET['search']);
 
 		$which = null;
-		if(argc() > 1)
+		if (argc() > 1)
 			$which = argv(1);
-		if(! $which) {
-			if(local_channel()) {
+		if (!$which) {
+			if (local_channel()) {
 				$channel = App::get_channel();
-				if($channel && $channel['channel_address'])
-				$which = $channel['channel_address'];
+				if ($channel && $channel['channel_address'])
+					$which = $channel['channel_address'];
 			}
 		}
-		if(! $which) {
-			notice( t('You must be logged in to see this page.') . EOL );
+		if (!$which) {
+			notice(t('You must be logged in to see this page.') . EOL);
 			return;
 		}
 
 		$profile = 0;
 		$channel = App::get_channel();
 
-		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-			$which = $channel['channel_address'];
+		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$which   = $channel['channel_address'];
 			$profile = argv(1);
 		}
 
 		$channel = channelx_by_nick($which);
-		if(! $channel) {
+		if (!$channel) {
 			http_status_exit(404, 'Not found');
 		}
 
 		// handle zot6 channel discovery
 
-		if(Libzot::is_zot_request()) {
+		if (Libzot::is_zot_request()) {
 
 			$sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
 
-			if($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
-				$data = json_encode(Libzot::zotinfo([ 'address' => $channel['channel_address'], 'target_url' => $sigdata['signer'] ]));
-				$s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
+			if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
+				$data = json_encode(Libzot::zotinfo(['address' => $channel['channel_address'], 'target_url' => $sigdata['signer']]));
+				$s    = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
 					dbesc($sigdata['signer'])
 				);
 
-				if($s) {
-					$data = json_encode(crypto_encapsulate($data,$s[0]['hubloc_sitekey'],Libzot::best_algorithm($s[0]['site_crypto'])));
+				if ($s) {
+					$data = json_encode(crypto_encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto'])));
 				}
 			}
 			else {
-				$data = json_encode(Libzot::zotinfo([ 'guid_hash' => $channel['channel_hash'] ]));
+				$data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']]));
 			}
 
 			$headers = [
 				'Content-Type'     => 'application/x-zot+json',
 				'Digest'           => HTTPSig::generate_digest_header($data),
 				'(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
-			 ];
-			$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel));
+			];
+			$h       = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel));
 			HTTPSig::set_headers($h);
 			echo $data;
 			killme();
 		}
 
-		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-			$which = $channel['channel_address'];
+		if (ActivityStreams::is_as_request($channel)) {
+
+			// Somebody may attempt an ActivityStreams fetch on one of our message permalinks
+			// Make it do the right thing.
+
+			$mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
+			if ($mid && strpos($mid, 'b64.') === 0) {
+				$decoded = @base64url_decode(substr($mid, 4));
+				if ($decoded) {
+					$mid = $decoded;
+				}
+			}
+			if ($mid) {
+				$obj = null;
+				if (strpos($mid, z_root() . '/item/') === 0) {
+					App::$argc = 2;
+					App::$argv = ['item', basename($mid)];
+					$obj       = new Item();
+				}
+				if (strpos($mid, z_root() . '/activity/') === 0) {
+					App::$argc = 2;
+					App::$argv = ['activity', basename($mid)];
+					$obj       = new Activity();
+				}
+				if ($obj) {
+					$obj->init();
+				}
+			}
+			as_return_and_die(Activity::encode_person($channel, true), $channel);
+		}
+
+		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$which   = $channel['channel_address'];
 			$profile = argv(1);
 		}
 
-		head_add_link( [
+		head_add_link([
 			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Posts and comments'),
 			'href'  => z_root() . '/feed/' . $which
 		]);
 
-		head_add_link( [
+		head_add_link([
 			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Only posts'),
@@ -109,18 +141,18 @@ class Channel extends Controller {
 
 		// Run profile_load() here to make sure the theme is set before
 		// we start loading content
-		profile_load($which,$profile);
+		profile_load($which, $profile);
 
 		// Add Opengraph markup
-		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
-		if(strpos($mid,'b64.') === 0)
-		    $mid = @base64url_decode(substr($mid,4));
-
-		if($mid)
-		    $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
-		        dbesc($mid),
-		        intval($channel['channel_id'])
-		    );
+		$mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
+		if (strpos($mid, 'b64.') === 0)
+			$mid = @base64url_decode(substr($mid, 4));
+
+		if ($mid)
+			$r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
+				dbesc($mid),
+				intval($channel['channel_id'])
+			);
 
 		opengraph_add_meta($r ? $r[0] : [], $channel);
 	}
@@ -131,99 +163,99 @@ class Channel extends Controller {
 
 		$category = $datequery = $datequery2 = '';
 
-		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
+		$mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
 
-		if(strpos($mid,'b64.') === 0)
-			$decoded = @base64url_decode(substr($mid,4));
-		if($decoded)
+		if (strpos($mid, 'b64.') === 0)
+			$decoded = @base64url_decode(substr($mid, 4));
+		if ($decoded)
 			$mid = $decoded;
 
-		$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']) : '');
+		$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']) : '');
 
-		if(observer_prohibited(true)) {
+		if (observer_prohibited(true)) {
 			return login();
 		}
 
-		$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
-		$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
-		$order    = ((x($_GET,'order')) ? notags($_GET['order']) : 'post');
-		$search   = ((x($_GET,'search')) ? $_GET['search'] : EMPTY_STR);
+		$category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : '');
+		$hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : '');
+		$order    = ((x($_GET, 'order')) ? notags($_GET['order']) : 'post');
+		$search   = ((x($_GET, 'search')) ? $_GET['search'] : EMPTY_STR);
 
-		$groups = array();
+		$groups = [];
 
 		$o = '';
 
-		if($update) {
+		if ($update) {
 			// Ensure we've got a profile owner if updating.
 			App::$profile['profile_uid'] = App::$profile_uid = $update;
 		}
 
 		$is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
 
-		$channel = App::get_channel();
+		$channel  = App::get_channel();
 		$observer = App::get_observer();
-		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+		$ob_hash  = (($observer) ? $observer['xchan_hash'] : '');
 
-		$perms = get_all_perms(App::$profile['profile_uid'],$ob_hash);
+		$perms = get_all_perms(App::$profile['profile_uid'], $ob_hash);
 
-		if(! $perms['view_stream']) {
+		if (!$perms['view_stream']) {
 			// We may want to make the target of this redirect configurable
-			if($perms['view_profile']) {
-				notice( t('Insufficient permissions.  Request redirected to profile page.') . EOL);
-				goaway (z_root() . "/profile/" . App::$profile['channel_address']);
+			if ($perms['view_profile']) {
+				notice(t('Insufficient permissions.  Request redirected to profile page.') . EOL);
+				goaway(z_root() . "/profile/" . App::$profile['channel_address']);
 			}
-			notice( t('Permission denied.') . EOL);
+			notice(t('Permission denied.') . EOL);
 			return;
 		}
 
 
-		if(! $update) {
+		if (!$update) {
 
 			nav_set_selected('Channel Home');
 
 			// search terms header
-			if($search) {
-				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-					'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8')
-				));
+			if ($search) {
+				$o .= replace_macros(get_markup_template("section_title.tpl"), [
+					'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')
+				]);
 			}
 
-			if($channel && $is_owner) {
-				$channel_acl = array(
+			if ($channel && $is_owner) {
+				$channel_acl = [
 					'allow_cid' => $channel['channel_allow_cid'],
 					'allow_gid' => $channel['channel_allow_gid'],
-					'deny_cid' => $channel['channel_deny_cid'],
-					'deny_gid' => $channel['channel_deny_gid']
-				);
+					'deny_cid'  => $channel['channel_deny_cid'],
+					'deny_gid'  => $channel['channel_deny_gid']
+				];
 			}
 			else {
-				$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
+				$channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
 			}
 
 
-			if($perms['post_wall']) {
-
-				$x = array(
-					'is_owner' => $is_owner,
-					'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
-					'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''),
-					'nickname' => App::$profile['channel_address'],
-					'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-					'acl' => (($is_owner) ? populate_acl($channel_acl,true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
-					'permissions' => $channel_acl,
-					'showacl' => (($is_owner) ? 'yes' : ''),
-					'bang' => '',
-					'visitor' => (($is_owner || $observer) ? true : false),
-					'profile_uid' => App::$profile['profile_uid'],
+			if ($perms['post_wall']) {
+
+				$x = [
+					'is_owner'            => $is_owner,
+					'allow_location'      => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'], 'system', 'use_browser_location')))) ? true : false),
+					'default_location'    => (($is_owner) ? App::$profile['channel_location'] : ''),
+					'nickname'            => App::$profile['channel_address'],
+					'lockstate'           => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
+					'acl'                 => (($is_owner) ? populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
+					'permissions'         => $channel_acl,
+					'showacl'             => (($is_owner) ? 'yes' : ''),
+					'bang'                => '',
+					'visitor'             => (($is_owner || $observer) ? true : false),
+					'profile_uid'         => App::$profile['profile_uid'],
 					'editor_autocomplete' => true,
-					'bbco_autocomplete' => 'bbcode',
-					'bbcode' => true,
-					'jotnets' => true,
-					'reset' => t('Reset form')
-				);
+					'bbco_autocomplete'   => 'bbcode',
+					'bbcode'              => true,
+					'jotnets'             => true,
+					'reset'               => t('Reset form')
+				];
 
-				$o .= status_editor($a,$x,false,'Channel');
+				$o .= status_editor($a, $x, false, 'Channel');
 			}
 
 		}
@@ -233,15 +265,15 @@ class Channel extends Controller {
 		 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 		 */
 
-		 $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
+		$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
 		    and item.item_unpublished = 0 and item.item_pending_remove = 0
 		    and item.item_blocked = 0 ";
-		 if (! $is_owner)
-		    $item_normal .= "and item.item_delayed = 0 ";
+		if (!$is_owner)
+			$item_normal .= "and item.item_delayed = 0 ";
 		$item_normal_update = item_normal_update();
-		$sql_extra = item_permissions_sql(App::$profile['profile_uid']);
+		$sql_extra          = item_permissions_sql(App::$profile['profile_uid']);
 
-		if(feature_enabled(App::$profile['profile_uid'], 'channel_list_mode') && (! $mid))
+		if (feature_enabled(App::$profile['profile_uid'], 'channel_list_mode') && (!$mid))
 			$page_mode = 'list';
 		else
 			$page_mode = 'client';
@@ -249,13 +281,13 @@ class Channel extends Controller {
 		$abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
 
 		$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 ($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) {
+		if ($search) {
 			$search = escape_tags($search);
-			if(strpos($search,'#') === 0) {
-				$sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG);
+			if (strpos($search, '#') === 0) {
+				$sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
 			}
 			else {
 				$sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ",
@@ -272,9 +304,9 @@ class Channel extends Controller {
 			'title' => 'oembed'
 		]);
 
-		if(($update) && (! $load)) {
+		if (($update) && (!$load)) {
 
-			if($mid) {
+			if ($mid) {
 				$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal_update
 					AND item_wall = 1 $simple_update $sql_extra limit 1",
 					dbesc($mid . '%'),
@@ -295,40 +327,40 @@ class Channel extends Controller {
 		}
 		else {
 
-			if(x($category)) {
-				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $category, TERM_CATEGORY));
+			if (x($category)) {
+				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
 			}
-			if(x($hashtags)) {
-				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+			if (x($hashtags)) {
+				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
 			}
 
-			if($datequery) {
-				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-				$order = 'post';
+			if ($datequery) {
+				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
+				$order      = 'post';
 			}
-			if($datequery2) {
-				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+			if ($datequery2) {
+				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
 			}
 
-			if($order === 'post')
+			if ($order === 'post')
 				$ordering = "created";
 			else
 				$ordering = "commented";
 
 
-			$itemspage = get_pconfig(local_channel(),'system','itemspage');
+			$itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
 			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 
-			if($noscript_content || $load) {
-				if($mid) {
+			if ($noscript_content || $load) {
+				if ($mid) {
 					$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
 						AND item_wall = 1 $sql_extra limit 1",
 						dbesc($mid . '%'),
 						intval(App::$profile['profile_uid'])
 					);
-					if (! $r) {
-						notice( t('Permission denied.') . EOL);
+					if (!$r) {
+						notice(t('Permission denied.') . EOL);
 					}
 				}
 				else {
@@ -344,12 +376,12 @@ class Channel extends Controller {
 				}
 			}
 			else {
-				$r = array();
+				$r = [];
 			}
 		}
-		if($r) {
+		if ($r) {
 
-			$parents_str = ids_to_querystr($r,'item_id');
+			$parents_str = ids_to_querystr($r, 'item_id');
 
 			$r = q("SELECT item.*, item.id AS item_id
 				FROM item
@@ -362,37 +394,38 @@ class Channel extends Controller {
 
 			xchan_query($r);
 			$items = fetch_post_tags($r, true);
-			$items = conv_sort($items,$ordering);
+			$items = conv_sort($items, $ordering);
 
-			if($load && $mid && (! count($items))) {
+			if ($load && $mid && (!count($items))) {
 				// This will happen if we don't have sufficient permissions
 				// to view the parent item (or the item itself if it is toplevel)
-				notice( t('Permission denied.') . EOL);
+				notice(t('Permission denied.') . EOL);
 			}
 
-		} else {
-			$items = array();
+		}
+		else {
+			$items = [];
 		}
 
 		// Add pinned content
-		if(! x($_REQUEST,'mid') && ! $search) {
+		if (!x($_REQUEST, 'mid') && !$search) {
 			$pinned = new \Zotlabs\Widget\Pinned;
-			$r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
-			$o .= $r['html'];
+			$r      = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
+			$o      .= $r['html'];
 		}
 
 		$mode = (($search) ? 'search' : 'channel');
 
-		if((! $update) && (! $load)) {
+		if ((!$update) && (!$load)) {
 
-			if($decoded)
+			if ($decoded)
 				$mid = 'b64.' . base64url_encode($mid);
 
 			// 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.
 
-			$maxheight = get_pconfig(App::$profile['profile_uid'],'system','channel_divmore_height');
-			if(! $maxheight)
+			$maxheight = get_pconfig(App::$profile['profile_uid'], 'system', 'channel_divmore_height');
+			if (!$maxheight)
 				$maxheight = 400;
 
 			$o .= '<div id="live-channel"></div>' . "\r\n";
@@ -400,48 +433,48 @@ class Channel extends Controller {
 				. "; var netargs = '?f='; var profile_page = " . App::$pager['page']
 				. "; divmore_height = " . intval($maxheight) . ";</script>\r\n";
 
-			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
-				'$baseurl' => z_root(),
-				'$pgtype' => 'channel',
-				'$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
-				'$gid' => '0',
-				'$cid' => '0',
-				'$cmin' => '(-1)',
-				'$cmax' => '(-1)',
-				'$star' => '0',
-				'$liked' => '0',
-				'$conv' => '0',
-				'$spam' => '0',
-				'$nouveau' => '0',
-				'$wall' => '1',
-				'$fh' => '0',
-				'$dm' => '0',
-				'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-				'$search' => $search,
-				'$xchan' => '',
-				'$order' => (($order) ? urlencode($order) : ''),
-				'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
-				'$file' => '',
-				'$cats' => (($category) ? urlencode($category) : ''),
-				'$tags' => (($hashtags) ? urlencode($hashtags) : ''),
-				'$mid' => (($mid) ? urlencode($mid) : ''),
-				'$verb' => '',
-				'$net' => '',
-				'$dend' => $datequery,
-				'$dbegin' => $datequery2,
+			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), [
+				'$baseurl'   => z_root(),
+				'$pgtype'    => 'channel',
+				'$uid'       => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
+				'$gid'       => '0',
+				'$cid'       => '0',
+				'$cmin'      => '(-1)',
+				'$cmax'      => '(-1)',
+				'$star'      => '0',
+				'$liked'     => '0',
+				'$conv'      => '0',
+				'$spam'      => '0',
+				'$nouveau'   => '0',
+				'$wall'      => '1',
+				'$fh'        => '0',
+				'$dm'        => '0',
+				'$page'      => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+				'$search'    => $search,
+				'$xchan'     => '',
+				'$order'     => (($order) ? urlencode($order) : ''),
+				'$list'      => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+				'$file'      => '',
+				'$cats'      => (($category) ? urlencode($category) : ''),
+				'$tags'      => (($hashtags) ? urlencode($hashtags) : ''),
+				'$mid'       => (($mid) ? urlencode($mid) : ''),
+				'$verb'      => '',
+				'$net'       => '',
+				'$dend'      => $datequery,
+				'$dbegin'    => $datequery2,
 				'$conv_mode' => 'channel',
 				'$page_mode' => $page_mode
-			));
+			]);
 		}
 
-		if($update) {
-			$o .= conversation($items,$mode,$update,$page_mode);
+		if ($update) {
+			$o .= conversation($items, $mode, $update, $page_mode);
 		}
 		else {
 
 			$o .= '<noscript>';
-			if($noscript_content) {
-				$o .= conversation($items,$mode,$update,'traditional');
+			if ($noscript_content) {
+				$o .= conversation($items, $mode, $update, 'traditional');
 				$o .= alt_pager(count($items));
 			}
 			else {
@@ -449,14 +482,14 @@ class Channel extends Controller {
 			}
 			$o .= '</noscript>';
 
-			$o .= conversation($items,$mode,$update,$page_mode);
+			$o .= conversation($items, $mode, $update, $page_mode);
 
 			if ($mid && $items[0]['title'])
 				App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
 
 		}
 
-		if($mid)
+		if ($mid)
 			$o .= '<div id="content-complete"></div>';
 
 		$_SESSION['loadtime'] = datetime_convert();
diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php
index 0373630a9..118f11f64 100644
--- a/Zotlabs/Module/Profile.php
+++ b/Zotlabs/Module/Profile.php
@@ -1,5 +1,13 @@
 <?php
-namespace Zotlabs\Module; /** @file */
+
+namespace Zotlabs\Module;
+
+use App;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\Activity;
+use Zotlabs\Web\Controller;
+
+/** @file */
 
 require_once('include/contact_widgets.php');
 require_once('include/items.php');
@@ -9,110 +17,115 @@ require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 
 
-
-class Profile extends \Zotlabs\Web\Controller {
+class Profile extends Controller {
 
 	function init() {
-	
-		if(argc() > 1)
+
+		if (argc() > 1)
 			$which = argv(1);
 		else {
-			notice( t('Requested profile is not available.') . EOL );
-			\App::$error = 404;
+			notice(t('Requested profile is not available.') . EOL);
+			App::$error = 404;
 			return;
 		}
 
-		nav_set_selected('Profile');
-	
 		$profile = '';
-		$channel = \App::get_channel();
-	
-		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-			$which = $channel['channel_address'];
-			$profile = argv(1);		
-			$r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+		$channel = App::get_channel();
+
+		if (!$channel)
+			http_status_exit(404, 'Not found');
+
+		if (ActivityStreams::is_as_request()) {
+			$p = Activity::encode_person($channel, true);
+			as_return_and_die(['type' => 'Profile', 'describes' => $p], $channel);
+		}
+
+		nav_set_selected('Profile');
+
+		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$which   = $channel['channel_address'];
+			$profile = argv(1);
+			$r       = q("select profile_guid from profile where id = %d and uid = %d limit 1",
 				intval($profile),
 				intval(local_channel())
 			);
-			if(! $r)
+			if (!$r)
 				$profile = '';
 			$profile = $r[0]['profile_guid'];
 		}
-	
-		head_add_link( [ 
-			'rel'   => 'alternate', 
+
+		head_add_link([
+			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Posts and comments'),
 			'href'  => z_root() . '/feed/' . $which
 		]);
 
-		head_add_link( [ 
-			'rel'   => 'alternate', 
+		head_add_link([
+			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Only posts'),
 			'href'  => z_root() . '/feed/' . $which . '?f=&top=1'
 		]);
 
 
-		if(! $profile) {
+		if (!$profile) {
 			$x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
 				dbesc(argv(1))
 			);
-			if($x) {
-				\App::$profile = $x[0];
+			if ($x) {
+				App::$profile = $x[0];
 			}
 		}
-	
-		profile_load($which,$profile);
-	
-	
+
+		profile_load($which, $profile);
+
+
 	}
-	
+
 	function get() {
-	
-		if(observer_prohibited(true)) {
+
+		if (observer_prohibited(true)) {
 			return login();
 		}
-	
-		$groups = array();
 
+		$groups = [];
 
 
 		$tab = 'profile';
-		$o = '';
-	
-		if(! (perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(), 'view_profile'))) {
-			notice( t('Permission denied.') . EOL);
+		$o   = '';
+
+		if (!(perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile'))) {
+			notice(t('Permission denied.') . EOL);
 			return;
 		}
-	
 
 
-		if(argc() > 2 && argv(2) === 'vcard') {
+		if (argc() > 2 && argv(2) === 'vcard') {
 			header('Content-type: text/vcard');
-			header('content-disposition: attachment; filename="' . t('vcard') . '-' . \App::$profile['channel_address'] . '.vcf"' );
-			echo \App::$profile['profile_vcard'];
+			header('content-disposition: attachment; filename="' . t('vcard') . '-' . App::$profile['channel_address'] . '.vcf"');
+			echo App::$profile['profile_vcard'];
 			killme();
 		}
-	
-		$is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
-	
-		if(\App::$profile['hidewall'] && (! $is_owner) && (! remote_channel())) {
-			notice( t('Permission denied.') . EOL);
+
+		$is_owner = ((local_channel()) && (local_channel() == App::$profile['profile_uid']) ? true : false);
+
+		if (App::$profile['hidewall'] && (!$is_owner) && (!remote_channel())) {
+			notice(t('Permission denied.') . EOL);
 			return;
 		}
-		
-		head_add_link([ 
+
+		head_add_link([
 			'rel'   => 'alternate',
 			'type'  => 'application/json+oembed',
-			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string),
+			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
 			'title' => 'oembed'
 		]);
 
 		$o .= advanced_profile();
-		call_hooks('profile_advanced',$o);
+		call_hooks('profile_advanced', $o);
 		return $o;
-	
+
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index 95510c349..eeeff9613 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -58,15 +58,13 @@ class Search extends Controller {
 
 		$o .= search($search, 'search-box', '/search', ((local_channel()) ? true : false));
 
-		if (local_channel() && strpos($search, 'https://') === 0) {
+		if (local_channel() && strpos($search, 'https://') === 0 && !$update && !$load) {
 			$j = Activity::fetch($search, App::get_channel());
 			if ($j) {
 				$AS = new ActivityStreams($j);
-
 				if ($AS->is_valid()) {
 					// check if is_an_actor, otherwise import activity
 					if (is_array($AS->obj) && !ActivityStreams::is_an_actor($AS->obj)) {
-						// The boolean flag enables html cache of the item
 						$item = Activity::decode_note($AS);
 						if ($item) {
 							logger('parsed_item: ' . print_r($item, true), LOGGER_DATA);
@@ -76,6 +74,14 @@ class Search extends Controller {
 					}
 				}
 			}
+			else {
+				// try other fetch providers (e.g. diaspora)
+				$hookdata = [
+					'channel' => App::get_channel(),
+					'data' => $search
+				];
+				call_hooks('fetch_provider', $hookdata);
+			}
 		}
 
 		if (strpos($search, '#') === 0) {
@@ -120,7 +126,7 @@ class Search extends Controller {
 		// Here is the way permissions work in the search module...
 		// Only public posts can be shown
 		// OR your own posts if you are a logged in member
-		// No items will be shown if the member has a blocked profile wall. 
+		// No items will be shown if the member has a blocked profile wall.
 
 
 		if ((!$update) && (!$load)) {