Merge https://github.com/friendica/dir into dpull

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index d4fc7dbd6277d0aa0cebd7fe198fa5a2efdc0d54..7e92705be27db7e639c547b8a6c2a45853aeef96 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,34 +1,20 @@
 <?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;
+       global $a, $db;
 
-  if(is_null($a)){
-    $a = new App;
-  }
+       if(is_null($a)){
+               $a = new App;
+       }
   
-  if(is_null($db)){
-    @include(".htconfig.php");
-    require_once("dba.php");
-    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-    unset($db_host, $db_user, $db_pass, $db_data);
-  };
+       if(is_null($db)){
+               @include(".htconfig.php");
+               require_once("dba.php");
+               $db = new dba($db_host, $db_user, $db_pass, $db_data);
+               unset($db_host, $db_user, $db_pass, $db_data);
+       };
 
 
        require_once("session.php");
@@ -36,12 +22,34 @@ function queue_run($argv, $argc){
        require_once('include/items.php');
        require_once('include/bbcode.php');
 
+       load_config('config');
+       load_config('system');
+
        $a->set_baseurl(get_config('system','url'));
 
+       load_hooks();
+
+       if($argc > 1)
+               $queue_id = intval($argv[1]);
+       else
+               $queue_id = 0;
+
        $deadguys = array();
 
        logger('queue: start');
 
+       $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
+
+       $r = q("select * from deliverq where 1");
+       if(count($r)) {
+               foreach($r as $rr) {
+                       logger('queue: deliverq');
+                       proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
+                       if($interval)
+                               @time_sleep_until(microtime(true) + (float) $interval);
+               }
+       }
+
        $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
                LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
                WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@@ -53,22 +61,50 @@ function queue_run($argv, $argc){
                q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
        }
                
-       $r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
+       if($queue_id) {
+               $r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
+                       intval($queue_id)
+               );
+       }
+       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;
        }
+
+       if(! $queue_id)
+               call_hooks('queue_predeliver', $a, $r);
+
+
        // delivery loop
 
        require_once('include/salmon.php');
+       require_once('include/diaspora.php');
 
        foreach($r as $q_item) {
-               $qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
-                       intval($q_item['id'])
-               );
+
+               // queue_predeliver hooks may have changed the queue db details, 
+               // so check again if this entry still needs processing
+
+               if($queue_id) {
+                       $qi = q("select * from queue where `id` = %d limit 1",
+                               intval($queue_id)
+                       );
+               }
+               else {
+                       $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'])
                );
@@ -82,7 +118,8 @@ function queue_run($argv, $argc){
                                continue;
                }
 
-               $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+               $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` 
+                       FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($c[0]['uid'])
                );
                if(! count($u)) {
@@ -91,13 +128,14 @@ function queue_run($argv, $argc){
                }
 
                $data      = $qi[0]['content'];
+               $public    = $qi[0]['batch'];
                $contact   = $c[0];
                $owner     = $u[0];
 
                $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);
 
@@ -109,7 +147,7 @@ function queue_run($argv, $argc){
                                        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);
@@ -120,6 +158,29 @@ function queue_run($argv, $argc){
                                                remove_queue_item($q_item['id']);
                                }
                                break;
+                       case NETWORK_DIASPORA:
+                               if($contact['notify']) {
+                                       logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
+                                       $deliver_status = diaspora_transmit($owner,$contact,$data,$public);
+
+                                       if($deliver_status == (-1))
+                                               update_queue_time($q_item['id']);
+                                       else
+                                               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;
+
                }
        }