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

3 files changed, 150 insertions, 257 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 388d74d91..cedc9adc8 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -87,14 +87,16 @@ class Activity {
 			}
 
 			$headers = [
-				'Accept'           => 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+				'Accept'           => ActivityStreams::get_accept_header_string($channel),
 				'Host'             => $m['host'],
 				'Date'             => datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'),
 				'(request-target)' => 'get ' . get_request_string($url)
 			];
+
 			if (isset($token)) {
 				$headers['Authorization'] = 'Bearer ' . $token;
 			}
+
 			$h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), false);
 			$x = z_fetch_url($url, true, $redirects, ['headers' => $h]);
 		}
@@ -111,7 +113,6 @@ class Activity {
 		return null;
 	}
 
-
 	static function fetch_person($x) {
 		return self::fetch_profile($x);
 	}
@@ -177,7 +178,6 @@ class Activity {
 		}
 	}
 
-
 	static function fetch_image($x) {
 		$ret = [
 			'type'      => 'Image',
@@ -302,7 +302,7 @@ class Activity {
 				$m = get_iconfig($i['id'], 'activitypub', 'rawmsg');
 				if ($m) {
 					if (is_string($m))
-						$t = json_decode($m,true);
+						$t = json_decode($m, true);
 					else
 						$t = $m;
 				}
@@ -351,7 +351,6 @@ class Activity {
 		return $ret;
 	}
 
-
 	static function encode_item($i) {
 
 		$ret = [];
@@ -583,7 +582,6 @@ class Activity {
 		return $ret;
 	}
 
-
 	static function encode_taxonomy($item) {
 
 		$ret = [];
@@ -672,7 +670,6 @@ class Activity {
 		return $ret;
 	}
 
-
 	static function decode_attachment($item) {
 
 		$ret = [];
@@ -696,7 +693,6 @@ class Activity {
 		return $ret;
 	}
 
-
 	static function encode_activity($i, $recurse = false) {
 
 		$ret   = [];
@@ -958,7 +954,6 @@ class Activity {
 	}
 
 	// Returns an array of URLS for any mention tags found in the item array $i.
-
 	static function map_mentions($i) {
 
 		if (!$i['term']) {
@@ -981,7 +976,6 @@ class Activity {
 	}
 
 	// Returns an array of all recipients targeted by private item array $i.
-
 	static function map_acl($i) {
 		$ret = [];
 
@@ -1064,6 +1058,7 @@ class Activity {
 
 		if ($p['xchan_addr'] && strpos($p['xchan_addr'], '@'))
 			$ret['preferredUsername'] = substr($p['xchan_addr'], 0, strpos($p['xchan_addr'], '@'));
+
 		$ret['name']    = $p['xchan_name'];
 		$ret['updated'] = datetime_convert('UTC', 'UTC', $p['xchan_name_date'], ATOM_TIME);
 		$ret['icon']    = [
@@ -1093,15 +1088,17 @@ class Activity {
 			'publicKeyPem' => $p['xchan_pubkey']
 		];
 
-		$arr = ['xchan' => $p, 'encoded' => $ret];
+		$arr = [
+			'xchan' => $p,
+			'encoded' => $ret
+		];
+
 		call_hooks('encode_person', $arr);
 
 		$ret = $arr['encoded'];
-
 		return $ret;
 	}
 
-
 	static function activity_mapper($verb) {
 
 		if (strpos($verb, '/') === false) {
@@ -1145,7 +1142,7 @@ class Activity {
 		if (strpos($verb, ACTIVITY_POKE) !== false)
 			return 'Activity';
 
-		// We should return false, however this will trigger an uncaught execption  and crash 
+		// We should return false, however this will trigger an uncaught execption  and crash
 		// the delivery system if encountered by the JSON-LDSignature library
 
 		logger('Unmapped activity: ' . $verb);
@@ -1153,7 +1150,6 @@ class Activity {
 		//	return false;
 	}
 
-
 	static function activity_decode_mapper($verb) {
 
 		$acts = [
@@ -1225,7 +1221,6 @@ class Activity {
 		return 'Note';
 	}
 
-
 	static function activity_obj_mapper($obj) {
 
 		$objs = [
@@ -1272,17 +1267,16 @@ class Activity {
 
 	}
 
-
 	static function follow($channel, $act) {
 
 		$contact         = null;
 		$their_follow_id = null;
 
 		/*
-		 * 
-		 * if $act->type === 'Follow', actor is now following $channel 
-		 * if $act->type === 'Accept', actor has approved a follow request from $channel 
-		 *	 
+		 *
+		 * if $act->type === 'Follow', actor is now following $channel
+		 * if $act->type === 'Accept', actor has approved a follow request from $channel
+		 *
 		 */
 
 		$person_obj = $act->actor;
@@ -1297,7 +1291,7 @@ class Activity {
 
 			self::actor_store($person_obj['id'], $person_obj);
 
-			// Find any existing abook record 
+			// Find any existing abook record
 
 			$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1",
 				dbesc($person_obj['id']),
@@ -1314,7 +1308,7 @@ class Activity {
 
 		if ($contact && $contact['abook_id']) {
 
-			// A relationship of some form already exists on this site. 
+			// A relationship of some form already exists on this site.
 
 			switch ($act->type) {
 
@@ -1469,7 +1463,6 @@ class Activity {
 
 	}
 
-
 	static function unfollow($channel, $act) {
 
 		$contact = null;
@@ -1495,7 +1488,6 @@ class Activity {
 		return;
 	}
 
-
 	static function actor_store($url, $person_obj) {
 
 		if (!is_array($person_obj))
@@ -1601,7 +1593,7 @@ class Activity {
 		else {
 
 			// Record exists. Cache existing records for one week at most
-			// then refetch to catch updated profile photos, names, etc. 
+			// then refetch to catch updated profile photos, names, etc.
 
 			$d = datetime_convert('UTC', 'UTC', 'now - 1 week');
 			if ($r[0]['xchan_name_date'] > $d)
@@ -1663,7 +1655,6 @@ class Activity {
 
 	}
 
-
 	static function create_action($channel, $observer_hash, $act) {
 
 		if (in_array($act->obj['type'], ['Note', 'Article', 'Video'])) {
@@ -1681,7 +1672,6 @@ class Activity {
 
 	}
 
-
 	static function like_action($channel, $observer_hash, $act) {
 
 		if (in_array($act->obj['type'], ['Note', 'Article', 'Video'])) {
@@ -1692,7 +1682,6 @@ class Activity {
 	}
 
 	// sort function width decreasing
-
 	static function vid_sort($a, $b) {
 		if ($a['width'] === $b['width'])
 			return 0;
@@ -1954,7 +1943,6 @@ class Activity {
 
 	}
 
-
 	static function update_poll($item, $post) {
 		$multi   = false;
 		$mid     = $post['mid'];
@@ -2047,7 +2035,6 @@ class Activity {
 		return false;
 	}
 
-
 	static function decode_note($act) {
 
 		$response_activity = false;
@@ -2506,9 +2493,6 @@ class Activity {
 			$item['item_private'] = 2;
 		}*/
 
-		// TODO: remove
-		// $is_parent = (($item['parent_mid'] && $item['parent_mid'] === $item['mid']) ? true : false);
-
 		if ($item['parent_mid'] && $item['parent_mid'] !== $item['mid']) {
 			$is_child_node = true;
 		}
@@ -2563,7 +2547,7 @@ class Activity {
 
 				$allowed = true;
 				// reject public stream comments that weren't sent by the conversation owner
-				if ($is_sys_channel && $pubstream && $item['owner_xchan'] !== $observer_hash && ! $fetch_parents) {					// TODO: check why? This would make it impossible to fetch externals via zotfeed where $observer_hash = sys channel
+				if ($is_sys_channel && $pubstream && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) {
 					$allowed = false;
 				}
 			}
@@ -2587,12 +2571,6 @@ class Activity {
 			}*/
 		}
 
-		// TODO: remove
-		/*if ($is_parent && (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !($is_sys_channel && $pubstream))) {
-			logger('no permission');
-			return;
-		}*/
-
 		if (tgroup_check($channel['channel_id'], $item) && (!$is_child_node)) {
 			// for forum deliveries, make sure we keep a copy of the signed original
 			set_iconfig($item, 'activitypub', 'rawmsg', $act->raw, 1);
@@ -2642,15 +2620,6 @@ class Activity {
 			return;
 		}
 
-		// TODO: remove
-		/*if (is_array($act->obj)) {
-			$content = self::get_content($act->obj);
-		}
-		if (!$content) {
-			logger('no content');
-			return;
-		}*/
-
 		$item['aid'] = $channel['channel_account_id'];
 		$item['uid'] = $channel['channel_id'];
 
@@ -2717,54 +2686,6 @@ class Activity {
 
 		$parent = null;
 
-		// TODO: remove
-		/*if (!$is_parent) {
-			$p = q("select parent_mid, id, obj_type from item where mid = '%s' and uid = %d limit 1",
-				dbesc($item['parent_mid']),
-				intval($item['uid'])
-			);
-			if (!$p) {
-				$a = (($fetch_parents) ? self::fetch_and_store_parents($channel, $item) : false);
-				if ($a) {
-					$p = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
-						dbesc($item['parent_mid']),
-						intval($item['uid'])
-					);
-				}
-				else {
-					logger('could not fetch parents');
-					return;
-
-					// @TODO we maybe could accept these is we formatted the body correctly with share_bb()
-					// or at least provided a link to the object
-					// if(in_array($act->type,[ 'Like','Dislike' ])) {
-					//	return;
-					// }
-
-					// @TODO do we actually want that?
-					// if no parent was fetched, turn into a top-level post
-
-					// turn into a top level post
-					// $s['parent_mid'] = $s['mid'];
-					// $s['thr_parent'] = $s['mid'];
-				}
-			}
-
-			if ($p[0]['obj_type'] === 'Question') {
-				if ($item['obj_type'] === ACTIVITY_OBJ_NOTE && $item['title'] && (!$item['content'])) {
-					$item['obj_type'] = 'Answer';
-				}
-			}
-
-			if ($p[0]['parent_mid'] !== $item['parent_mid']) {
-				$item['thr_parent'] = $item['parent_mid'];
-			}
-			else {
-				$item['thr_parent'] = $p[0]['parent_mid'];
-			}
-			$item['parent_mid'] = $p[0]['parent_mid'];
-		}*/
-
 		if ($is_child_node) {
 
 			$parent = q("select * from item where mid = '%s' and uid = %d limit 1",
@@ -2824,24 +2745,6 @@ class Activity {
 			$x = item_store($item);
 		}
 
-		// TODO: remove
-		/*$r = q("select id, created, edited from item where mid = '%s' and uid = %d limit 1",
-			dbesc($item['mid']),
-			intval($item['uid'])
-		);
-		if ($r) {
-			if ($item['edited'] > $r[0]['edited']) {
-				$item['id'] = $r[0]['id'];
-				$x          = item_store_update($item);
-			}
-			else {
-				return;
-			}
-		}
-		else {
-			$x = item_store($item);
-		}*/
-
 		if ($fetch_parents && $parent && !intval($parent[0]['item_private'])) {
 			logger('topfetch', LOGGER_DEBUG);
 			// if the thread owner is a connnection, we will already receive any additional comments to their posts
@@ -2883,23 +2786,6 @@ class Activity {
 			sync_an_item($channel['channel_id'], $x['item_id']);
 		}
 
-		// TODO: remove
-		/*if (is_array($x) && $x['item_id']) {
-			if ($is_parent) {
-				if ($item['owner_xchan'] === $channel['channel_hash']) {
-					// We are the owner of this conversation, so send all received comments back downstream
-					Master::Summon(['Notifier', 'comment-import', $x['item_id']]);
-				}
-				$r = q("select * from item where id = %d limit 1",
-					intval($x['item_id'])
-				);
-				if ($r) {
-					send_status_notifications($x['item_id'], $r[0]);
-				}
-			}
-			sync_an_item($channel['channel_id'], $x['item_id']);
-		}*/
-
 	}
 
 	static public function fetch_and_store_parents($channel, $observer_hash, $item, $force = false) {
@@ -2963,7 +2849,7 @@ class Activity {
 					break;
 				}
 
-				array_unshift($p,[ $a, $item ]);
+				array_unshift($p, [$a, $item]);
 
 				if ($item['parent_mid'] === $item['mid']) {
 					break;
@@ -3386,7 +3272,6 @@ class Activity {
 		return;
 	}
 
-
 	static function bb_attach($attach, $body) {
 
 		$ret = false;
@@ -3412,9 +3297,7 @@ class Activity {
 		return $ret;
 	}
 
-
 	// check for the existence of existing media link in body
-
 	static function media_not_in_body($s, $body) {
 
 		if ((strpos($body, ']' . $s . '[/img]') === false) &&
@@ -3426,7 +3309,6 @@ class Activity {
 		return false;
 	}
 
-
 	static function bb_content($content, $field) {
 
 		require_once('include/html2bbcode.php');
@@ -3455,7 +3337,6 @@ class Activity {
 		return $ret;
 	}
 
-
 	static function get_content($act) {
 
 		$content = [];
@@ -3511,7 +3392,6 @@ class Activity {
 		return $content;
 	}
 
-
 	static function get_textfield($act, $field) {
 
 		$content = false;
@@ -3528,7 +3408,6 @@ class Activity {
 
 	// Find either an Authorization: Bearer token or 'token' request variable
 	// in the current web request and return it
-
 	static function token_from_request() {
 
 		foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $s) {
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index f877fbb45..ba7ec0c65 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -7,25 +7,24 @@ namespace Zotlabs\Lib;
  *
  * Parses an ActivityStream JSON string.
  */
-
 class ActivityStreams {
 
-	public $raw        = null;
-	public $data       = null;
-	public $valid      = false;
-	public $deleted    = false;
-	public $id         = '';
-	public $parent_id  = '';
-	public $type       = '';
-	public $actor      = null;
-	public $obj        = null;
-	public $tgt        = null;
-	public $origin     = null;
-	public $owner      = null;
-	public $signer     = null;
-	public $ldsig      = null;
-	public $sigok      = false;
-	public $recips     = null;
+	public $raw = null;
+	public $data = null;
+	public $valid = false;
+	public $deleted = false;
+	public $id = '';
+	public $parent_id = '';
+	public $type = '';
+	public $actor = null;
+	public $obj = null;
+	public $tgt = null;
+	public $origin = null;
+	public $owner = null;
+	public $signer = null;
+	public $ldsig = null;
+	public $sigok = false;
+	public $recips = null;
 	public $raw_recips = null;
 
 	/**
@@ -37,29 +36,29 @@ class ActivityStreams {
 	 */
 	function __construct($string) {
 
-		$this->raw  = $string;
+		$this->raw = $string;
 
-		if(is_array($string)) {
+		if (is_array($string)) {
 			$this->data = $string;
 		}
 		else {
 			$this->data = json_decode($string, true);
 		}
 
-		if($this->data) {
+		if ($this->data) {
 
 			// verify and unpack JSalmon signature if present
 
-			if(is_array($this->data) && array_key_exists('signed',$this->data)) {
+			if (is_array($this->data) && array_key_exists('signed', $this->data)) {
 				$ret = JSalmon::verify($this->data);
 				$tmp = JSalmon::unpack($this->data['data']);
-				if($ret && $ret['success']) {
-					if($ret['signer']) {
-						$saved = json_encode($this->data,JSON_UNESCAPED_SLASHES);
-						$this->data = $tmp;
-						$this->data['signer'] = $ret['signer'];
+				if ($ret && $ret['success']) {
+					if ($ret['signer']) {
+						$saved                     = json_encode($this->data, JSON_UNESCAPED_SLASHES);
+						$this->data                = $tmp;
+						$this->data['signer']      = $ret['signer'];
 						$this->data['signed_data'] = $saved;
-						if($ret['hubloc']) {
+						if ($ret['hubloc']) {
 							$this->data['hubloc'] = $ret['hubloc'];
 						}
 					}
@@ -68,57 +67,57 @@ class ActivityStreams {
 
 			$this->valid = true;
 
-			if(array_key_exists('type',$this->data) && array_key_exists('actor',$this->data) && array_key_exists('object',$this->data)) {
-				if($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) {
+			if (array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) {
+				if ($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) {
 					$this->deleted = $this->data['actor'];
-					$this->valid = false;
+					$this->valid   = false;
 				}
 			}
 
 		}
 
-		if($this->is_valid()) {
+		if ($this->is_valid()) {
 			$this->id     = $this->get_property_obj('id');
 			$this->type   = $this->get_primary_type();
-			$this->actor  = $this->get_actor('actor','','');
+			$this->actor  = $this->get_actor('actor', '', '');
 			$this->obj    = $this->get_compound_property('object');
 			$this->tgt    = $this->get_compound_property('target');
 			$this->origin = $this->get_compound_property('origin');
 			$this->recips = $this->collect_recips();
 
 			$this->ldsig = $this->get_compound_property('signature');
-			if($this->ldsig) {
-				$this->signer = $this->get_compound_property('creator',$this->ldsig);
-				if($this->signer && is_array($this->signer) && array_key_exists('publicKey',$this->signer) && is_array($this->signer['publicKey']) && $this->signer['publicKey']['publicKeyPem']) {
-					$this->sigok = LDSignatures::verify($this->data,$this->signer['publicKey']['publicKeyPem']);
+			if ($this->ldsig) {
+				$this->signer = $this->get_compound_property('creator', $this->ldsig);
+				if ($this->signer && is_array($this->signer) && array_key_exists('publicKey', $this->signer) && is_array($this->signer['publicKey']) && $this->signer['publicKey']['publicKeyPem']) {
+					$this->sigok = LDSignatures::verify($this->data, $this->signer['publicKey']['publicKeyPem']);
 				}
 			}
 
-			if(! $this->obj) {
-				$this->obj = $this->data;
+			if (!$this->obj) {
+				$this->obj  = $this->data;
 				$this->type = 'Create';
-				if(! $this->actor) {
-					$this->actor = $this->get_actor('attributedTo',$this->obj);
+				if (!$this->actor) {
+					$this->actor = $this->get_actor('attributedTo', $this->obj);
 				}
 			}
 
 			// fetch recursive or embedded activities
 
-			if ($this->obj && is_array($this->obj) && array_key_exists('object',$this->obj)) {
+			if ($this->obj && is_array($this->obj) && array_key_exists('object', $this->obj)) {
 				$this->obj['object'] = $this->get_compound_property($this->obj['object']);
 			}
 
-			if($this->obj && is_array($this->obj) && $this->obj['actor'])
-				$this->obj['actor'] = $this->get_actor('actor',$this->obj);
-			if($this->tgt && is_array($this->tgt) && $this->tgt['actor'])
-				$this->tgt['actor'] = $this->get_actor('actor',$this->tgt);
+			if ($this->obj && is_array($this->obj) && $this->obj['actor'])
+				$this->obj['actor'] = $this->get_actor('actor', $this->obj);
+			if ($this->tgt && is_array($this->tgt) && $this->tgt['actor'])
+				$this->tgt['actor'] = $this->get_actor('actor', $this->tgt);
 
 			$this->parent_id = $this->get_property_obj('inReplyTo');
 
-			if((! $this->parent_id) && is_array($this->obj)) {
+			if ((!$this->parent_id) && is_array($this->obj)) {
 				$this->parent_id = $this->obj['inReplyTo'];
 			}
-			if((! $this->parent_id) && is_array($this->obj)) {
+			if ((!$this->parent_id) && is_array($this->obj)) {
 				$this->parent_id = $this->obj['id'];
 			}
 		}
@@ -147,19 +146,19 @@ class ActivityStreams {
 	function collect_recips($base = '', $namespace = '') {
 		$x = [];
 
-		$fields = [ 'to', 'cc', 'bto', 'bcc', 'audience'];
-		foreach($fields as $f) {
+		$fields = ['to', 'cc', 'bto', 'bcc', 'audience'];
+		foreach ($fields as $f) {
 			$y = $this->get_compound_property($f, $base, $namespace);
-			if($y) {
-				if (! is_array($this->raw_recips)) {
+			if ($y) {
+				if (!is_array($this->raw_recips)) {
 					$this->raw_recips = [];
 				}
 
-				if (! is_array($y)) {
-					$y = [ $y ];
+				if (!is_array($y)) {
+					$y = [$y];
 				}
 				$this->raw_recips[$f] = $y;
-				$x = array_merge($x, $y);
+				$x                    = array_merge($x, $y);
 			}
 		}
 // not yet ready for prime time
@@ -167,21 +166,21 @@ class ActivityStreams {
 		return $x;
 	}
 
-	function expand($arr,$base = '',$namespace = '') {
+	function expand($arr, $base = '', $namespace = '') {
 		$ret = [];
 
 		// right now use a hardwired recursion depth of 5
 
-		for($z = 0; $z < 5; $z ++) {
-			if(is_array($arr) && $arr) {
-				foreach($arr as $a) {
-					if(is_array($a)) {
+		for ($z = 0; $z < 5; $z++) {
+			if (is_array($arr) && $arr) {
+				foreach ($arr as $a) {
+					if (is_array($a)) {
 						$ret[] = $a;
 					}
 					else {
-						$x = $this->get_compound_property($a,$base,$namespace);
-						if($x) {
-							$ret = array_merge($ret,$x);
+						$x = $this->get_compound_property($a, $base, $namespace);
+						if ($x) {
+							$ret = array_merge($ret, $x);
 						}
 					}
 				}
@@ -202,33 +201,33 @@ class ActivityStreams {
 	 */
 	function get_namespace($base, $namespace) {
 
-		if(! $namespace)
+		if (!$namespace)
 			return '';
 
 		$key = null;
 
-		foreach( [ $this->data, $base ] as $b ) {
-			if(! $b)
+		foreach ([$this->data, $base] as $b) {
+			if (!$b)
 				continue;
 
-			if(array_key_exists('@context', $b)) {
-				if(is_array($b['@context'])) {
-					foreach($b['@context'] as $ns) {
-						if(is_array($ns)) {
-							foreach($ns as $k => $v) {
-								if($namespace === $v)
+			if (array_key_exists('@context', $b)) {
+				if (is_array($b['@context'])) {
+					foreach ($b['@context'] as $ns) {
+						if (is_array($ns)) {
+							foreach ($ns as $k => $v) {
+								if ($namespace === $v)
 									$key = $k;
 							}
 						}
 						else {
-							if($namespace === $ns) {
+							if ($namespace === $ns) {
 								$key = '';
 							}
 						}
 					}
 				}
 				else {
-					if($namespace === $b['@context']) {
+					if ($namespace === $b['@context']) {
 						$key = '';
 					}
 				}
@@ -248,14 +247,14 @@ class ActivityStreams {
 	 */
 	function get_property_obj($property, $base = '', $namespace = '') {
 		$prefix = $this->get_namespace($base, $namespace);
-		if($prefix === null)
+		if ($prefix === null)
 			return null;
 
-		$base = (($base) ? $base : $this->data);
+		$base     = (($base) ? $base : $this->data);
 		$propname = (($prefix) ? $prefix . ':' : '') . $property;
 
-		if(! is_array($base)) {
-			btlogger('not an array: ' . print_r($base,true));
+		if (!is_array($base)) {
+			btlogger('not an array: ' . print_r($base, true));
 			return null;
 		}
 
@@ -279,14 +278,14 @@ class ActivityStreams {
 	}
 
 	static function is_an_actor($s) {
-		return (in_array($s, [ 'Application','Group','Organization','Person','Service' ]));
+		return (in_array($s, ['Application', 'Group', 'Organization', 'Person', 'Service']));
 	}
 
 	static function is_response_activity($s) {
-		if (! $s) {
+		if (!$s) {
 			return false;
 		}
-		return (in_array($s, [ 'Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact' ]));
+		return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
 	}
 
 	/**
@@ -298,9 +297,9 @@ class ActivityStreams {
 	 * @return NULL|mixed
 	 */
 
-	function get_actor($property,$base='',$namespace = '') {
+	function get_actor($property, $base = '', $namespace = '') {
 		$x = $this->get_property_obj($property, $base, $namespace);
-		if($this->is_url($x)) {
+		if ($this->is_url($x)) {
 
 			// SECURITY: If we have already stored the actor profile, re-generate it
 			// from cached data - don't refetch it from the network
@@ -308,15 +307,15 @@ class ActivityStreams {
 			$r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' limit 1",
 				dbesc($x)
 			);
-			if($r) {
-				$y = Activity::encode_person($r[0]);
+			if ($r) {
+				$y           = Activity::encode_person($r[0]);
 				$y['cached'] = true;
 				return $y;
 			}
 		}
-		$actor = $this->get_compound_property($property,$base,$namespace,true);
-		if(is_array($actor) && self::is_an_actor($actor['type'])) {
-			if(array_key_exists('id',$actor) && (! array_key_exists('inbox',$actor))) {
+		$actor = $this->get_compound_property($property, $base, $namespace, true);
+		if (is_array($actor) && self::is_an_actor($actor['type'])) {
+			if (array_key_exists('id', $actor) && (!array_key_exists('inbox', $actor))) {
 				$actor = $this->fetch_property($actor['id']);
 			}
 			return $actor;
@@ -336,7 +335,7 @@ class ActivityStreams {
 	 */
 	function get_compound_property($property, $base = '', $namespace = '', $first = false) {
 		$x = $this->get_property_obj($property, $base, $namespace);
-		if($this->is_url($x)) {
+		if ($this->is_url($x)) {
 			$y = $this->fetch_property($x);
 			if (is_array($y)) {
 				$x = $y;
@@ -345,22 +344,22 @@ class ActivityStreams {
 
 		// verify and unpack JSalmon signature if present
 
-		if(is_array($x) && array_key_exists('signed',$x)) {
+		if (is_array($x) && array_key_exists('signed', $x)) {
 			$ret = JSalmon::verify($x);
 			$tmp = JSalmon::unpack($x['data']);
-			if($ret && $ret['success']) {
-				if($ret['signer']) {
-					$saved = json_encode($x,JSON_UNESCAPED_SLASHES);
-					$x = $tmp;
-					$x['signer'] = $ret['signer'];
+			if ($ret && $ret['success']) {
+				if ($ret['signer']) {
+					$saved            = json_encode($x, JSON_UNESCAPED_SLASHES);
+					$x                = $tmp;
+					$x['signer']      = $ret['signer'];
 					$x['signed_data'] = $saved;
-					if($ret['hubloc']) {
+					if ($ret['hubloc']) {
 						$x['hubloc'] = $ret['hubloc'];
 					}
 				}
 			}
 		}
-		if($first && is_array($x) && array_key_exists(0,$x)) {
+		if ($first && is_array($x) && array_key_exists(0, $x)) {
 			return $x[0];
 		}
 
@@ -374,7 +373,7 @@ class ActivityStreams {
 	 * @return boolean
 	 */
 	function is_url($url) {
-		if(($url) && (! is_array($url)) && (strpos($url, 'http') === 0)) {
+		if (($url) && (!is_array($url)) && (strpos($url, 'http') === 0)) {
 			return true;
 		}
 
@@ -389,13 +388,13 @@ class ActivityStreams {
 	 * @return NULL|mixed
 	 */
 	function get_primary_type($base = '', $namespace = '') {
-		if(! $base)
+		if (!$base)
 			$base = $this->data;
 
 		$x = $this->get_property_obj('type', $base, $namespace);
-		if(is_array($x)) {
-			foreach($x as $y) {
-				if(strpos($y, ':') === false) {
+		if (is_array($x)) {
+			foreach ($x as $y) {
+				if (strpos($y, ':') === false) {
 					return $y;
 				}
 			}
@@ -409,15 +408,32 @@ class ActivityStreams {
 		return $x;
 	}
 
-	static function is_as_request() {
+	static function is_as_request($channel = null) {
+
+		$hookdata = [];
+		if ($channel)
+			$hookdata['channel'] = $channel;
+
+		$hookdata['data'] = ['application/x-zot-activity+json'];
+
+		call_hooks('is_as_request', $hookdata);
+
+		$x = getBestSupportedMimeType($hookdata['data']);
+		return (($x) ? true : false);
+
+	}
+
+	static function get_accept_header_string($channel = null) {
+
+		$hookdata = [];
+		if ($channel)
+			$hookdata['channel'] = $channel;
+
+		$hookdata['data'] = 'application/x-zot-activity+json';
 
-		$x = getBestSupportedMimeType([
-			'application/ld+json;profile="https://www.w3.org/ns/activitystreams"',
-			'application/activity+json',
-			'application/ld+json;profile="http://www.w3.org/ns/activitystreams"'
-		]);
+		call_hooks('get_accept_header_string', $hookdata);
 
-		return(($x) ? true : false);
+		return $hookdata['data'];
 
 	}
 
diff --git a/Zotlabs/Lib/ZotURL.php b/Zotlabs/Lib/ZotURL.php
index fa3959f69..6bb01fd7a 100644
--- a/Zotlabs/Lib/ZotURL.php
+++ b/Zotlabs/Lib/ZotURL.php
@@ -21,12 +21,10 @@ class ZotURL {
 		}
 
 		$portable_url = substr($url,6);
-		$u = explode('/',$portable_url);		
+		$u = explode('/',$portable_url);
 		$portable_id = $u[0];
-		hz_syslog(print_r($u,true));
-
 		$hosts = self::lookup($portable_id);
-		hz_syslog(print_r($hosts,true));
+
 		if(! $hosts) {
 			return $ret;
 		}
@@ -40,8 +38,8 @@ class ZotURL {
 
 			if($channel && $m) {
 
-				$headers = [ 
-					'Accept'           => 'application/x-zot+json', 
+				$headers = [
+					'Accept'           => 'application/x-zot+json',
 					'Content-Type'     => 'application/x-zot+json',
 					'X-Zot-Token'      => random_string(),
 					'Digest'           => HTTPSig::generate_digest_header($data),
@@ -51,9 +49,9 @@ class ZotURL {
 				$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),false);
 			}
 			else {
-				$h = [ 'Accept: application/x-zot+json' ]; 
+				$h = [ 'Accept: application/x-zot+json' ];
 			}
-				
+
 			$result = [];
 
 			$redirects = 0;