X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FPubSubPublish.php;h=a5381c18d16a6af23684cb01cfc73b451deaee5e;hb=2647514603852fe5fb9f47f0bf153dd20c124ce6;hp=1e18b4ccfa097b81aedcfb364e60754bc18a545d;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 1e18b4ccfa..a5381c18d1 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -1,18 +1,31 @@
 <?php
 /**
- * @file src/Worker/PubSubPublish.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
-use Friendica\Core\System;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\OStatus;
-use Friendica\Util\Network;
-
-require_once 'include/items.php';
 
 class PubSubPublish
 {
@@ -27,17 +40,15 @@ class PubSubPublish
 
 	private static function publish($id)
 	{
-		$a = BaseObject::getApp();
-
 		$subscriber = DBA::selectFirst('push_subscriber', [], ['id' => $id]);
 		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
-		/// @todo Check server status with PortableContact::checkServer()
+		/// @todo Check server status with GServer::check()
 		// 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);
@@ -50,23 +61,21 @@ class PubSubPublish
 
 		$headers = ["Content-type: application/atom+xml",
 				sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-					System::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
+					DI::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
 					$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 = DI::httpRequest()->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']);
 		}