X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=5441ac5108c5bfdc892ea91749930189b189c33a;hb=adcaefce89c23ebb518f3454be15379a9d57e560;hp=1f5883c266afbf4bc3cf05790b16bebdb73ffa16;hpb=846c4cea7c0e3868a63a187ee9a504a031b2a7e4;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
index 1f5883c266..5441ac5108 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,5 +1,6 @@
 <?php
 require_once("boot.php");
+require_once('include/queue_fn.php');
 
 function delivery_run($argv, $argc){
 	global $a, $db;
@@ -31,12 +32,25 @@ function delivery_run($argv, $argc){
 
 	$a->set_baseurl(get_config('system','url'));
 
-	logger('delivery: invoked: ' . print_r($argv,true));
+	logger('delivery: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
 
 	$cmd        = $argv[1];
 	$item_id    = intval($argv[2]);
 	$contact_id = intval($argv[3]);
 
+	// Some other process may have delivered this item already.
+
+	$r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
+		dbesc($cmd),
+		dbesc($item_id),
+		dbesc($contact_id)
+	);
+	if(! count($r)) {
+		return;
+	}	
+
+	// It's ours to deliver. Remove it from the queue.
+
 	q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
 		dbesc($cmd),
 		dbesc($item_id),
@@ -59,7 +73,7 @@ function delivery_run($argv, $argc){
 		$normal_mode = false;
 		$expire = true;
 		$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 
-			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 30 MINUTE",
+			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
 			intval($item_id)
 		);
 		$uid = $item_id;
@@ -83,6 +97,8 @@ function delivery_run($argv, $argc){
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
 
+		if(! $parent_id)
+			return;
 
 
 		$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` 
@@ -94,13 +110,20 @@ function delivery_run($argv, $argc){
 			return;
 		}
 
-		$icontacts = q("SELECT * FROM `contact` WHERE `id` IN ( SELECT distinct(`contact-id`) FROM `item` where `parent` = %d ) ",
-			intval($parent_id)
-		);
-		if(! count($icontacts))
+		$icontacts = null;
+		$contacts_arr = array();
+		foreach($items as $item)
+			if(! in_array($item['contact-id'],$contacts_arr))
+				$contacts_arr[] = intval($item['contact-id']);
+		if(count($contacts_arr)) {
+			$str_contacts = implode(',',$contacts_arr); 
+			$icontacts = q("SELECT * FROM `contact` 
+				WHERE `id` IN ( $str_contacts ) "
+			);
+		}
+		if( ! ($icontacts && count($icontacts)))
 			return;
 
-
 		// avoid race condition with deleting entries
 
 		if($items[0]['deleted']) {
@@ -108,8 +131,10 @@ function delivery_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('delivery: top level post');
 			$top_level = true;
+		}
 	}
 
 	$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, 
@@ -125,9 +150,12 @@ function delivery_run($argv, $argc){
 
 	$owner = $r[0];
 
+	$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+
 	$public_message = true;
 
 	// fill this in with a single salmon slap if applicable
+
 	$slap = '';
 
 	require_once('include/group.php');
@@ -178,8 +206,6 @@ function delivery_run($argv, $argc){
 		$public_message = false; // private recipients, not public
 	}
 
-	$conversant_str = intval($contact_id);
-
 	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
 		intval($contact_id)
 	);
@@ -187,62 +213,10 @@ function delivery_run($argv, $argc){
 	if(count($r))
 		$contact = $r[0];
 	
-
-	$feed_template = get_markup_template('atom_feed.tpl');
-	$mail_template = get_markup_template('atom_mail.tpl');
-
-	$atom = '';
-	$slaps = array();
-
 	$hubxml = feed_hublinks();
 
-	$birthday = feed_birthday($owner['uid'],$owner['timezone']);
-
-	if(strlen($birthday))
-		$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
-
-	$atom .= replace_macros($feed_template, array(
-			'$version'      => xmlify(FRIENDIKA_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)) ,
-			'$hub'          => $hubxml,
-			'$salmon'       => '',  // private feed, we don't use salmon here
-			'$name'         => xmlify($owner['name']),
-			'$profile_page' => xmlify($owner['url']),
-			'$photo'        => xmlify($owner['photo']),
-			'$thumb'        => xmlify($owner['thumb']),
-			'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
-			'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
-			'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
-			'$birthday'     => $birthday
-	));
-
-	foreach($items as $item) {
-		if(! $item['parent'])
-			continue;
-
-		// private emails may be in included in public conversations. Filter them.
-		if(($public_message) && $item['private'])
-			continue;
-
-		$item_contact = get_item_contact($item,$icontacts);
-		if(! $item_contact)
-			continue;
-
-		$atom .= atom_entry($item,'text',$item_contact,$owner,true);
-
-		if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
-			$slaps[] = atom_entry($item,'html',$item_contact,$owner,true);
-	}
-
-	$atom .= '</feed>' . "\r\n";
-
-	logger('notifier: ' . $atom, LOGGER_DATA);
-
 	logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
 
-
 	require_once('include/salmon.php');
 
 	if($contact['self'])
@@ -254,20 +228,103 @@ function delivery_run($argv, $argc){
 
 		case NETWORK_DFRN :
 			logger('notifier: dfrndelivery: ' . $contact['name']);
+
+			$feed_template = get_markup_template('atom_feed.tpl');
+			$mail_template = get_markup_template('atom_mail.tpl');
+
+			$atom = '';
+
+
+			$birthday = feed_birthday($owner['uid'],$owner['timezone']);
+
+			if(strlen($birthday))
+				$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
+
+			$atom .= replace_macros($feed_template, array(
+					'$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)) ,
+					'$hub'          => $hubxml,
+					'$salmon'       => '',  // private feed, we don't use salmon here
+					'$name'         => xmlify($owner['name']),
+					'$profile_page' => xmlify($owner['url']),
+					'$photo'        => xmlify($owner['photo']),
+					'$thumb'        => xmlify($owner['thumb']),
+					'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
+					'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
+					'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
+					'$birthday'     => $birthday
+			));
+
+			foreach($items as $item) {
+				if(! $item['parent'])
+					continue;
+
+				// private emails may be in included in public conversations. Filter them.
+				if(($public_message) && $item['private'])
+					continue;
+
+				$item_contact = get_item_contact($item,$icontacts);
+				if(! $item_contact)
+					continue;
+
+				if($normal_mode) {
+					if($item_id == $item['id'] || $item['id'] == $item['parent'])
+						$atom .= atom_entry($item,'text',$item_contact,$owner,true);
+				}
+				else
+					$atom .= atom_entry($item,'text',$item_contact,$owner,true);
+
+			}
+
+			$atom .= '</feed>' . "\r\n";
+
+			logger('notifier: ' . $atom, LOGGER_DATA);
+			$basepath =  implode('/', array_slice(explode('/',$contact['url']),0,3));
+
+			// perform local delivery if we are on the same site
+
+			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;					
+				}
+			}
+
 			$deliver_status = dfrn_deliver($owner,$contact,$atom);
 
 			logger('notifier: dfrn_delivery returns ' . $deliver_status);
 	
 			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;
 
@@ -282,20 +339,32 @@ function delivery_run($argv, $argc){
 			// only send salmon if public - e.g. if it's ok to notify
 			// a public hub, it's ok to send a salmon
 
-			if((count($slaps)) && ($public_message) && (! $expire)) {
+			if(($public_message) && (! $expire)) {
+				$slaps = array();
+
+				foreach($items as $item) {
+					if(! $item['parent'])
+						continue;
+
+					// private emails may be in included in public conversations. Filter them.
+					if(($public_message) && $item['private'])
+						continue;
+
+					$item_contact = get_item_contact($item,$icontacts);
+					if(! $item_contact)
+						continue;
+
+					if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
+						$slaps[] = atom_entry($item,'html',$item_contact,$owner,true);
+				}
+
 				logger('notifier: slapdelivery: ' . $contact['name']);
 				foreach($slaps as $slappy) {
 					if($contact['notify']) {
 						$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);
 						}
 					}
 				}
@@ -376,12 +445,17 @@ function delivery_run($argv, $argc){
 			break;
 
 		case NETWORK_DIASPORA :
-			logger('delivery: diaspora deliver: ' . $contact['name']);
+			if($public_message)
+				$loc = 'public batch ' . $contact['batch'];
+			else 
+				$loc = $contact['name'];
+
+			logger('delivery: diaspora batch deliver: ' . $loc);
 
 			if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
 				break;
 
-			if(! $contact['pubkey'])
+			if((! $contact['pubkey']) && (! $public_message))
 				break;
 					
 			if($target_item['verb'] === ACTIVITY_DISLIKE) {
@@ -389,22 +463,23 @@ function delivery_run($argv, $argc){
 				break;
 			}
 			elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
-			logger('delivery: diaspora retract: ' . $contact['name']);
+			logger('delivery: diaspora retract: ' . $loc);
 				// diaspora delete, 
-				diaspora_send_retraction($target_item,$owner,$contact);
+				diaspora_send_retraction($target_item,$owner,$contact,$public_message);
 				break;
 			}
 			elseif($target_item['parent'] != $target_item['id']) {
 
-			logger('delivery: diaspora relay: ' . $contact['name']);
+			logger('delivery: diaspora relay: ' . $loc);
 
 				// we are the relay - send comments, likes and unlikes to our conversants
-				diaspora_send_relay($target_item,$owner,$contact);
+				diaspora_send_relay($target_item,$owner,$contact,$public_message);
 				break;
 			}		
-			elseif($top_level) {
-				logger('delivery: diaspora status: ' . $contact['name']);
-				diaspora_send_status($target_item,$owner,$contact);
+			elseif(($top_level) && (! $walltowall)) {
+				// currently no workable solution for sending walltowall
+				logger('delivery: diaspora status: ' . $loc);
+				diaspora_send_status($target_item,$owner,$contact,$public_message);
 				break;
 			}