<?php
require_once("boot.php");
-
-function update_queue_time($id) {
- logger('queue: requeue item ' . $id);
- q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
- dbesc(datetime_convert()),
- intval($id)
- );
-}
-
-function remove_queue_item($id) {
- logger('queue: remove queue item ' . $id);
- q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
- intval($id)
- );
-}
+require_once('include/queue_fn.php');
function queue_run($argv, $argc){
global $a, $db;
$a->set_baseurl(get_config('system','url'));
+ load_hooks();
+
$deadguys = array();
logger('queue: start');
if(! count($r)){
return;
}
+
+ call_hooks('queue_predeliver', $a, $r);
+
+
// delivery loop
require_once('include/salmon.php');
foreach($r as $q_item) {
- $qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
+
+ // queue_predeliver hooks may have changed the queue db details,
+ // so check again if this entry still needs processing
+
+ $qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
intval($q_item['id'])
);
if(! count($qi))
continue;
+
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($qi[0]['cid'])
);
$deliver_status = 0;
switch($contact['network']) {
- case 'dfrn':
+ case NETWORK_DFRN:
logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
$deliver_status = dfrn_deliver($owner,$contact,$data);
remove_queue_item($q_item['id']);
}
break;
- default:
+ case NETWORK_OSTATUS:
if($contact['notify']) {
logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
$deliver_status = slapper($owner,$contact['notify'],$data);
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;
+
}
}