Merge pull request #6977 from annando/fix-reshare

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 8dc34a594a1eda8a035d2a505b87a5c2b8b2026d..48e962f03647d7a95290c296f53445894868e48d 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -4,9 +4,9 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
@@ -20,9 +20,6 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 class Queue
 {
        public static function execute($queue_id = 0)
@@ -40,7 +37,7 @@ class Queue
 
                        $r = DBA::toArray(DBA::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
 
-                       Addon::callHooks('queue_predeliver', $r);
+                       Hook::callAll('queue_predeliver', $r);
 
                        if (DBA::isResult($r)) {
                                foreach ($r as $q_item) {
@@ -141,7 +138,7 @@ class Queue
                                $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
 
                                if ((($deliver_status >= 200) && ($deliver_status <= 299)) ||
-                                       ($contact['contact-type'] == Contact::ACCOUNT_TYPE_RELAY)) {
+                                       ($contact['contact-type'] == Contact::TYPE_RELAY)) {
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
@@ -151,7 +148,7 @@ class Queue
 
                        default:
                                $params = ['owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false];
-                               Addon::callHooks('queue_deliver', $params);
+                               Hook::callAll('queue_deliver', $params);
 
                                if ($params['result']) {
                                        QueueModel::removeItem($q_item['id']);