make sure to store target information when decoding and indicate contained conversations with a colored border for now

2 files changed, 12 insertions, 1 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 9ba145bfa..58f63a2a5 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -2399,6 +2399,16 @@ class Activity {
 			$s['obj']['actor'] = $s['obj']['actor']['id'];
 		}
 
+		if (is_array($act->tgt) && $act->tgt) {
+			if (array_key_exists('type', $act->tgt)) {
+				$s['tgt_type'] = self::activity_obj_mapper($act->tgt['type']);
+			}
+			// We shouldn't need to store collection contents which could be large. We will often only require the meta-data
+			if (isset($s['tgt_type']) && str_contains($s['tgt_type'], 'Collection')) {
+				$s['target'] = ['id' => $act->tgt['id'], 'type' => $s['tgt_type'], 'attributedTo' => $act->tgt['attributedTo'] ?? $act->tgt['actor']];
+			}
+		}
+
 		$generator = $act->get_property_obj('generator');
 		if ((!$generator) && (!$response_activity)) {
 			$generator = $act->get_property_obj('generator', $act->obj);
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index d21d85105..90a3d3fc8 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -544,7 +544,8 @@ class ThreadItem {
 			'moderate_delete' => t('Delete'),
 			'rtl' => in_array($item['lang'], rtl_languages()),
 			'reactions_allowed' => $reactions_allowed,
-			'reaction_str' => [t('Add yours'), t('Remove yours')]
+			'reaction_str' => [t('Add yours'), t('Remove yours')],
+			'is_contained' => $this->is_toplevel() && str_contains($item['tgt_type'], 'Collection')
 		);
 
 		$arr = array('item' => $item, 'output' => $tmp_item);