more but slow progress on deliveries. The b*tch is trying to match permissions

This commit is contained in:
friendica 2012-11-25 23:18:11 -08:00
parent cd4e381aa1
commit ccf44f2514
2 changed files with 30 additions and 8 deletions

View File

@ -614,22 +614,44 @@ function zot_import($arr) {
$incoming = $data['pickup'];
if(is_array($incoming)) {
foreach($incoming as $i) {
$deliveries = null;
if($i['notify'] && $i['notify']['recipients']) {
// look for our site members in the recipient list
// (fix the notifier to send them...)
$recip_arr = array();
foreach($i['notify']['recipients'] as $recip) {
$recip_arr[] = array('hash' => base64url_encode(hash('whirlpool',$recip['guid'] . $recip['guid_sig'], true)));
}
stringify_array_elms($recip_arr);
$recips = ids_to_querystr($recip_arr,'hash');
$r = q("select * from channel where channel_hash in ( " . $recips . " ) ");
if(! $r)
continue;
$deliveries = $r;
// We found somebody on this site that's in the recipient list.
}
else {
// look for any site members who are accepting posts from this sender
// Public post. look for any site members who are accepting posts from this sender
}
if($i['message'] && $i['message']['type'] === 'activity') {
if(! $deliveries)
continue;
if($i['message']) {
if($i['message']['type'] === 'activity') {
// process the message
}
elseif($i['message']['type'] === 'mail') {
}
}
}
}
}

View File

@ -1 +1 @@
2012-11-19.144
2012-11-25.150