Merge branch '4.4RC'4.4

8 files changed, 321 insertions, 36 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 0808fe33f..f86dc1604 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -3,7 +3,7 @@
 namespace Zotlabs\Lib;
 
 use Zotlabs\Daemon\Master;
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 
 require_once('include/event.php');
 
@@ -75,7 +75,7 @@ class Activity {
 
 		if($x['success']) {
 			$y = json_decode($x['body'],true);
-			logger('returned: ' . json_encode($y,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
+			logger('returned: ' . json_encode($y,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DEBUG);
 			return json_decode($x['body'], true);
 		}
 		else {
@@ -312,6 +312,10 @@ class Activity {
 			}
 		}
 
+		if (intval($i['item_private']) === 2) {
+			$ret['directMessage'] = true;
+		}
+
 		$ret['attributedTo'] = $i['author']['xchan_url'];
 
 		if($i['id'] != $i['parent']) {
@@ -357,7 +361,7 @@ class Activity {
 
 				switch($t['type']) {
 					case 'Hashtag':
-						$ret[] = [ 'ttype' => TERM_HASHTAG, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'],0,1) === '#') ? substr($t['name'],1) : $t['name']) ];
+						$ret[] = [ 'ttype' => TERM_HASHTAG, 'url' => ((isset($t['href'])) ? $t['href'] : $t['id']), 'term' => escape_tags((substr($t['name'],0,1) === '#') ? substr($t['name'],1) : $t['name']) ];
 						break;
 
 					case 'Mention':
@@ -388,9 +392,9 @@ class Activity {
 			foreach($item['term'] as $t) {
 				switch($t['ttype']) {
 					case TERM_HASHTAG:
-						// An id is required so if we don't have a url in the taxonomy, ignore it and keep going.
+						// href is required so if we don't have a url in the taxonomy, ignore it and keep going.
 						if($t['url']) {
-							$ret[] = [ 'id' => $t['url'], 'name' => '#' . $t['term'] ];
+							$ret[] = [ 'type' => 'Hashtag', 'href' => $t['url'], 'name' => '#' . $t['term'] ];
 						}
 						break;
 
@@ -483,6 +487,19 @@ class Activity {
 
 		$ret['type'] = self::activity_mapper($i['verb']);
 
+		if($ret['type'] === 'emojiReaction') {
+			// There may not be an object for these items for legacy reasons - it should be the conversation parent.
+			$p = q("select * from item where mid = '%s' and uid = %d",
+				dbesc($i['parent_mid']),
+				intval($i['uid'])
+			);
+			if($p) {
+				xchan_query($p,true);
+				$p = fetch_post_tags($p,true);
+				$i['obj'] = self::encode_item($p[0]);
+			}
+		}
+
 
 		$ret['id']   = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/activity/' . urlencode($i['mid']));
 
@@ -1415,6 +1432,11 @@ class Activity {
 		if($act->recips && (! in_array(ACTIVITY_PUBLIC_INBOX,$act->recips)))
 			$s['item_private'] = 1;
 
+
+		if (array_key_exists('directMessage',$act->obj) && intval($act->obj['directMessage'])) {
+			$s['item_private'] = 2;
+		}
+
 		set_iconfig($s,'activitypub','recips',$act->raw_recips);
 		if($parent) {
 			set_iconfig($s,'activitypub','rawmsg',$act->raw,1);
@@ -1747,14 +1769,14 @@ class Activity {
 						}
 						foreach($ptr as $vurl) {
 							if(strpos($s['body'],$vurl['href']) === false) {
-								$s['body'] .= "\n\n" . '[zmg]' . $vurl['href'] . '[/zmg]';
+								$s['body'] .= '[zmg]' . $vurl['href'] . '[/zmg]' . "\n\n" . $s['body'];
 								break;
 							}
 						}
 					}
 					elseif(is_string($act->obj['url'])) {
 						if(strpos($s['body'],$act->obj['url']) === false) {
-							$s['body'] .= "\n\n" . '[zmg]' . $act->obj['url'] . '[/zmg]';
+							$s['body'] .= '[zmg]' . $act->obj['url'] . '[/zmg]' . "\n\n" . $s['body'];
 						}
 					}
 				}
@@ -1835,7 +1857,8 @@ class Activity {
 			$s['item_private'] = 1;
 
 		set_iconfig($s,'activitypub','recips',$act->raw_recips);
-		// @FIXME: $parent is not defined
+
+		$parent = (($s['parent_mid'] && $s['parent_mid'] === $s['mid']) ? true : false);
 		if($parent) {
 			set_iconfig($s,'activitypub','rawmsg',$act->raw,1);
 		}
@@ -1844,6 +1867,265 @@ class Activity {
 
 	}
 
+	static function store($channel,$observer_hash,$act,$item,$fetch_parents = true) {
+
+		$is_sys_channel = is_sys_channel($channel['channel_id']);
+
+		// Mastodon only allows visibility in public timelines if the public inbox is listed in the 'to' field.
+		// They are hidden in the public timeline if the public inbox is listed in the 'cc' field.
+		// This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point.
+
+		$pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to'])) ? true : false);
+		$is_parent = (($item['parent_mid'] && $item['parent_mid'] === $item['mid']) ? true : false);
+
+		if($is_parent && (! perm_is_allowed($channel['channel_id'],$observer_hash,'send_stream') && ! ($is_sys_channel && $pubstream))) {
+			logger('no permission');
+			return;
+		}
+
+		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'];
+		$s['uuid'] = '';
+
+		// Friendica sends the diaspora guid in a nonstandard field via AP
+		if($act->obj['diaspora:guid'])
+			$s['uuid'] = $act->obj['diaspora:guid'];
+
+		if(! ( $item['author_xchan'] && $item['owner_xchan'])) {
+			logger('owner or author missing.');
+			return;
+		}
+
+		if($channel['channel_system']) {
+			if(! MessageFilter::evaluate($item,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) {
+				logger('post is filtered');
+				return;
+			}
+		}
+
+		$abook = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
+			dbesc($observer_hash),
+			intval($channel['channel_id'])
+		);
+
+		if($abook) {
+			if(! post_is_importable($item,$abook[0])) {
+				logger('post is filtered');
+				return;
+			}
+		}
+
+
+		if($act->obj['conversation']) {
+			set_iconfig($item,'ostatus','conversation',$act->obj['conversation'],1);
+		}
+
+		// This isn't perfect but the best we can do for now.
+
+		$item['comment_policy'] = 'authenticated';
+
+		set_iconfig($item,'activitypub','recips',$act->raw_recips);
+
+		if(! $is_parent) {
+			$p = q("select parent_mid 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,$act,$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]['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'];
+		}
+
+		$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(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(array('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,$act,$item) {
+
+		logger('fetching parents');
+
+		$p = [];
+
+		$current_act = $act;
+		$current_item = $item;
+
+		while($current_item['parent_mid'] !== $current_item['mid']) {
+			$n = ActivityStreams::fetch($current_item['parent_mid'], $channel);
+			if(! $n) {
+				break;
+			}
+			$a = new ActivityStreams($n);
+
+			//logger($a->debug());
+
+			if(! $a->is_valid()) {
+				break;
+			}
+
+			$replies = null;
+			if(isset($a->obj['replies']['first']['items'])) {
+				$replies = $a->obj['replies']['first']['items'];
+				// we already have this one
+				array_diff($replies, [$current_item['mid']]);
+			}
+
+			$item = null;
+
+			switch($a->type) {
+				case 'Create':
+				case 'Update':
+				case 'Like':
+				case 'Dislike':
+				case 'Announce':
+					$item = self::decode_note($a);
+					break;
+				default:
+					break;
+
+			}
+			if(! $item) {
+				break;
+			}
+
+			array_unshift($p,[ $a, $item, $replies]);
+
+			if($item['parent_mid'] === $item['mid'] || count($p) > 20) {
+				break;
+			}
+
+			$current_act = $a;
+			$current_item = $item;
+		}
+
+		if($p) {
+			foreach($p as $pv) {
+				self::store($channel,$pv[0]->actor['id'],$pv[0],$pv[1],false);
+				if($pv[2])
+					self::fetch_and_store_replies($channel, $pv[2]);
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	static public function fetch_and_store_replies($channel, $arr) {
+
+		logger('fetching replies');
+
+		$p = [];
+
+		foreach($arr as $url) {
+
+			$n = ActivityStreams::fetch($url, $channel);
+			if(! $n) {
+				break;
+			}
+
+			$a = new ActivityStreams($n);
+
+			if(! $a->is_valid()) {
+				break;
+			}
+
+			$item = null;
+
+			switch($a->type) {
+				case 'Create':
+				case 'Update':
+				case 'Like':
+				case 'Dislike':
+				case 'Announce':
+					$item = self::decode_note($a);
+					break;
+				default:
+					break;
+			}
+			if(! $item) {
+				break;
+			}
+
+			array_unshift($p,[ $a, $item ]);
+
+		}
+
+		if($p) {
+			foreach($p as $pv) {
+				self::store($channel,$pv[0]->actor['id'],$pv[0],$pv[1],false);
+			}
+		}
+
+	}
+
 	static function announce_note($channel,$observer_hash,$act) {
 
 		$s = [];
@@ -1964,25 +2246,21 @@ class Activity {
 			$x = item_store($s);
 		}
 
-
 		if(is_array($x) && $x['item_id']) {
-			// @FIXME: $parent is not defined
-			if($parent) {
-				if($s['owner_xchan'] === $channel['channel_hash']) {
-					// We are the owner of this conversation, so send all received comments back downstream
-					Master::Summon(array('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]);
-				}
+			if($s['owner_xchan'] === $channel['channel_hash']) {
+				// We are the owner of this conversation, so send all received comments back downstream
+				Master::Summon(array('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 function like_note($channel,$observer_hash,$act) {
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index a7082f45a..92a488f67 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -807,6 +807,11 @@ class Enotify {
 			$itemem_text = (($item['item_thread_top'])
 				? t('created a new post')
 				: sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name']));
+
+			if($item['verb'] === ACTIVITY_SHARE) {
+				$itemem_text = sprintf( t('repeated %s\'s post'), $item['author']['xchan_name']);
+			}
+
 		}
 
 		$edit = false;
@@ -825,12 +830,14 @@ class Enotify {
 
 		// convert this logic into a json array just like the system notifications
 
+		$who = (($item['verb'] === ACTIVITY_SHARE) ? 'owner' : 'author');
+
 		$x = array(
 			'notify_link' => $item['llink'],
-			'name' => $item['author']['xchan_name'],
-			'addr' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
-			'url' => $item['author']['xchan_url'],
-			'photo' => $item['author']['xchan_photo_s'],
+			'name' => $item[$who]['xchan_name'],
+			'addr' => (($item[$who]['xchan_addr']) ? $item[$who]['xchan_addr'] : $item[$who]['xchan_url']),
+			'url' => $item[$who]['xchan_url'],
+			'photo' => $item[$who]['xchan_photo_s'],
 			'when' => relative_date(($edit)? $item['edited'] : $item['created']), 
 			'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'),
 			'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
@@ -838,7 +845,7 @@ class Enotify {
 			'thread_top' => (($item['item_thread_top']) ? true : false),
 			'message' => strip_tags(bbcode($itemem_text)),
 			// these are for the superblock addon
-			'hash' => $item['author']['xchan_hash'],
+			'hash' => $item[$who]['xchan_hash'],
 			'uid' => local_channel(),
 			'display' => true
 		);
diff --git a/Zotlabs/Lib/JSalmon.php b/Zotlabs/Lib/JSalmon.php
index f35bf6235..bed748432 100644
--- a/Zotlabs/Lib/JSalmon.php
+++ b/Zotlabs/Lib/JSalmon.php
@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 
 class JSalmon {
 
diff --git a/Zotlabs/Lib/LDSignatures.php b/Zotlabs/Lib/LDSignatures.php
index 6d7127cde..b13c4cf4a 100644
--- a/Zotlabs/Lib/LDSignatures.php
+++ b/Zotlabs/Lib/LDSignatures.php
@@ -29,7 +29,7 @@ class LDSignatures {
 		$options = [
 			'type' => 'RsaSignature2017',
 			'nonce' => random_string(64),
-			'creator' => z_root() . '/channel/' . $channel['channel_address'] . '/public_key_pem',
+			'creator' => z_root() . '/channel/' . $channel['channel_address'],
 			'created' => datetime_convert('UTC','UTC', 'now', 'Y-m-d\Th:i:s\Z')
 		];
 
@@ -124,7 +124,7 @@ class LDSignatures {
 			'meDataType'  => $data_type,
 			'meEncoding'  => $encoding,
 			'meAlgorithm' => $algorithm,
-			'meCreator'   => z_root() . '/channel/' . $channel['channel_address'] . '/public_key_pem',
+			'meCreator'   => z_root() . '/channel/' . $channel['channel_address'],
 			'meSignatureValue' => $signature
 		]);
 
@@ -132,4 +132,4 @@ class LDSignatures {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 0ad8afc94..2a13744a3 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 use Zotlabs\Access\Permissions;
 use Zotlabs\Access\PermissionLimits;
 use Zotlabs\Daemon\Master;
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 9161aa182..5e4600df2 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -98,7 +98,7 @@ class ThreadItem {
 		$conv = $this->get_conversation();
 		$observer = $conv->get_observer();
 
-		$lock = ((($item['item_private'] == 1) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+		$lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
 			: false);
@@ -110,7 +110,7 @@ class ThreadItem {
 			$shareable = true;
 
 		$privacy_warning = false;
-		if(($item['item_private'] == 1) && ($item['owner']['xchan_network'] === 'activitypub')) {
+		if(intval($item['item_private']) && ($item['owner']['xchan_network'] === 'activitypub')) {
 			$recips = get_iconfig($item['parent'], 'activitypub', 'recips');
 
 			if(! in_array($observer['xchan_url'], $recips['to']))
diff --git a/Zotlabs/Lib/ZotURL.php b/Zotlabs/Lib/ZotURL.php
index bc14c516a..98d1febe5 100644
--- a/Zotlabs/Lib/ZotURL.php
+++ b/Zotlabs/Lib/ZotURL.php
@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 
 
 class ZotURL {
diff --git a/Zotlabs/Lib/Zotfinger.php b/Zotlabs/Lib/Zotfinger.php
index d094fdc8d..2d2e6796b 100644
--- a/Zotlabs/Lib/Zotfinger.php
+++ b/Zotlabs/Lib/Zotfinger.php
@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 
 class Zotfinger {