Transfer all item shadow functions to the item class

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 6adc32b834cdf1ac4b65abebef8df309e80e978e..96c9fed310aa524845de2d467cf63e425019e1de 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -8,6 +8,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Queue as QueueModel;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\PortableContact;
@@ -15,7 +16,6 @@ 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';
@@ -33,7 +33,7 @@ class Queue
                        logger('queue: start');
 
                        // Handling the pubsubhubbub requests
-                       Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'PubSubPublish');
+                       Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'PubSubPublish');
 
                        $r = q(
                                "SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
@@ -60,7 +60,7 @@ class Queue
                        if (DBM::is_result($r)) {
                                foreach ($r as $q_item) {
                                        logger('Call queue for id ' . $q_item['id']);
-                                       Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Queue", (int) $q_item['id']);
+                                       Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
                                }
                        }
                        return;
@@ -68,21 +68,14 @@ class Queue
 
 
                // delivering
-
-               $r = q(
-                       "SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
-                       intval($queue_id)
-               );
-
-               if (!DBM::is_result($r)) {
+               $q_item = dba::selectFirst('queue', [], ['id' => $queue_id]);
+               if (!DBM::is_result($q_item)) {
                        return;
                }
 
-               $q_item = $r[0];
-
-               $contact = dba::selectOne('contact', [], ['id' => $q_item['cid']]);
+               $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;
                }
 
@@ -90,7 +83,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;
                }
 
@@ -108,14 +101,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::selectOne('user', [], ['uid' => $contact['uid']]);
+               $user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
                if (!DBM::is_result($user)) {
-                       remove_queue_item($q_item['id']);
+                       QueueModel::removeItem($q_item['id']);
                        return;
                }
 
@@ -131,10 +124,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:
@@ -143,10 +136,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;
@@ -156,22 +149,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 = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
+                               $params = ['owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false];
                                call_hooks('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;
                }