X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=81f55f710190e3fc9a8499e374ccf81900d942b2;hb=f65d6531cafe625d6be011e135d132ae48fc7c06;hp=c05d00e63fdb062860c2358ff07ff87b8cd41c16;hpb=4de057804c0292da7fa92688fd3d29f33adf35f9;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index c05d00e63f..81f55f7101 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,13 +1,14 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
-require_once('include/queue_fn.php');
-require_once('include/html2plain.php');
-require_once("include/Scrape.php");
-require_once('include/diaspora.php');
-require_once("include/ostatus.php");
-require_once('include/salmon.php');
+require_once 'include/queue_fn.php';
+require_once 'include/html2plain.php';
+require_once 'include/probe.php';
+require_once 'include/diaspora.php';
+require_once 'include/ostatus.php';
+require_once 'include/salmon.php';
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -45,10 +46,10 @@ require_once('include/salmon.php');
 function notifier_run(&$argv, &$argc){
 	global $a;
 
-	require_once("include/datetime.php");
-	require_once('include/items.php');
-	require_once('include/bbcode.php');
-	require_once('include/email.php');
+	require_once 'include/datetime.php';
+	require_once 'include/items.php';
+	require_once 'include/bbcode.php';
+	require_once 'include/email.php';
 
 	if ($argc < 3) {
 		return;
@@ -138,7 +139,7 @@ function notifier_run(&$argv, &$argc){
 		if (!$r) {
 			return;
 		}
-		require_once('include/Contact.php');
+		require_once 'include/Contact.php';
 		foreach ($r as $contact) {
 			terminate_friendship($user, $self, $contact);
 		}
@@ -151,7 +152,7 @@ function notifier_run(&$argv, &$argc){
 		$recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
 	} else {
 		// find ancestors
-		$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
+		$r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
 			intval($item_id)
 		);
 
@@ -165,7 +166,7 @@ function notifier_run(&$argv, &$argc){
 		$updated = $r[0]['edited'];
 
 		$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-			FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
+			FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
 			intval($parent_id)
 		);
 
@@ -222,7 +223,7 @@ function notifier_run(&$argv, &$argc){
 
 		$slap = ostatus::salmon($target_item,$owner);
 
-		require_once('include/group.php');
+		require_once 'include/group.php';
 
 		$parent = $items[0];
 
@@ -294,13 +295,13 @@ function notifier_run(&$argv, &$argc){
 			$recipients = array($parent['contact-id']);
 			$recipients_followup  = array($parent['contact-id']);
 
-			//if (!$target_item['private'] AND $target_item['wall'] AND
-			if (!$target_item['private'] AND
+			//if (!$target_item['private'] && $target_item['wall'] &&
+			if (!$target_item['private'] &&
 				(strlen($target_item['allow_cid'].$target_item['allow_gid'].
 					$target_item['deny_cid'].$target_item['deny_gid']) == 0))
 				$push_notify = true;
 
-			if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+			if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
 
 				$push_notify = true;
 
@@ -347,7 +348,7 @@ function notifier_run(&$argv, &$argc){
 			// a delivery fork. private groups (forum_mode == 2) do not uplink
 
 			if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
-				proc_run(PRIORITY_HIGH,'include/notifier.php','uplink',$item_id);
+				proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id);
 			}
 
 			$conversants = array();
@@ -384,7 +385,7 @@ function notifier_run(&$argv, &$argc){
 
 		// If the thread parent is OStatus then do some magic to distribute the messages.
 		// We have not only to look at the parent, since it could be a Friendica thread.
-		if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+		if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
 
 			$diaspora_delivery = false;
 
@@ -471,7 +472,8 @@ 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` AND NOT `archive`".$sql_extra,
+		$r = q("SELECT `id`, `url`, `network`, `self` FROM `contact`
+			WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra,
 			dbesc($recip_str)
 		);
 	}
@@ -480,28 +482,13 @@ function notifier_run(&$argv, &$argc){
 
 	if (dbm::is_result($r)) {
 		foreach ($r as $contact) {
-			if (!$contact['self']) {
-				if (($contact['network'] === NETWORK_DIASPORA) && ($public_message)) {
-					continue;
-				}
-				q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)",
-					dbesc($cmd),
-					intval($item_id),
-					intval($contact['id'])
-				);
-			}
-		}
-
-		for ($x = 0; $x < count($r); $x ++) {
-			$contact = $r[$x];
-
 			if ($contact['self']) {
 				continue;
 			}
 			logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 
-			proc_run(PRIORITY_HIGH,'include/delivery.php', $cmd, $item_id, $contact['id']);
-			continue;
+			proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+					'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
 		}
 	}
 
@@ -531,8 +518,9 @@ function notifier_run(&$argv, &$argc){
 				$r0 = Diaspora::relay_list();
 			}
 
-			$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-				AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
+			$r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
+				FROM `contact` WHERE `network` = '%s' AND `batch` != ''
+				AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
 				dbesc(NETWORK_DIASPORA),
 				intval($owner['uid']),
 				intval(CONTACT_IS_SHARING)
@@ -540,8 +528,7 @@ function notifier_run(&$argv, &$argc){
 		}
 
 		$r2 = q("SELECT `id`, `name`,`network` FROM `contact`
-			WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive`
-			AND `rel` != %d order by rand() ",
+			WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
 			dbesc(NETWORK_DFRN),
 			dbesc(NETWORK_MAIL2),
 			intval($owner['uid']),
@@ -553,18 +540,6 @@ function notifier_run(&$argv, &$argc){
 		if (dbm::is_result($r)) {
 			logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
-			// throw everything into the queue in case we get killed
-
-			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",
-						dbesc($cmd), intval($item_id), intval($rr['id']),
-						dbesc($cmd), intval($item_id), intval($rr['id'])
-					);
-				}
-			}
-
 			foreach ($r as $rr) {
 
 				// except for Diaspora batch jobs
@@ -577,7 +552,8 @@ function notifier_run(&$argv, &$argc){
 
 				if ((! $mail) && (! $fsuggest) && (! $followup)) {
 					logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-					proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$rr['id']);
+					proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+							'include/delivery.php', $cmd, $item_id, (int)$rr['id']);
 				}
 			}
 		}
@@ -587,7 +563,7 @@ function notifier_run(&$argv, &$argc){
 	}
 
 	// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
-	if ($push_notify AND strlen($hub)) {
+	if ($push_notify && strlen($hub)) {
 		$hubs = explode(',', $hub);
 		if (count($hubs)) {
 			foreach ($hubs as $h) {
@@ -617,7 +593,8 @@ function notifier_run(&$argv, &$argc){
 		}
 
 		// Handling the pubsubhubbub requests
-		proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
+		proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+				'include/pubsubpublish.php');
 	}
 
 	logger('notifier: calling hooks', LOGGER_DEBUG);