Rename DBA::is_result to DBA::isResult

[friendica.git] / src / Worker / Queue.php

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index aaf8df752d68f7145371f998f4174305c66a458c..1a344ac541352e17ca7b475b0d4beb9f93526482 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -8,13 +8,14 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\PushSubscriber;
 use Friendica\Model\Queue as QueueModel;
+use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
-use dba;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
@@ -23,8 +24,6 @@ class Queue
 {
        public static function execute($queue_id = 0)
        {
-               global $a;
-
                $cachekey_deadguy = 'queue_run:deadguy:';
                $cachekey_server = 'queue_run:server:';
 
@@ -34,13 +33,13 @@ class Queue
                        logger('filling queue jobs - start');
 
                        // Handling the pubsubhubbub requests
-                       Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'PubSubPublish');
+                       PushSubscriber::requeue();
 
-                       $r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP()"));
+                       $r = DBA::toArray(DBA::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
 
                        Addon::callHooks('queue_predeliver', $r);
 
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                foreach ($r as $q_item) {
                                        logger('Call queue for id ' . $q_item['id']);
                                        Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
@@ -52,18 +51,18 @@ class Queue
 
 
                // delivering
-               $q_item = dba::selectFirst('queue', [], ['id' => $queue_id]);
-               if (!DBM::is_result($q_item)) {
+               $q_item = DBA::selectFirst('queue', [], ['id' => $queue_id]);
+               if (!DBA::isResult($q_item)) {
                        return;
                }
 
-               $contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
-               if (!DBM::is_result($contact)) {
+               $contact = DBA::selectFirst('contact', [], ['id' => $q_item['cid']]);
+               if (!DBA::isResult($contact)) {
                        QueueModel::removeItem($q_item['id']);
                        return;
                }
 
-               if (empty($contact['notify'])) {
+               if (empty($contact['notify']) || $contact['archive']) {
                        QueueModel::removeItem($q_item['id']);
                        return;
                }
@@ -86,7 +85,7 @@ class Queue
                                        logger("Check server " . $server . " (" . $contact["network"] . ")");
 
                                        $vital = PortableContact::checkServer($server, $contact["network"], true);
-                                       Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_server . $server, $vital, CACHE_MINUTE);
                                }
 
                                if (!is_null($vital) && !$vital) {
@@ -97,15 +96,15 @@ class Queue
                        }
                }
 
-               $user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
-               if (!DBM::is_result($user)) {
+               $user = DBA::selectFirst('user', [], ['uid' => $contact['uid']]);
+               if (!DBA::isResult($user)) {
                        QueueModel::removeItem($q_item['id']);
                        return;
                }
 
                $data   = $q_item['content'];
                $public = $q_item['batch'];
-               $owner  = $user;
+               $owner  = User::getOwnerDataById($user['uid']);
 
                $deliver_status = 0;
 
@@ -118,7 +117,7 @@ class Queue
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
                                }
                                break;
                        case NETWORK_OSTATUS:
@@ -127,7 +126,7 @@ class Queue
 
                                if ($deliver_status == -1) {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
                                } else {
                                        QueueModel::removeItem($q_item['id']);
                                }
@@ -136,11 +135,12 @@ class Queue
                                logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
 
-                               if (($deliver_status >= 200) && ($deliver_status <= 299)) {
+                               if ((($deliver_status >= 200) && ($deliver_status <= 299)) ||
+                                       ($contact['contact-type'] == ACCOUNT_TYPE_RELAY)) {
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
                                }
                                break;