requeue failed deliveries

1 files changed, 4 insertions, 58 deletions

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)
-	);
-
-}