X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=e66fa9b0b0b2cf337b1b8e94bdb2de9028868c41;hb=143e7fc6b707f377d383a498999ce712d04dd102;hp=ad89eacb6d8eb4c99c6f61b281790275a376678d;hpb=86cae070f2a048e553c545caec54be72c1c14da5;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index ad89eacb6d..e66fa9b0b0 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -3,12 +3,12 @@
 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
@@ -46,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;
@@ -139,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);
 		}
@@ -149,10 +149,11 @@ function notifier_run(&$argv, &$argc){
 		$relocate = true;
 		$uid = $item_id;
 
-		$recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
+		$recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
+					intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
 	} 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)
 		);
 
@@ -166,7 +167,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)
 		);
 
@@ -205,8 +206,6 @@ function notifier_run(&$argv, &$argc){
 
 	$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
 
-	$hub = get_config('system','huburl');
-
 	// Should the post be transmitted to Diaspora?
 	$diaspora_delivery = true;
 
@@ -216,6 +215,9 @@ function notifier_run(&$argv, &$argc){
 	// Do a PuSH
 	$push_notify = false;
 
+	// Deliver directly to a forum, don't PuSH
+	$direct_forum_delivery = false;
+
 	// fill this in with a single salmon slap if applicable
 	$slap = '';
 
@@ -223,7 +225,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];
 
@@ -286,6 +288,26 @@ function notifier_run(&$argv, &$argc){
 		if ($parent['origin']) {
 			$relay_to_owner = false;
 		}
+
+		// Special treatment for forum posts
+		if (($target_item['author-link'] != $target_item['owner-link']) &&
+			($owner['id'] != $target_item['contact-id']) &&
+			($target_item['uri'] === $target_item['parent-uri'])) {
+
+			$fields = array('forum', 'prv');
+			$condition = array('id' => $target_item['contact-id']);
+			$contact = dba::select('contact', $fields, $condition, array('limit' => 1));
+			if (!dbm::is_result($contact)) {
+				// Should never happen
+				return false;
+			}
+
+			// Is the post from a forum?
+			if ($contact['forum'] || $contact['prv']) {
+				$relay_to_owner = true;
+				$direct_forum_delivery = true;
+			}
+		}
 		if ($relay_to_owner) {
 			logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
 			// local followup to remote post
@@ -295,13 +317,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;
 
@@ -319,6 +341,11 @@ function notifier_run(&$argv, &$argc){
 					}
 				}
 			}
+
+			if ($direct_forum_delivery) {
+				$push_notify = false;
+			}
+
 			logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
 		} else {
 			$followup = false;
@@ -348,7 +375,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();
@@ -385,7 +412,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;
 
@@ -487,7 +514,8 @@ function notifier_run(&$argv, &$argc){
 			}
 			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']);
+			proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+					'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
 		}
 	}
 
@@ -518,8 +546,8 @@ function notifier_run(&$argv, &$argc){
 			}
 
 			$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 `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
+				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)
@@ -527,8 +555,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']),
@@ -552,7 +579,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']);
 				}
 			}
 		}
@@ -562,37 +590,17 @@ function notifier_run(&$argv, &$argc){
 	}
 
 	// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
-	if ($push_notify AND strlen($hub)) {
-		$hubs = explode(',', $hub);
-		if (count($hubs)) {
-			foreach ($hubs as $h) {
-				$h = trim($h);
-				if (! strlen($h)) {
-					continue;
-				}
-
-				if ($h === '[internal]') {
-					// Set push flag for PuSH subscribers to this topic,
-					// they will be notified in queue.php
-					q("UPDATE `push_subscriber` SET `push` = 1 ".
-					  "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
-
-					logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
-
-				} else {
+	if ($push_notify) {
+		// Set push flag for PuSH subscribers to this topic,
+		// they will be notified in queue.php
+		q("UPDATE `push_subscriber` SET `push` = 1 ".
+		  "WHERE `nickname` = '%s' AND `push` = 0", dbesc($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());
-				}
-				if (count($hubs) > 1) {
-					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
-				}
-			}
-		}
+		logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 
 		// 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);