<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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)
{
}
}
+ 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();
}