if(! ($mail || $fsuggest || $relocate)) {
- $slap = ostatus_salmon($target_item,$owner);
+ $slap = ostatus::salmon($target_item,$owner);
require_once('include/group.php');
if($public_message) {
- if (!$followup)
- $r0 = diaspora_fetch_relay();
+ if (!$followup AND $top_level)
+ $r0 = diaspora::relay_list();
else
$r0 = array();
$r = array_merge($r2,$r1,$r0);
if(count($r)) {
- logger('pubdeliver: ' . print_r($r,true), LOGGER_DEBUG);
+ logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
// throw everything into the queue in case we get killed
}
if((! $mail) && (! $fsuggest) && (! $followup)) {
- logger('notifier: delivery agent: ' . $rr['name'] . ' ' . $rr['id']);
+ logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']);
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
proc_run('php','include/pubsubpublish.php');
}
- // If the item was deleted, clean up the `sign` table
- if($target_item['deleted']) {
- $r = q("DELETE FROM sign where `retract_iid` = %d",
- intval($target_item['id'])
- );
- }
-
logger('notifier: calling hooks', LOGGER_DEBUG);
if($normal_mode)