aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/queue_fn.php20
-rw-r--r--include/zot.php5
2 files changed, 19 insertions, 6 deletions
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 5c6570f66..8449c1d72 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,6 +1,6 @@
<?php /** @file */
-function update_queue_time($id, $add_priority = 0) {
+function update_queue_item($id, $add_priority = 0) {
logger('queue: requeue item ' . $id,LOGGER_DEBUG);
q("UPDATE outq SET outq_updated = '%s', outq_priority = outq_priority + %d WHERE outq_hash = '%s'",
dbesc(datetime_convert()),
@@ -18,6 +18,17 @@ function remove_queue_item($id,$channel_id = 0) {
);
}
+
+function remove_queue_by_posturl($posturl) {
+ logger('queue: remove queue posturl ' . $posturl,LOGGER_DEBUG);
+
+ q("DELETE FROM outq WHERE outq_posturl = '%s' ",
+ dbesc($posturl)
+ );
+}
+
+
+
function queue_set_delivered($id,$channel = 0) {
logger('queue: set delivered ' . $id,LOGGER_DEBUG);
$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
@@ -29,16 +40,19 @@ function queue_set_delivered($id,$channel = 0) {
}
+
function queue_insert($arr) {
- $x = q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created,
- outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+ $x = q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_priority,
+ outq_created, outq_updated, outq_notify, outq_msg )
+ values ( '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' )",
dbesc($arr['hash']),
intval($arr['account_id']),
intval($arr['channel_id']),
dbesc(($arr['driver']) ? $arr['driver'] : 'zot'),
dbesc($arr['posturl']),
intval(1),
+ intval(($arr['priority']) ? $arr['priority'] : 0),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($arr['notify']),
diff --git a/include/zot.php b/include/zot.php
index 8f8e70159..f78639d43 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -4152,9 +4152,8 @@ function zot_reply_pickup($data) {
}
else
$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x);
- $x = q("delete from outq where outq_hash = '%s'",
- dbesc($rr['outq_hash'])
- );
+
+ remove_queue_item($rr['outq_hash']);
}
}
}