X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=2562f09eb05bb53f64187268a54d3ba1c72afe86;hb=ed725df5f1c1ea2484c689283e93f8f825591384;hp=c3f7f33ea1566e21d1b292ff62de8c3a0de06df1;hpb=a7559fb045150dcb953d5329586c245f43a34c5c;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index c3f7f33ea1..2562f09eb0 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once("boot.php");
+require_once('include/queue_fn.php');
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -142,7 +143,7 @@ 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]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
 			logger('notifier: top level post');
 			$top_level = true;
 		}
@@ -183,6 +184,7 @@ function notifier_run($argv, $argc){
 		// 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.
  
@@ -191,6 +193,8 @@ function notifier_run($argv, $argc){
 		// 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.
@@ -202,13 +206,37 @@ function notifier_run($argv, $argc){
 
 		/**
 		 *
-		 * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes 
+		 * Be VERY CAREFUL if you make any changes to the following several lines. Seemingly innocuous changes 
 		 * have been known to cause runaway conditions which affected several servers, along with 
 		 * permissions issues. 
 		 *
 		 */
  
+		$relay_to_owner = false;
+
 		if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
+			$relay_to_owner = true;
+		}
+
+
+		if(($cmd === 'uplink') && (intval($parent['forum_mode'])) && (! $top_level)) {
+			$relay_to_owner = true;			
+		} 
+
+		// until the 'origin' flag has been in use for several months
+		// we will just use it as a fallback test
+		// later we will be able to use it as the primary test of whether or not to relay.
+
+		if(! $target_item['origin'])
+			$relay_to_owner = false;
+
+		if($parent['origin'])
+			$relay_to_owner = false;
+
+
+
+		if($relay_to_owner) {
+			logger('notifier: followup', LOGGER_DEBUG);
 			// local followup to remote post
 			$followup = true;
 			$public_message = false; // not public
@@ -217,6 +245,13 @@ function notifier_run($argv, $argc){
 		else {
 			$followup = false;
 
+			// don't send deletions onward for other people's stuff
+
+			if($target_item['deleted'] && (! intval($target_item['wall']))) {
+				logger('notifier: ignoring delete notification for non-wall item');
+				return;
+			}
+
 			if((strlen($parent['allow_cid'])) 
 				|| (strlen($parent['allow_gid'])) 
 				|| (strlen($parent['deny_cid'])) 
@@ -229,6 +264,13 @@ function notifier_run($argv, $argc){
 			$deny_people  = expand_acl($parent['deny_cid']);
 			$deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 
+			// if our parent is a forum, uplink to the origonal author causing
+			// a delivery fork
+
+			if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
+				proc_run('php','include/notifier','uplink',$item_id);
+			}
+
 			$conversants = array();
 
 			foreach($items as $item) {
@@ -281,7 +323,7 @@ function notifier_run($argv, $argc){
 		$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
 
 	$atom .= replace_macros($feed_template, array(
-			'$version'      => xmlify(FRIENDIKA_VERSION),
+			'$version'      => xmlify(FRIENDICA_VERSION),
 			'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 			'$feed_title'   => xmlify($owner['name']),
 			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
@@ -356,7 +398,9 @@ function notifier_run($argv, $argc){
 				if(($public_message) && $item['private'])
 					continue;
 
+
 				$contact = get_item_contact($item,$contacts);
+
 				if(! $contact)
 					continue;
 
@@ -451,6 +495,46 @@ function notifier_run($argv, $argc){
 
 			switch($contact['network']) {
 				case NETWORK_DFRN:
+
+					// perform local delivery if we are on the same site
+
+					$basepath =  implode('/', array_slice(explode('/',$contact['url']),0,3));
+
+					if(link_compare($basepath,$a->get_baseurl())) {
+
+						$nickname = basename($contact['url']);
+						if($contact['issued-id'])
+							$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
+						else
+							$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
+
+						$x = q("SELECT	`contact`.*, `contact`.`uid` AS `importer_uid`, 
+							`contact`.`pubkey` AS `cpubkey`, 
+							`contact`.`prvkey` AS `cprvkey`, 
+							`contact`.`thumb` AS `thumb`, 
+							`contact`.`url` as `url`,
+							`contact`.`name` as `senderName`,
+							`user`.* 
+							FROM `contact` 
+							LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+							WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+							AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
+							$sql_extra
+							AND `user`.`account_expired` = 0 LIMIT 1",
+							dbesc(NETWORK_DFRN),
+							dbesc($nickname)
+						);
+
+						if(count($x)) {
+							require_once('library/simplepie/simplepie.inc');
+							logger('mod-delivery: local delivery');
+							local_delivery($x[0],$atom);
+							break;					
+						}
+					}
+
+
+
 					logger('notifier: dfrndelivery: ' . $contact['name']);
 					$deliver_status = dfrn_deliver($owner,$contact,$atom);
 
@@ -459,13 +543,7 @@ function notifier_run($argv, $argc){
 					if($deliver_status == (-1)) {
 						logger('notifier: delivery failed: queuing message');
 						// queue message for redelivery
-						q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-							VALUES ( %d, '%s', '%s', '%s') ",
-							intval($contact['id']),
-							dbesc(datetime_convert()),
-							dbesc(datetime_convert()),
-							dbesc($atom)
-						);
+						add_to_queue($contact['id'],NETWORK_DFRN,$atom);
 					}
 					break;
 				case NETWORK_OSTATUS:
@@ -482,14 +560,7 @@ function notifier_run($argv, $argc){
 
 						if($deliver_status == (-1)) {
 							// queue message for redelivery
-							q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-								VALUES ( %d, '%s', '%s', '%s') ",
-								intval($contact['id']),
-								dbesc(datetime_convert()),
-								dbesc(datetime_convert()),
-								dbesc($slap)
-							);
-
+							add_to_queue($contact['id'],NETWORK_OSTATUS,$slap);
 						}
 					}
 					else {
@@ -504,13 +575,7 @@ function notifier_run($argv, $argc){
 									$deliver_status = slapper($owner,$contact['notify'],$slappy);
 									if($deliver_status == (-1)) {
 										// queue message for redelivery
-										q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-											VALUES ( %d, '%s', '%s', '%s') ",
-											intval($contact['id']),
-											dbesc(datetime_convert()),
-											dbesc(datetime_convert()),
-											dbesc($slappy)
-										);								
+										add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
 									}
 								}
 							}
@@ -598,7 +663,15 @@ function notifier_run($argv, $argc){
 				case NETWORK_DIASPORA:
 					require_once('include/diaspora.php');
 
-					if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+					if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')))
+						break;
+
+					if($mail) {
+						diaspora_send_mail($item,$owner,$contact);
+						break;
+					}
+
+					if(! $normal_mode)
 						break;
 
 					// special handling for followup to public post
@@ -668,7 +741,7 @@ function notifier_run($argv, $argc){
 	if($public_message) {
 
 		$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' 
-			AND `uid` = %d AND `rel` != %d ORDER BY rand() ",
+			AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
 			dbesc(NETWORK_DIASPORA),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
@@ -737,6 +810,11 @@ function notifier_run($argv, $argc){
 
 	}
 
+	if($normal_mode)
+		call_hooks('notifier_normal',$target_item);
+
+	call_hooks('notifier_end',$target_item);
+
 	return;
 }