X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FWorker%2FQueue.php;h=96c9fed310aa524845de2d467cf63e425019e1de;hb=c4d3ab68785122ff070c65a444aaa0833b746b2b;hp=47f1c8044b0b50039f7681989e086feff31b3142;hpb=16fb01454759dfe2c127c3656a0982e84fa6f8f8;p=friendica.git

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 47f1c8044b..96c9fed310 100644
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -1,25 +1,24 @@
 <?php
-
 /**
  * @file src/Worker/Queue.php
  */
-
 namespace Friendica\Worker;
 
 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;
+use Friendica\Protocol\Salmon;
 use dba;
 
-require_once 'include/queue_fn.php';
+require_once 'include/dba.php';
 require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
-require_once 'include/salmon.php';
 
 class Queue
 {
@@ -34,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`
@@ -56,12 +55,12 @@ 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', $a, $r);
+			call_hooks('queue_predeliver', $r);
 
 			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;
@@ -69,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::select('contact', [], ['id' => $q_item['cid']], ['limit' => 1]);
+		$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;
 		}
 
@@ -91,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;
 		}
 
@@ -109,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::select('user', [], ['uid' => $contact['uid']], ['limit' => 1]);
+		$user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
 		if (!DBM::is_result($user)) {
-			remove_queue_item($q_item['id']);
+			QueueModel::removeItem($q_item['id']);
 			return;
 		}
 
@@ -132,22 +124,22 @@ 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:
 				if ($contact['notify']) {
 					logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
-					$deliver_status = slapper($owner, $contact['notify'], $data);
+					$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;
@@ -157,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);
-				call_hooks('queue_deliver', $a, $params);
+				$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;
 		}