resolve merge conflict

1 files changed, 95 insertions, 20 deletions

diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 05134f433..41fec64d8 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1134,6 +1134,7 @@ class Libzot {
 		}
 
 		$message_request = false;
+		$is_collection_operation = false;
 
 
 		$has_data = array_key_exists('data', $env) && $env['data'];
@@ -1141,26 +1142,44 @@ class Libzot {
 
 		$AS = null;
 
+
 		if ($env['encoding'] === 'activitystreams') {
 
 			$AS = new ActivityStreams($data);
+
+			logger($AS->debug(), LOGGER_DATA);
+
 			if (!$AS->is_valid()) {
 				logger('Activity rejected: ' . print_r($data, true));
 				return;
 			}
 
+			// process add/remove from collection separately, as it requires a target.
+			// use the raw object, as it will not include actor expansion
 			if (in_array($AS->type, ['Add', 'Remove'])
 				&& is_array($AS->obj)
 				&& array_key_exists('object', $AS->obj)
 				&& array_key_exists('actor', $AS->obj)
 				&& !empty($AS->tgt)) {
 
-				logger('unsupported collection operation', LOGGER_DEBUG);
-				return;
+				hz_syslog('relayed collection operation', LOGGER_DEBUG);
+				$is_collection_operation = true;
+
+				$original_id = $AS->id;
+				$original_type = $AS->type;
+
+				$raw_activity = $AS->data;
+
+				$AS = new ActivityStreams($raw_activity['object'], portable_id: $env['sender']);
+
+				// Store the original activity id and type for later usage
+				$AS->meta['original_id'] = $original_id;
+				$AS->meta['original_type'] = $original_type;
 			}
 
 			if (is_array($AS->obj)) {
 				$item = Activity::decode_note($AS);
+
 				if (!$item) {
 					logger('Could not decode activity: ' . print_r($AS, true));
 					return;
@@ -1170,7 +1189,7 @@ class Libzot {
 				$item = [];
 			}
 
-			logger($AS->debug(), LOGGER_DATA);
+
 
 		}
 
@@ -1313,7 +1332,12 @@ class Libzot {
 
 				$relay = (($env['type'] === 'response') ? true : false);
 
-				$result = self::process_delivery($env['sender'], $AS, $item, $deliveries, $relay, false, $message_request);
+				if($is_collection_operation)
+					hz_syslog('col');
+				else
+					hz_syslog('not col');
+
+				$result = self::process_delivery($env['sender'], $AS, $item, $deliveries, $relay, false, $message_request, false, $is_collection_operation);
 
 				Activity::init_background_fetch($env['sender']);
 			}
@@ -1529,7 +1553,7 @@ class Libzot {
 	 * @return array
 	 */
 
-	static function process_delivery($sender, $act, $arr, $deliveries, $relay, $public = false, $request = false, $force = false) {
+	static function process_delivery($sender, $act, $arr, $deliveries, $relay, $public = false, $request = false, $force = false, $is_collection_operation = false) {
 		$result = [];
 
 		// We've validated the sender. Now make sure that the sender is the owner or author
@@ -1557,6 +1581,14 @@ class Libzot {
 
 			$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
 
+			$conversation_operation = $is_collection_operation && isset($arr['target']['attributedTo']);
+
+			if (str_contains($arr['tgt_type'], 'Collection') && !$relay && !$conversation_operation) {
+				$DR->update('not a collection activity');
+				$result[] = $DR->get();
+				continue;
+			}
+
 			if (($act) && ($act->obj) && (!is_array($act->obj))) {
 				// The initial object fetch failed using the sys channel credentials.
 				// Try again using the delivery channel credentials.
@@ -1590,6 +1622,8 @@ class Libzot {
 			 *
 			 */
 
+
+
 			if ($sender === $channel['channel_hash'] && $arr['author_xchan'] === $channel['channel_hash'] && !str_starts_with($arr['mid'], z_root())) {
 				$DR->update('self delivery ignored');
 				$result[] = $DR->get();
@@ -1830,6 +1864,12 @@ class Libzot {
 				}
 			}
 
+			if($is_collection_operation)
+				hz_syslog('col1');
+			else
+				hz_syslog('not col1');
+
+
 			// This is used to fetch allow/deny rules if either the sender
 			// or  owner is  a connection. post_is_importable() evaluates all of them
 			$abook = q("select * from abook where abook_channel = %d and ( abook_xchan = '%s' OR abook_xchan = '%s' )",
@@ -1838,11 +1878,15 @@ class Libzot {
 				dbesc($arr['author_xchan'])
 			);
 
-			// reactions such as like and dislike could	have an	mid with /activity/ in it.
+			// Reactions such as like and dislike could	have an	mid with /activity/ in it.
 			// Check for both forms in order to prevent duplicates.
-			$r = q("select * from item where mid in ('%s','%s') and uid = %d limit 1",
-				dbesc($arr['mid']),
-				dbesc(str_replace(z_root() . '/activity/', z_root() . '/item/', $arr['mid'])),
+
+			// If we process an add/remove activity, look for the original activity id instead of the object id
+			$sql_mid = (($is_collection_operation && $relay && $channel['channel_hash'] === $arr['owner_xchan']) ? $act->meta['original_id'] : $arr['mid']);
+
+			$r = q("select * from item where mid in ('%s', '%s') and uid = %d limit 1",
+				dbesc($sql_mid),
+				dbesc(reverse_activity_mid($sql_mid)),
 				intval($channel['channel_id'])
 			);
 
@@ -1871,21 +1915,29 @@ class Libzot {
 						$DR->update('update ignored');
 						$result[] = $DR->get();
 					}
+
+					if ($relay && $channel['channel_hash'] === $item_result['item']['owner_xchan'] && $item_result['item']['verb'] !== 'Add' && !$is_collection_operation) {
+						$approval = Activity::addToCollection($channel, $act->data, $item_result['item']['parent_mid'], $item_result['item'], deliver: false);
+					}
+
 				}
 				else {
 					$DR->update('update ignored');
 					$result[] = $DR->get();
 
-					// We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
+					// We need this line to ensure wall-to-wall comments and add/remove activities are relayed (by falling through to the relay bit),
 					// and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
 					if (!intval($r[0]['item_origin']))
 						continue;
 				}
+
+
 			}
 			else {
 				$arr['aid'] = $channel['channel_account_id'];
 				$arr['uid'] = $channel['channel_id'];
 
+
 				// if it's a sourced post, call the post_local hooks as if it were
 				// posted locally so that crosspost connectors will be triggered.
 				$item_source = check_item_source($arr['uid'], $arr);
@@ -1914,10 +1966,15 @@ class Libzot {
 				}
 
 				if (post_is_importable($arr['uid'], $arr, $abook)) {
-					$item_result = item_store($arr);
+					$item_result = item_store($arr, addAndSync: false);
+
 					if ($item_result['success']) {
 						$item_id = $item_result['item_id'];
 
+						if ($relay && $channel['channel_hash'] === $item_result['item']['owner_xchan'] && $item_result['item']['verb'] !== 'Add' && !$is_collection_operation) {
+							$approval = Activity::addToCollection($channel, $act->data, $item_result['item']['parent_mid'], $item_result['item'], deliver: false);
+						}
+
 						if ($item_source && in_array($item_result['item']['obj_type'], ['Event', ACTIVITY_OBJ_EVENT])) {
 							event_addtocal($item_id, $channel['channel_id']);
 						}
@@ -1966,6 +2023,10 @@ class Libzot {
 			if ($relay && $item_id && $stored['item_blocked'] !== ITEM_MODERATED) {
 				logger('Invoking relay');
 				Master::Summon(['Notifier', 'relay', intval($item_id)]);
+				if (!empty($approval) && $approval['item_id']) {
+					Master::Summon(['Notifier', 'relay', intval($approval['item_id'])]);
+				}
+
 				$DR->addto_update('relayed');
 				$result[] = $DR->get();
 			}
@@ -2019,12 +2080,7 @@ class Libzot {
 
 			$AS = new ActivityStreams($activity);
 
-			if (!$AS->is_valid()) {
-				logger('Fetched activity rejected: ' . print_r($activity, true));
-				continue;
-			}
-
-			if ($AS->type === 'Announce' && is_array($AS->obj)
+			if ($AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj)
 				&& array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj)) {
 				// This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
 				// Reparse the encapsulated Activity and use that instead
@@ -2032,14 +2088,33 @@ class Libzot {
 				$AS = new ActivityStreams($AS->obj);
 			}
 
+			// process add/remove from collection separately, as it requires a target.
+			// use the raw object, as it will not include actor expansion
 			if (in_array($AS->type, ['Add', 'Remove'])
 				&& is_array($AS->obj)
 				&& array_key_exists('object', $AS->obj)
 				&& array_key_exists('actor', $AS->obj)
 				&& !empty($AS->tgt)) {
 
-				logger('unsupported collection operation', LOGGER_DEBUG);
-				return;
+				logger('relayed collection operation', LOGGER_DEBUG);
+
+				$is_collection_operation = true;
+
+				$original_id = $AS->id;
+				$original_type = $AS->type;
+
+				$raw_activity = $AS->data;
+
+				$AS = new ActivityStreams($raw_activity['object'], portable_id: $env['sender']);
+
+				// Store the original activity id and type for later usage
+				$AS->meta['original_id'] = $original_id;
+				$AS->meta['original_type'] = $original_type;
+			}
+
+			if (!$AS->is_valid()) {
+				logger('Fetched activity rejected: ' . print_r($activity, true));
+				continue;
 			}
 
 			// logger($AS->debug());
@@ -2230,7 +2305,7 @@ class Libzot {
 		}
 
 
-		$x = item_store_update($item);
+		$x = item_store_update($item, addAndSync: false);
 
 		// If we're updating an event that we've saved locally, we store the item info first
 		// because event_addtocal will parse the body to get the 'new' event details