X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=5214131b2bf0ed1e119b98379857838d6cf8ea20;hb=e55f9f8f07c42d1accf28ce31a100a671f2738c9;hp=3c1087f4eb68fb32d12608ba54af35f8cb6e6723;hpb=4bee1859be5fbf46ecc19728a908e31b4e9b09b6;p=friendica.git

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 3c1087f4eb..5214131b2b 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -2,7 +2,7 @@
 
 function update_queue_time($id) {
 	logger('queue: requeue item ' . $id);
-	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
+	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
 		dbesc(datetime_convert()),
 		intval($id)
 	);
@@ -10,11 +10,29 @@ function update_queue_time($id) {
 
 function remove_queue_item($id) {
 	logger('queue: remove queue item ' . $id);
-	q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
+	q("DELETE FROM `queue` WHERE `id` = %d",
 		intval($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) {
 
@@ -26,7 +44,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
 	if($batch_queue < 1)
 		$batch_queue = 1000;
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `queue` left join `contact` ON `queue`.`cid` = `contact`.`id` 
+	$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
 		WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
 		intval($cid)
 	);