fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream.

1 files changed, 5 insertions, 2 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 8cfa18997..259419f54 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1411,6 +1411,9 @@ class Activity {
 		$s['owner_xchan']  = $act->actor['id'];
 		$s['author_xchan'] = $act->actor['id'];
 
+		// ensure we store the original actor
+		self::actor_store($act->actor['id'],$act->actor);
+
 		$s['mid']        = $act->obj['id'];
 		$s['parent_mid'] = $act->parent_id;
 
@@ -1483,7 +1486,8 @@ class Activity {
 
 		$s['verb']     = self::activity_decode_mapper($act->type);
 
-		if($act->type === 'Tombstone') {
+
+		if($act->type === 'Tombstone' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) {
 			$s['item_deleted'] = 1;
 		}
 
@@ -1492,7 +1496,6 @@ class Activity {
 			$s['obj_type'] = ACTIVITY_OBJ_COMMENT;
 		}
 
-
 		if($act->obj['type'] === 'Event') {
 			$s['obj'] = [];
 			$s['obj']['asld'] = $act->obj;