X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=fe5bb3c0b61e1b2575bec54a036722136a930069;hb=c41aaf8a17405e4e11366fec14519994612744b1;hp=ece95dceabce945527735cd941268d3834fedb15;hpb=aa0b485f3dca72c5448076e913fa54d948cd7731;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index ece95dceab..fe5bb3c0b6 100644
--- 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
  *
@@ -25,11 +25,11 @@ 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;
-use Friendica\Core\System;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
 
 function hub_return($valid, $body)
 {
@@ -134,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 = '';
-	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) {
-		Feed::consume($xml, $importer, $contact, $feedhub);
-	}
+	OStatus::import($xml, $importer, $contact, $feedhub);
 
 	hub_post_return();
 }