it should be "gid" not "cid"

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 33eeee62fd5b9eaa6eea7f0091358f5d0ba56410..84efe79526cd31399c20a373ac2b230284b4f506 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -210,8 +210,9 @@ function notifier_run(&$argv, &$argc){
                intval($uid)
        );
 
-       if(! dbm::is_result($r))
+       if (! dbm::is_result($r)) {
                return;
+       }
 
        $owner = $r[0];
 
@@ -424,20 +425,6 @@ function notifier_run(&$argv, &$argc){
                                $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
                        }
 
-                       // Send a salmon to the parent author
-                       $probed_contact = probe_url($thr_parent[0]['author-link']);
-                       if ($probed_contact["notify"] != "") {
-                               logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
-                               $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
-                       }
-
-                       // Send a salmon to the parent owner
-                       $probed_contact = probe_url($thr_parent[0]['owner-link']);
-                       if ($probed_contact["notify"] != "") {
-                               logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
-                               $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
-                       }
-
                        // Send a salmon notification to every person we mentioned in the post
                        $arr = explode(',',$target_item['tag']);
                        foreach($arr as $x) {
@@ -571,7 +558,7 @@ function notifier_run(&$argv, &$argc){
        if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
                if(!get_config('system','dfrn_only')) {
                        foreach($url_recipients as $url) {
-                               if($url) {
+                               if ($url) {
                                        logger('notifier: urldelivery: ' . $url);
                                        $deliver_status = slapper($owner,$url,$slap);
                                        /// @TODO Redeliver/queue these items on failure, though there is no contact record
@@ -584,12 +571,12 @@ function notifier_run(&$argv, &$argc){
        if($public_message) {
 
                if (!$followup)
-                       $r0 = diaspora::relay_list();
+                       $r0 = Diaspora::relay_list();
                else
                        $r0 = array();
 
                $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-                       AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+                       AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
                        dbesc(NETWORK_DIASPORA),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)
@@ -611,7 +598,7 @@ function notifier_run(&$argv, &$argc){
 
                        // throw everything into the queue in case we get killed
 
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                if((! $mail) && (! $fsuggest) && (! $followup)) {
                                        q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
                                                ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
@@ -621,7 +608,7 @@ function notifier_run(&$argv, &$argc){
                                }
                        }
 
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
 
                                // except for Diaspora batch jobs
                                // Don't deliver to folks who have already been delivered to
@@ -663,7 +650,7 @@ function notifier_run(&$argv, &$argc){
 
                                } else {
 
-                                       $params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+                                       $params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
                                        post_url($h,$params);
                                        logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
                                }