more mastodon testing

2 files changed, 13 insertions, 1 deletions

diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index 2846ea476..d9735881a 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -17,6 +17,7 @@ class ActivityStreams {
 	public $ldsig  = null;
 	public $sigok  = false;
 	public $recips = null;
+	public $raw_recips = null;
 
 	function __construct($string) {
 
@@ -53,13 +54,21 @@ class ActivityStreams {
 		return $this->valid;
 	}
 
+	function set_recips($arr) {
+		$this->saved_recips = $arr;
+	}
+
 	function collect_recips($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
 		$x = [];
 		$fields = [ 'to','cc','bto','bcc','audience'];
 		foreach($fields as $f) {
 			$y = $this->get_compound_property($f,$base,$namespace);
-			if($y)
+			if($y) {
 				$x = array_merge($x,$y);
+				if(! is_array($this->raw_recips))
+					$this->raw_recips = [];
+				$this->raw_recips[$f] = $x;
+			}
 		}						
 // not yet ready for prime time
 //		$x = $this->expand($x,$base,$namespace);
diff --git a/include/items.php b/include/items.php
index f286015fe..daf41aa4b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2498,6 +2498,9 @@ function tag_deliver($uid, $item_id) {
 
 		$pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
 
+		// statusnet style group tags 
+		$pattern2 = '/^|[^@]\!\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
+
 		if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) {
 			$max_forums = get_config('system','max_tagged_forums');
 			if(! $max_forums)