X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FQueue.php;h=b27a776c7a9e65b7a62a93208a2db98f52699ea9;hb=de8787dd5bb9fadd6388c050bad35ec4c0332e08;hp=25c963fabcb4fa7a55d4108add1e2a289cf0dd3a;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 25c963fabc..b27a776c7a 100644
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -7,9 +7,10 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
+use Friendica\Model\Contact;
 use Friendica\Model\PushSubscriber;
 use Friendica\Model\Queue as QueueModel;
 use Friendica\Model\User;
@@ -36,11 +37,11 @@ class Queue
 			// Handling the pubsubhubbub requests
 			PushSubscriber::requeue();
 
-			$r = DBA::inArray(DBA::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
+			$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']);
@@ -53,12 +54,12 @@ class Queue
 
 		// delivering
 		$q_item = DBA::selectFirst('queue', [], ['id' => $queue_id]);
-		if (!DBM::is_result($q_item)) {
+		if (!DBA::isResult($q_item)) {
 			return;
 		}
 
 		$contact = DBA::selectFirst('contact', [], ['id' => $q_item['cid']]);
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			QueueModel::removeItem($q_item['id']);
 			return;
 		}
@@ -98,7 +99,7 @@ class Queue
 		}
 
 		$user = DBA::selectFirst('user', [], ['uid' => $contact['uid']]);
-		if (!DBM::is_result($user)) {
+		if (!DBA::isResult($user)) {
 			QueueModel::removeItem($q_item['id']);
 			return;
 		}
@@ -110,7 +111,7 @@ class Queue
 		$deliver_status = 0;
 
 		switch ($contact['network']) {
-			case NETWORK_DFRN:
+			case Protocol::DFRN:
 				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
 				$deliver_status = DFRN::deliver($owner, $contact, $data);
 
@@ -121,7 +122,8 @@ class Queue
 					Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
 				}
 				break;
-			case NETWORK_OSTATUS:
+
+			case Protocol::OSTATUS:
 				logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
 				$deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
 
@@ -132,12 +134,13 @@ class Queue
 					QueueModel::removeItem($q_item['id']);
 				}
 				break;
-			case NETWORK_DIASPORA:
+
+			case Protocol::DIASPORA:
 				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)) ||
-					($contact['contact-type'] == ACCOUNT_TYPE_RELAY)) {
+					($contact['contact-type'] == Contact::ACCOUNT_TYPE_RELAY)) {
 					QueueModel::removeItem($q_item['id']);
 				} else {
 					QueueModel::updateTime($q_item['id']);