requeue failed deliveries

4 files changed, 24 insertions, 172 deletions

diff --git a/include/queue.php b/include/queue.php
index b0728503e..2b4e5b504 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -6,13 +6,14 @@ require_once('include/queue_fn.php');
 function queue_run($argv, $argc){
 
 	cli_startup();
+
 	global $a;
 
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 
 	if(argc() > 1)
-		$queue_id = intval(argv(1));
+		$queue_id = argv(1);
 	else
 		$queue_id = 0;
 
@@ -20,38 +21,11 @@ function queue_run($argv, $argc){
 
 	logger('queue: start');
 
-	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
-
-//	$r = q("select * from deliverq where 1");
-//FIXME
-	$r = array();
-
-return;
+	$r = q("DELETE FROM outq WHERE outq_created < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 
-
-	if(count($r)) {
-		foreach($r as $rr) {
-			logger('queue: deliverq');
-			proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
-			if($interval)
-				@time_sleep_until(microtime(true) + (float) $interval);
-		}
-	}
-
-	$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
-		LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
-		WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-	if(count($r)) {
-		foreach($r as $rr) {
-			logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
-			logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
-		}
-		q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-	}
-		
 	if($queue_id) {
-		$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
-			intval($queue_id)
+		$r = q("SELECT * FROM outq WHERE outq_hash = '%s' LIMIT 1",
+			dbesc($queue_id)
 		);
 	}
 	else {
@@ -59,96 +33,26 @@ return;
 		// For the first 12 hours we'll try to deliver every 15 minutes
 		// After that, we'll only attempt delivery once per hour. 
 
-		$r = q("SELECT `id` FROM `queue` WHERE (( `created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ) OR ( `last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR ))");
+		$r = q("SELECT * FROM outq WHERE outq_delivered = 0 and (( outq_created > UTC_TIMESTAMP() - INTERVAL 12 HOUR and outq_updated < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ) OR ( outq_updated < UTC_TIMESTAMP() - INTERVAL 1 HOUR ))");
 	}
-	if(! count($r)){
+	if(! $r)
 		return;
-	}
-
-	if(! $queue_id)
-		call_hooks('queue_predeliver', $a, $r);
-
-
-	// delivery loop
-
-	foreach($r as $q_item) {
 
-		// queue_predeliver hooks may have changed the queue db details, 
-		// so check again if this entry still needs processing
-
-		if($queue_id) {
-			$qi = q("select * from queue where `id` = %d limit 1",
-				intval($queue_id)
-			);
+	foreach($r as $rr) {
+		if(in_array($rr['outq_hub'],$deadguys))
+			continue;
+		$result = zot_zot($rr['outq_posturl'],$rr['outq_notify']); 
+		if($result['success']) {
+			zot_process_response($result, $rr);				
 		}
 		else {
-			$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
-				intval($q_item['id'])
+			$deadguys[] = $rr['outq_hub'];
+			$y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1",
+				dbesc(datetime_convert()),
+				dbesc($rr['outq_hash'])
 			);
 		}
-		if(! count($qi))
-			continue;
-
-
-		$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-			intval($qi[0]['cid'])
-		);
-		if(! count($c)) {
-			remove_queue_item($q_item['id']);
-			continue;
-		}
-		if(in_array($c[0]['notify'],$deadguys)) {
-				logger('queue: skipping known dead url: ' . $c[0]['notify']);
-				update_queue_time($q_item['id']);
-				continue;
-		}
-
-		$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` 
-			FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($c[0]['uid'])
-		);
-		if(! count($u)) {
-			remove_queue_item($q_item['id']);
-			continue;
-		}
-
-		$data      = $qi[0]['content'];
-		$public    = $qi[0]['batch'];
-		$contact   = $c[0];
-		$owner     = $u[0];
-
-		$deliver_status = 0;
-
-		switch($contact['network']) {
-			case NETWORK_DFRN:
-				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-				$deliver_status = dfrn_deliver($owner,$contact,$data);
-
-				if($deliver_status == (-1)) {
-					update_queue_time($q_item['id']);
-					$deadguys[] = $contact['notify'];
-				}
-				else {
-					remove_queue_item($q_item['id']);
-				}
-				break;
-
-			default:
-				$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
-				call_hooks('queue_deliver', $a, $params);
-		
-				if($params['result'])
-						remove_queue_item($q_item['id']);
-				else
-						update_queue_time($q_item['id']);
-	
-				break;
-
-		}
 	}
-		
-	return;
-
 }
 
 if (array_search(__file__,get_included_files())===0){
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 6e8933aba..c9782b939 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -2,71 +2,17 @@
 
 function update_queue_time($id) {
 	logger('queue: requeue item ' . $id);
-	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
+	q("UPDATE outq SET outq_updated = '%s' WHERE outq_hash = '%s' LIMIT 1",
 		dbesc(datetime_convert()),
-		intval($id)
+		dbesc($id)
 	);
 }
 
 function remove_queue_item($id) {
 	logger('queue: remove queue item ' . $id);
-	q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
-		intval($id)
+	q("DELETE FROM outq WHERE hash = '%s' LIMIT 1",
+		dbesc($id)
 	);
 }
 
-function was_recently_delayed($cid) {
 
-	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d 
-		and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
-		intval($cid)
-	);
-	if(count($r))
-		return true;
-
-	$r = q("select `term_date` from contact where id = %d and `term_date` != '' and `term_date` != '0000-00-00 00:00:00' limit 1",
-		intval($cid)
-	);
-	if(count($r))
-		return true;
-
-	return false;
-}
-
-
-function add_to_queue($cid,$network,$msg,$batch = false) {
-
-	$max_queue = get_config('system','max_contact_queue');
-	if($max_queue < 1)
-		$max_queue = 500;
-
-	$batch_queue = get_config('system','max_batch_queue');
-	if($batch_queue < 1)
-		$batch_queue = 1000;
-
-	$r = q("SELECT COUNT(*) AS `total` FROM `queue` left join `contact` ON `queue`.`cid` = `contact`.`id` 
-		WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
-		intval($cid)
-	);
-	if($r && count($r)) {
-		if($batch &&  ($r[0]['total'] > $batch_queue)) {
-			logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
-			return;
-		}
-		elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
-			logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
-			return;
-		}
-	}
-
-	q("INSERT INTO `queue` ( `cid`, `network`, `created`, `last`, `content`, `batch`)
-		VALUES ( %d, '%s', '%s', '%s', '%s', %d) ",
-		intval($cid),
-		dbesc($network),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc($msg),
-		intval(($batch) ? 1: 0)
-	);
-
-}
diff --git a/mod/connections.php b/mod/connections.php
index 457a2db12..3f7d65d60 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -315,7 +315,8 @@ function connections_content(&$a) {
 
 		$o .= replace_macros($tpl,array(
 
-			'$header' => t('Contact Settings') . ' for ' . $contact['xchan_name'],
+			'$header' => sprintf( t('Connections: settings for %s'),$contact['xchan_name']),
+			'$addr' => $contact['xchan_addr'],
 			'$viewprof' => t('View Profile'),
 			'$lbl_slider' => t('Slide to adjust your degree of friendship'),
 			'$slide' => $slide,
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index abded1979..606e61b80 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,6 +1,7 @@
 
 <h2>$header</h2>
 
+<h3>$addr</h3>
 
 <div id="connection-flag-tabs">
 $tabs