aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-17 18:40:32 -0700
committerzotlabs <mike@macgirvin.com>2017-09-17 18:40:32 -0700
commit1d9e0f17a6e945a10c05ad6543682ad1c8cd87d9 (patch)
treeb658d68dbdd44f93980db8631fcad312496dab59
parent9120a82ab4c4051b37794ca4d87ee3ae52084459 (diff)
downloadvolse-hubzilla-1d9e0f17a6e945a10c05ad6543682ad1c8cd87d9.tar.gz
volse-hubzilla-1d9e0f17a6e945a10c05ad6543682ad1c8cd87d9.tar.bz2
volse-hubzilla-1d9e0f17a6e945a10c05ad6543682ad1c8cd87d9.zip
more mastodon testing
-rw-r--r--Zotlabs/Lib/ActivityStreams.php11
-rwxr-xr-xinclude/items.php3
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)