Optimized query for unread group postings

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 99a736db0a81484625a11e65ff319c0c60682f53..6c42f19c6aec66c22d0f2522b15f13a8382b7ea8 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -535,7 +535,7 @@ function notifier_run(&$argv, &$argc){
 
        if($public_message) {
 
-               if (!$followup)
+               if (!$followup AND $top_level)
                        $r0 = diaspora_fetch_relay();
                else
                        $r0 = array();
@@ -559,7 +559,7 @@ function notifier_run(&$argv, &$argc){
                $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
 
@@ -584,7 +584,7 @@ function notifier_run(&$argv, &$argc){
                                }
 
                                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);