Merge pull request #12680 from nupplaphil/feat/addon_logger

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

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index e5cbfb785b98f1bf0fcbf0186f1035a9dc05577f..bb10361c5800b94b53cb0744edc4a1abd138f806 100644 (file)
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -1,20 +1,41 @@
 <?php
 /**
- * @file src/Worker/PubSubPublish.php
+ * @copyright Copyright (C) 2010-2023, 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\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\OStatus;
-use Friendica\Util\Network;
 
 class PubSubPublish
 {
-       public static function execute($pubsubpublish_id = 0)
+       /**
+        * Publishes subscriber id
+        *
+        * @param int $pubsubpublish_id Push subscriber id
+        * @return void
+        */
+       public static function execute(int $pubsubpublish_id = 0)
        {
                if ($pubsubpublish_id == 0) {
                        return;
@@ -23,19 +44,23 @@ class PubSubPublish
                self::publish($pubsubpublish_id);
        }
 
-       private static function publish($id)
+       /**
+        * Publishes push subscriber
+        *
+        * @param int $id Push subscriber id
+        * @return void
+        */
+       private static function publish(int $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::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], Logger::DEBUG);
+               Logger::info('Generate feed of user ' . $subscriber['nickname'] . ' to ' . $subscriber['callback_url'] . ' - last updated ' . $subscriber['last_update']);
 
                $last_update = $subscriber['last_update'];
                $params = OStatus::feed($subscriber['nickname'], $last_update);
@@ -44,27 +69,26 @@ class PubSubPublish
                        return;
                }
 
-               $hmac_sig = hash_hmac("sha1", $params, $subscriber['secret']);
+               $hmac_sig = hash_hmac('sha1', $params, $subscriber['secret']);
 
-               $headers = ["Content-type: application/atom+xml",
-                               sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-                                       System::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
+               $headers = [
+                       'Content-type' => 'application/atom+xml',
+                       'Link' => sprintf('<%s>;rel=hub,<%s>;rel=self',
+                                       DI::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'],
                                        $subscriber['topic']),
-                               "X-Hub-Signature: sha1=" . $hmac_sig];
+                       'X-Hub-Signature' => 'sha1=' . $hmac_sig];
 
-               Logger::log('POST ' . print_r($headers, true) . "\n" . $params, Logger::DATA);
+               Logger::debug('POST', ['headers' => $headers, 'params' => $params]);
 
-               $postResult = Network::post($subscriber['callback_url'], $params, $headers);
+               $postResult = DI::httpClient()->post($subscriber['callback_url'], $params, $headers);
                $ret = $postResult->getReturnCode();
 
-               $condition = ['id' => $subscriber['id']];
-
                if ($ret >= 200 && $ret <= 299) {
-                       Logger::log('Successfully pushed to ' . $subscriber['callback_url']);
+                       Logger::info('Successfully pushed to ' . $subscriber['callback_url']);
 
                        PushSubscriber::reset($subscriber['id'], $last_update);
                } else {
-                       Logger::log('Delivery error when pushing to ' . $subscriber['callback_url'] . ' HTTP: ' . $ret);
+                       Logger::notice('Delivery error when pushing to ' . $subscriber['callback_url'] . ' HTTP: ' . $ret);
 
                        PushSubscriber::delay($subscriber['id']);
                }