Missing dba::selectFirst in Model\Item

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 1c83e77d7714603a05e453456f9bcd16472a62f7..10a83e5c4bf0be0ca2414002909554bb93538146 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -4,19 +4,18 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Core\Addon;
 use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Protocol\Diaspora;
+use Friendica\Model\Queue as QueueModel;
 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/queue_fn.php';
-require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
 
@@ -55,7 +54,7 @@ class Queue
                         */
                        $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
 
-                       call_hooks('queue_predeliver', $r);
+                       Addon::callHooks('queue_predeliver', $r);
 
                        if (DBM::is_result($r)) {
                                foreach ($r as $q_item) {
@@ -75,7 +74,7 @@ class Queue
 
                $contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
                if (!DBM::is_result($contact)) {
-                       remove_queue_item($q_item['id']);
+                       QueueModel::removeItem($q_item['id']);
                        return;
                }
 
@@ -83,7 +82,7 @@ class Queue
 
                if (!is_null($dead) && $dead) {
                        logger('queue: skipping known dead url: ' . $contact['notify']);
-                       update_queue_time($q_item['id']);
+                       QueueModel::updateTime($q_item['id']);
                        return;
                }
 
@@ -101,14 +100,14 @@ class Queue
 
                        if (!is_null($vital) && !$vital) {
                                logger('queue: skipping dead server: ' . $server);
-                               update_queue_time($q_item['id']);
+                               QueueModel::updateTime($q_item['id']);
                                return;
                        }
                }
 
                $user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
                if (!DBM::is_result($user)) {
-                       remove_queue_item($q_item['id']);
+                       QueueModel::removeItem($q_item['id']);
                        return;
                }
 
@@ -124,10 +123,10 @@ class Queue
                                $deliver_status = DFRN::deliver($owner, $contact, $data);
 
                                if ($deliver_status == (-1)) {
-                                       update_queue_time($q_item['id']);
+                                       QueueModel::updateTime($q_item['id']);
                                        Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                } else {
-                                       remove_queue_item($q_item['id']);
+                                       QueueModel::removeItem($q_item['id']);
                                }
                                break;
                        case NETWORK_OSTATUS:
@@ -136,10 +135,10 @@ class Queue
                                        $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
 
                                        if ($deliver_status == (-1)) {
-                                               update_queue_time($q_item['id']);
+                                               QueueModel::updateTime($q_item['id']);
                                                Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                        } else {
-                                               remove_queue_item($q_item['id']);
+                                               QueueModel::removeItem($q_item['id']);
                                        }
                                }
                                break;
@@ -149,22 +148,22 @@ class Queue
                                        $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true);
 
                                        if ($deliver_status == (-1)) {
-                                               update_queue_time($q_item['id']);
+                                               QueueModel::updateTime($q_item['id']);
                                                Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                        } else {
-                                               remove_queue_item($q_item['id']);
+                                               QueueModel::removeItem($q_item['id']);
                                        }
                                }
                                break;
 
                        default:
                                $params = ['owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false];
-                               call_hooks('queue_deliver', $params);
+                               Addon::callHooks('queue_deliver', $params);
 
                                if ($params['result']) {
-                                       remove_queue_item($q_item['id']);
+                                       QueueModel::removeItem($q_item['id']);
                                } else {
-                                       update_queue_time($q_item['id']);
+                                       QueueModel::updateTime($q_item['id']);
                                }
                                break;
                }