X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FPubSubPublish.php;h=b6061f819995264c0abc83b1ba89f6ae3d1f106c;hb=066ad8c01b25b7101ad6fb36878d85c97db51a6f;hp=4709708ae1c6f710b3800071bb1646a4d0152915;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 4709708ae1..b6061f8199 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -5,16 +5,13 @@
 
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;
 
-require_once 'include/items.php';
-
 class PubSubPublish
 {
 	public static function execute($pubsubpublish_id = 0)
@@ -28,17 +25,15 @@ class PubSubPublish
 
 	private static function publish($id)
 	{
-		$a = BaseObject::getApp();
-
 		$subscriber = DBA::selectFirst('push_subscriber', [], ['id' => $id]);
-		if (!DBM::is_result($subscriber)) {
+		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
 		/// @todo Check server status with PortableContact::checkServer()
 		// Before this can be done we need a way to safely detect the server url.
 
-		logger("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], LOGGER_DEBUG);
+		Logger::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], Logger::DEBUG);
 
 		$last_update = $subscriber['last_update'];
 		$params = OStatus::feed($subscriber['nickname'], $last_update);
@@ -55,19 +50,17 @@ class PubSubPublish
 					$subscriber['topic']),
 				"X-Hub-Signature: sha1=" . $hmac_sig];
 
-		logger('POST ' . print_r($headers, true) . "\n" . $params, LOGGER_DATA);
-
-		Network::post($subscriber['callback_url'], $params, $headers);
-		$ret = $a->get_curl_code();
+		Logger::log('POST ' . print_r($headers, true) . "\n" . $params, Logger::DATA);
 
-		$condition = ['id' => $subscriber['id']];
+		$postResult = Network::post($subscriber['callback_url'], $params, $headers);
+		$ret = $postResult->getReturnCode();
 
 		if ($ret >= 200 && $ret <= 299) {
-			logger('Successfully pushed to ' . $subscriber['callback_url']);
+			Logger::log('Successfully pushed to ' . $subscriber['callback_url']);
 
 			PushSubscriber::reset($subscriber['id'], $last_update);
 		} else {
-			logger('Delivery error when pushing to ' . $subscriber['callback_url'] . ' HTTP: ' . $ret);
+			Logger::log('Delivery error when pushing to ' . $subscriber['callback_url'] . ' HTTP: ' . $ret);
 
 			PushSubscriber::delay($subscriber['id']);
 		}