X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fnotifier.php;h=7221fa376db154eba4656d2e4f1049cade18ab36;hb=8039ad0e2318c28a22f87c31dbbdb3165f1ef058;hp=a55a60efd154357cc7b48cc2a2026cba4a21a0d8;hpb=b5776ab9591b3248e02cafb2f72ad1b593467961;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index a55a60efd1..7221fa376d 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -424,19 +424,6 @@ function notifier_run(&$argv, &$argc){
 				$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 			}
 
-			$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) {
@@ -588,7 +575,7 @@ function notifier_run(&$argv, &$argc){
 			$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)