Diabook - move pause icon.

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index 5119a65d8cebaee58cbb8cd007d734541180203a..b703f930b6b80fcef848608dd0826636a5ad8f28 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -2,7 +2,7 @@
 require_once("boot.php");
 require_once('include/queue_fn.php');
 
-function queue_run($argv, $argc){
+function queue_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)){
@@ -61,13 +61,18 @@ function queue_run($argv, $argc){
                q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
        }
                
-       if($queue_id)
+       if($queue_id) {
                $r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
                        intval($queue_id)
                );
-       else
-               $r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
+       }
+       else {
 
+               // 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 ))");
+       }
        if(! count($r)){
                return;
        }
@@ -123,6 +128,7 @@ function queue_run($argv, $argc){
                }
 
                $data      = $qi[0]['content'];
+               $public    = $qi[0]['batch'];
                $contact   = $c[0];
                $owner     = $u[0];
 
@@ -155,7 +161,7 @@ function queue_run($argv, $argc){
                        case NETWORK_DIASPORA:
                                if($contact['notify']) {
                                        logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-                                       $deliver_status = diaspora_transmit($owner,$contact,$data);
+                                       $deliver_status = diaspora_transmit($owner,$contact,$data,$public,true);
 
                                        if($deliver_status == (-1))
                                                update_queue_time($q_item['id']);