Merge remote-tracking branch 'upstream/develop' into user-contact

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index cae346493f4be64db27dd089ff1b5ac2103b3ce5..1dfbd0b3dc9960f72848dc156400f6e2e489b5d9 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,7 +28,8 @@ use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
-use Friendica\Core\System;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
 
 function hub_return($valid, $body)
 {
@@ -49,8 +50,8 @@ function hub_post_return()
 
 function pubsub_init(App $a)
 {
-       $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
-       $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
+       $nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : '');
+       $contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2])       : 0 );
 
        if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                $hub_mode      = Strings::escapeTags(trim($_GET['hub_mode'] ?? ''));
@@ -95,7 +96,7 @@ function pubsub_init(App $a)
                }
 
                if (!empty($hub_mode)) {
-                       DBA::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
+                       Contact::update(['subhub' => $subscribe], ['id' => $contact['id']]);
                        Logger::log($hub_mode . ' success for contact ' . $contact_id . '.');
                }
                hub_return(true, $hub_challenge);
@@ -109,8 +110,8 @@ function pubsub_post(App $a)
        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])) : '');
-       $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
+       $nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : '');
+       $contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2])       : 0 );
 
        $importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
        if (!DBA::isResult($importer)) {
@@ -133,25 +134,24 @@ function pubsub_post(App $a)
                }
        }
 
+       if (!empty($contact['gsid'])) {
+               GServer::setProtocol($contact['gsid'], Post\DeliveryData::OSTATUS);
+       }
+
        if (!in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND]) && ($contact['network'] != Protocol::FEED)) {
                Logger::log('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.');
                hub_post_return();
        }
 
-       // We import feeds from OStatus, Friendica and ATOM/RSS.
-       /// @todo Check if Friendica posts really arrive here - otherwise we can discard some stuff
-       if (!in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN, Protocol::FEED])) {
+       // We only import feeds from OStatus here
+       if ($contact['network'] != Protocol::OSTATUS) {
+               Logger::warning('Unexpected network', ['contact' => $contact]);
                hub_post_return();
        }
 
        Logger::log('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
        $feedhub = '';
-       consume_feed($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);
-       }
+       OStatus::import($xml, $importer, $contact, $feedhub);
 
        hub_post_return();
 }