Merge pull request #10479 from MrPetovan/task/9378-merge-share-template

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index cae346493f4be64db27dd089ff1b5ac2103b3ce5..fe5bb3c0b61e1b2575bec54a036722136a930069 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)
 {
@@ -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();
 }