NL translation update THX Walis

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

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 0a60e5a5995ffc007598f8ad68a931cb20b61c7e..df3776b48f3f42cf7244107a48cf5fcfea16e9bd 100644 (file)
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -5,17 +5,16 @@
 
 namespace Friendica\Worker;
 
-use Friendica\App;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\PushSubscriber;
+use Friendica\Model\GServer;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;
-use Friendica\Model\PushSubscriber;
-use dba;
-
-require_once 'include/items.php';
 
-class PubSubPublish {
+class PubSubPublish
+{
        public static function execute($pubsubpublish_id = 0)
        {
                if ($pubsubpublish_id == 0) {
@@ -25,18 +24,17 @@ class PubSubPublish {
                self::publish($pubsubpublish_id);
        }
 
-       private static function publish($id) {
-               global $a;
-
-               $subscriber = dba::selectFirst('push_subscriber', [], ['id' => $id]);
-               if (!DBM::is_result($subscriber)) {
+       private static function publish($id)
+       {
+               $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);
@@ -53,19 +51,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']);
                }