X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=e65da3adf2cbff2fc5d9ad32af4d5a0d091fdfd6;hb=3f2a23d48c0b588f0a31bb7cdb8b6490f307029f;hp=01337335d5fed0040d99945f8717347de2845c77;hpb=8d8dc2d060ee1d8d5f7754aef2459e5e3f1aa1a9;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 01337335d5..e65da3adf2 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -310,7 +310,7 @@ function notifier_run(&$argv, &$argc){
 				if ($parent["network"] == NETWORK_OSTATUS) {
 					// Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
 					// Currently it is work at progress
-					$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending`",
+					$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
 						intval($uid),
 						dbesc(NETWORK_DFRN)
 					);
@@ -409,7 +409,7 @@ function notifier_run(&$argv, &$argc){
 		} else
 			$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
 
-		$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra);
+		$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
 
 		if(count($r))
 			$contacts = $r;
@@ -444,7 +444,7 @@ function notifier_run(&$argv, &$argc){
 	if ($relocate)
 		$r = $recipients_relocate;
 	else
-		$r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending`",
+		$r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
 			dbesc($recip_str)
 		);
 
@@ -535,8 +535,8 @@ function notifier_run(&$argv, &$argc){
 
 	if($public_message) {
 
-		if (!$followup)
-			$r0 = diaspora_fetch_relay();
+		if (!$followup AND $top_level)
+			$r0 = diaspora::relay_list();
 		else
 			$r0 = array();
 
@@ -548,7 +548,7 @@ function notifier_run(&$argv, &$argc){
 		);
 
 		$r2 = q("SELECT `id`, `name`,`network` FROM `contact`
-			WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
+			WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive`
 			AND `rel` != %d order by rand() ",
 			dbesc(NETWORK_DFRN),
 			dbesc(NETWORK_MAIL2),
@@ -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);
@@ -629,11 +629,11 @@ function notifier_run(&$argv, &$argc){
 	}
 
 	// If the item was deleted, clean up the `sign` table
-	if($target_item['deleted']) {
+	/* if($target_item['deleted']) {
 		$r = q("DELETE FROM sign where `retract_iid` = %d",
 			intval($target_item['id'])
 		);
-	}
+	} */
 
 	logger('notifier: calling hooks', LOGGER_DEBUG);