1 files changed, 21 insertions, 32 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 844dc5905..1e0ce6ae2 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -172,10 +172,6 @@ class Activity {
 	}
 
 	static function fetch_person($x) {
-		return self::fetch_profile($x);
-	}
-
-	static function fetch_profile($x) {
 		$r = q("select * from xchan where xchan_url = '%s' limit 1",
 			dbesc($x['id'])
 		);
@@ -189,7 +185,14 @@ class Activity {
 			return [];
 
 		return self::encode_person($r[0]);
+	}
 
+	static function fetch_profile($x) {
+		if (isset($x['describes'])) {
+			return $x;
+		}
+
+		return [];
 	}
 
 	static function fetch_thing($x) {
@@ -448,13 +451,7 @@ class Activity {
 
 		$ret = [];
 
-		if ($i['verb'] === ACTIVITY_FRIEND) {
-			// Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note
-			$objtype = 'Note';
-		}
-		else {
-			$objtype = self::activity_obj_mapper($i['obj_type']);
-		}
+		$objtype = self::activity_obj_mapper($i['obj_type']);
 
 		if (intval($i['item_deleted'])) {
 			$ret['type']       = 'Tombstone';
@@ -789,11 +786,6 @@ class Activity {
 		$ret   = [];
 		$reply = false;
 
-		if ($i['verb'] === ACTIVITY_FRIEND) {
-			// Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note
-			$ret['obj'] = [];
-		}
-
 		$ret['type'] = self::activity_mapper($i['verb']);
 
 		if ((isset($i['item_deleted']) && intval($i['item_deleted'])) && !$recurse) {
@@ -989,6 +981,7 @@ class Activity {
 			$ret['to'] = [ACTIVITY_PUBLIC_INBOX];
 		}
 
+
 		$hookinfo = [
 			'item' => $i,
 			'encoded' => $ret
@@ -1227,20 +1220,6 @@ class Activity {
 			return $acts[$verb];
 		}
 
-		// Reactions will just map to normal activities
-
-		if (strpos($verb, ACTIVITY_REACT) !== false)
-			return 'Create';
-
-		if (strpos($verb, ACTIVITY_MOOD) !== false)
-			return 'Create';
-
-		if (strpos($verb, ACTIVITY_FRIEND) !== false)
-			return 'Create';
-
-		if (strpos($verb, ACTIVITY_POKE) !== false)
-			return 'Activity';
-
 		// We should return false, however this will trigger an uncaught execption  and crash
 		// the delivery system if encountered by the JSON-LDSignature library
 
@@ -2074,6 +2053,10 @@ class Activity {
 			$s['mid'] = $act->obj['data']['id'];
 		}
 
+		if ($act->objprop('type') === 'Profile') {
+			$s['mid'] = $act->id;
+		}
+
 		if (!$s['mid']) {
 			return false;
 		}
@@ -2178,6 +2161,7 @@ class Activity {
 				$content['content'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $act->obj['type']);
 			}
 
+			// TODO: Deprecated
 			if ($act->type === 'emojiReaction') {
 				$content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';');
 			}
@@ -2317,6 +2301,12 @@ class Activity {
 
 		if (!$response_activity) {
 
+			if ($act->objprop('type') === 'Profile') {
+				$s['parent_mid'] = $s['mid'];
+				$s['item_thread_top'] = 1;
+			}
+
+
 			// we will need a hook here to extract magnet links e.g. peertube
 			// right now just link to the largest mp4 we find that will fit in our
 			// standard content region
@@ -2462,7 +2452,6 @@ class Activity {
 				}
 			}
 
-
 			if ($act->objprop('type') === 'Page' && !$s['body']) {
 
 				$ptr  = null;
@@ -2503,7 +2492,7 @@ class Activity {
 			}
 		}
 
-		if (in_array($act->objprop('type', ''), ['Note', 'Article', 'Page'])) {
+		if (in_array($act->objprop('type'), ['Note', 'Article', 'Page'])) {
 			$ptr = null;
 
 			if (array_key_exists('url', $act->obj)) {