harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more mastodon testing

Browse Source
This commit is contained in:
zotlabs 2017-09-17 18:40:32 -07:00
parent 9120a82ab4
commit 1d9e0f17a6
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Lib/ActivityStreams.php
View File

@ -17,6 +17,7 @@ class ActivityStreams {
public $ldsig = null; public $ldsig = null;
public $sigok = false; public $sigok = false;
public $recips = null; public $recips = null;
public $raw_recips = null;
function __construct($string) { function __construct($string) {
@ -53,13 +54,21 @@ class ActivityStreams {
return $this->valid; return $this->valid;
} }
function set_recips($arr) {
$this->saved_recips = $arr;
}
function collect_recips($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') { function collect_recips($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
$x = []; $x = [];
$fields = [ 'to','cc','bto','bcc','audience']; $fields = [ 'to','cc','bto','bcc','audience'];
foreach($fields as $f) { foreach($fields as $f) {
$y = $this->get_compound_property($f,$base,$namespace); $y = $this->get_compound_property($f,$base,$namespace);
if($y) if($y) {
$x = array_merge($x,$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 // not yet ready for prime time
// $x = $this->expand($x,$base,$namespace); // $x = $this->expand($x,$base,$namespace);

3
include/items.php
View File

@ -2498,6 +2498,9 @@ function tag_deliver($uid, $item_id) {
$pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; $pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
// statusnet style group tags
$pattern2 = '/^|[^@]\!\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/';
if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) { if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) {
$max_forums = get_config('system','max_tagged_forums'); $max_forums = get_config('system','max_tagged_forums');
if(! $max_forums) if(! $max_forums)