Merge pull request #8900 from tobiasd/20200718-serverblocklistcsv

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index c008fb09dac3b93d887005f66c8874f576f45148..ece95dceabce945527735cd941268d3834fedb15 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,10 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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/>.
+ *
+ */
 
 use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Protocol\Feed;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
@@ -86,7 +107,7 @@ function pubsub_post(App $a)
 {
        $xml = Network::postdata();
 
-       Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
+       Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  DI::args()->getCommand() . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
        Logger::log('Data: ' . $xml, Logger::DATA);
 
        $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
@@ -126,11 +147,11 @@ function pubsub_post(App $a)
 
        Logger::log('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
        $feedhub = '';
-       consume_feed($xml, $importer, $contact, $feedhub);
+       Feed::consume($xml, $importer, $contact, $feedhub);
 
        // do it a second time for DFRN so that any children find their parents.
        if ($contact['network'] === Protocol::DFRN) {
-               consume_feed($xml, $importer, $contact, $feedhub);
+               Feed::consume($xml, $importer, $contact, $feedhub);
        }
 
        hub_post_return();