Fixings

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

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 9f5fcdcc5fed056de4f709d5cb6437faf4214445..8e38ff8128b633e6c9cac1d21215722b79eef069 100644 (file)
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -5,10 +5,9 @@
 
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
 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;
@@ -26,14 +25,12 @@ 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::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], Logger::DEBUG);
@@ -49,7 +46,7 @@ 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];
 
@@ -58,8 +55,6 @@ class PubSubPublish
                $postResult = Network::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']);