X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=6ac882c1992cf96511901f3c6f54033444aaffc2;hb=d284f8017cefb79571fe51c4ae3f85b9b4e517c9;hp=1c8245c7a88fd30f65f478fa5b72d8d5f151c757;hpb=b57a01dc1418cc179ddd327af9d04a9e68e679e9;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 1c8245c7a8..6ac882c199 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,6 +1,21 @@
 <?php
+
 require_once("boot.php");
 
+/*
+ * This file was at one time responsible for doing all deliveries, but this caused
+ * big problems on shared hosting systems, where the process might get killed by the 
+ * hosting provider and nothing would get delivered. 
+ * It now only delivers one message under certain cases, and invokes a queued
+ * delivery mechanism (include/deliver.php) to deliver individual contacts at 
+ * controlled intervals.
+ * This has a much better chance of surviving random processes getting killed
+ * by the hosting provider. 
+ * A lot of this code is duplicated in include/deliver.php until we have time to go back
+ * and re-structure the delivery procedure based on the obstacles that have been thrown at 
+ * us by hosting providers. 
+ */
+
 function notifier_run($argv, $argc){
 	global $a, $db;
 
@@ -35,7 +50,6 @@ function notifier_run($argv, $argc){
 	$cmd = $argv[1];
 
 	switch($cmd) {
-
 		case 'mail':
 		default:
 			$item_id = intval($argv[2]);
@@ -46,6 +60,8 @@ function notifier_run($argv, $argc){
 	}
 
 	$expire = false;
+	$mail = false;
+	$fsuggest = false;
 	$top_level = false;
 	$recipients = array();
 	$url_recipients = array();
@@ -54,6 +70,7 @@ function notifier_run($argv, $argc){
 
 	if($cmd === 'mail') {
 		$normal_mode = false;
+		$mail = true;
 		$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
 				intval($item_id)
 		);
@@ -79,6 +96,8 @@ function notifier_run($argv, $argc){
 	}
 	elseif($cmd === 'suggest') {
 		$normal_mode = false;
+		$fsuggest = true;
+
 		$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
 			intval($item_id)
 		);
@@ -104,7 +123,8 @@ function notifier_run($argv, $argc){
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
 
-		$items = q("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id` ASC",
+		$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` 
+			FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC",
 			intval($parent_id)
 		);
 
@@ -119,8 +139,11 @@ function notifier_run($argv, $argc){
 				$item['deleted'] = 1;
 		}
 
-		if(count($items) == 1 && $items[0]['uri'] === $items[0]['parent-uri'])
+		if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
+			logger('notifier: top level post');
 			$top_level = true;
+		}
+
 	}
 
 	$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, 
@@ -136,6 +159,8 @@ function notifier_run($argv, $argc){
 
 	$owner = $r[0];
 
+	$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+
 	$hub = get_config('system','huburl');
 
 	// If this is a public conversation, notify the feed hub
@@ -144,13 +169,43 @@ function notifier_run($argv, $argc){
 	// fill this in with a single salmon slap if applicable
 	$slap = '';
 
-	if($cmd != 'mail' && $cmd != 'suggest') {
+	if(! ($mail || $fsuggest)) {
 
 		require_once('include/group.php');
 
 		$parent = $items[0];
 
-		if($parent['wall'] == 0 && (! $expire)) {
+		// This is IMPORTANT!!!!
+
+		// We will only send a "notify owner to relay" or followup message if the referenced post
+		// originated on our system by virtue of having our hostname somewhere
+		// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
+		// if $parent['wall'] == 1 we will already have the parent message in our array
+		// and we will relay the whole lot.
+ 
+		// expire sends an entire group of expire messages and cannot be forwarded.
+		// However the conversation owner will be a part of the conversation and will 
+		// be notified during this run.
+		// Other DFRN conversation members will be alerted during polled updates.
+
+		// Diaspora members currently are not notified of expirations, and other networks have
+		// either limited or no ability to process deletions. We should at least fix Diaspora 
+		// by stringing togther an array of retractions and sending them onward.
+		 
+  	
+		$localhost = $a->get_hostname();
+		if(strpos($localhost,':'))
+			$localhost = substr($localhost,0,strpos($localhost,':'));
+
+		/**
+		 *
+		 * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes 
+		 * have been known to cause runaway conditions which affected several servers, along with 
+		 * permissions issues. 
+		 *
+		 */
+ 
+		if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
 			// local followup to remote post
 			$followup = true;
 			$public_message = false; // not public
@@ -205,7 +260,6 @@ function notifier_run($argv, $argc){
 
 		$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
 
-
 		if(count($r))
 			$contacts = $r;
 	}
@@ -240,7 +294,7 @@ function notifier_run($argv, $argc){
 			'$birthday'     => $birthday
 	));
 
-	if($cmd === 'mail') {
+	if($mail) {
 		$public_message = false;  // mail is  not public
 
 		$body = fix_private_photos($item['body'],$owner['uid']);
@@ -256,7 +310,7 @@ function notifier_run($argv, $argc){
 			'$parent_id'    => xmlify($item['parent-uri'])
 		));
 	}
-	elseif($cmd === 'suggest') {
+	elseif($fsuggest) {
 		$public_message = false;  // suggestions are not public
 
 		$sugg_template = get_markup_template('atom_suggest.tpl');
@@ -344,17 +398,43 @@ function notifier_run($argv, $argc){
 		dbesc($recip_str)
 	);
 
-	// delivery loop
 
 	require_once('include/salmon.php');
 
+	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
+
+	// delivery loop
+
 	if(count($r)) {
+
+		foreach($r as $contact) {
+			if((! $mail) && (! $fsuggest) && (! $followup) && (! $contact['self'])) {
+				q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )",
+					dbesc($cmd),
+					intval($item_id),
+					intval($contact['id'])
+				);
+			}
+		}
+
 		foreach($r as $contact) {
 			if($contact['self'])
 				continue;
 
+			// potentially more than one recipient. Start a new process and space them out a bit.
+			// we will deliver single recipient types of message and email receipients here. 
+
+			if((! $mail) && (! $fsuggest) && (! $followup)) {
+				proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
+				if($interval)
+					@time_sleep_until(microtime(true) + (float) $interval);
+				continue;
+			}
+
 			$deliver_status = 0;
 
+			logger("main delivery by notifier: followup=$followup mail=$mail fsuggest=$fsuggest");
+
 			switch($contact['network']) {
 				case NETWORK_DFRN:
 					logger('notifier: dfrndelivery: ' . $contact['name']);
@@ -528,7 +608,8 @@ function notifier_run($argv, $argc){
 						diaspora_send_relay($target_item,$owner,$contact);
 						break;
 					}		
-					elseif($top_level) {
+					elseif(($top_level) && (! $walltowall)) {
+						// currently no workable solution for sending walltowall
 						diaspora_send_status($target_item,$owner,$contact);
 						break;
 					}
@@ -559,109 +640,68 @@ function notifier_run($argv, $argc){
 		}
 	}
 
-	if((strlen($hub)) && ($public_message)) {
-		$hubs = explode(',', $hub);
-		if(count($hubs)) {
-			foreach($hubs as $h) {
-				$h = trim($h);
-				if(! strlen($h))
-					continue;
-				$params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
-				post_url($h,$params);
-				logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
-				if(count($hubs) > 1)
-					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
-			}
-		}
-	}
 
 	if($public_message) {
 
-		/**
-		 *
-		 * If you have less than 999 dfrn friends and it's a public message,
-		 * we'll just go ahead and push them out securely with dfrn/rino or Diaspora.
-		 * If you've got more than that, you'll have to rely on PuSH delivery.
-		 *
-		 */
-
-		$max_allowed = ((get_config('system','maxpubdeliver') === false) ? 999 : intval(get_config('system','maxpubdeliver')));
-				
-		/**
-		 *
-		 * Only get the bare essentials and go back for the full record. 
-		 * If you've got a lot of friends and we grab all the details at once it could exhaust memory. 
-		 *
-		 */
-
 		$r = q("SELECT `id`, `name` FROM `contact` 
 			WHERE `network` in ('%s','%s') AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
-			AND `rel` != %d ",
+			AND `rel` != %d order by rand() ",
 			dbesc(NETWORK_DFRN),
 			dbesc(NETWORK_DIASPORA),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
 		);
 
-		if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
-
+		if(count($r)) {
 			logger('pubdeliver: ' . print_r($r,true));
 
+			// 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 )",
+						dbesc($cmd),
+						intval($item_id),
+						intval($rr['id'])
+					);
+				}
+			}
+
 			foreach($r as $rr) {
 
 				/* Don't deliver to folks who have already been delivered to */
 
-				if(in_array($rr['id'],$conversants))
+				if(in_array($rr['id'],$conversants)) {
+					logger('notifier: already delivered id=' . $rr['id']);
 					continue;
+				}
 
-				$n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-						intval($rr['id'])
-				);
+				if((! $mail) && (! $fsuggest) && (! $followup)) {
+					logger('notifier: delivery agent: ' . $rr['name'] . ' ' . $rr['id']); 
+					proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']);
+					if($interval)
+						@time_sleep_until(microtime(true) + (float) $interval);
+				}
+			}
+		}
 
-				if(count($n)) {
-					$contact = $n[0];
-					switch($contact['network']) {
-						case NETWORK_DFRN :
-							logger('notifier: dfrnpubdelivery: ' . $contact['name']);
-							$deliver_status = dfrn_deliver($owner,$contact,$atom);
-							break;
-						case NETWORK_DIASPORA :
-							require_once('include/diaspora.php');
-							if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
-								break;
-							
-							if(! $contact['pubkey'])
-								break;
-					
-							if($target_item['verb'] === ACTIVITY_DISLIKE) {
-								// unsupported
-								break;
-							}
-							elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
-								// diaspora delete, 
-								diaspora_send_retraction($target_item,$owner,$contact);
-								break;
-							}
-							elseif($followup) {
-								// send comments, likes and retractions of likes to owner to relay
-								diaspora_send_followup($target_item,$owner,$contact);
-								break;
-							}
-							elseif($target_item['parent'] != $target_item['id']) {
-								// we are the relay - send comments, likes and unlikes to our conversants
-								diaspora_send_relay($target_item,$owner,$contact);
-								break;
-							}		
-							elseif($top_level) {
-								diaspora_send_status($target_item,$owner,$contact);
-								break;
-							}
-						default:
-							break;
-					}
+
+		if(strlen($hub)) {
+			$hubs = explode(',', $hub);
+			if(count($hubs)) {
+				foreach($hubs as $h) {
+					$h = trim($h);
+					if(! strlen($h))
+						continue;
+					$params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+					post_url($h,$params);
+					logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
+					if(count($hubs) > 1)
+						sleep(7);				// try and avoid multiple hubs responding at precisely the same time
 				}
 			}
 		}
+
 	}
 
 	return;