<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @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\OStatus;
use Friendica\Util\Strings;
-
-require_once 'include/items.php';
+use Friendica\Util\Network;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
function hub_return($valid, $body)
{
if ($valid) {
- header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
echo $body;
} else {
- header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found');
+ throw new \Friendica\Network\HTTPException\NotFoundException();
}
- killme();
+ exit();
}
// when receiving an XML feed, always return OK
function hub_post_return()
{
- header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
- killme();
+ throw new \Friendica\Network\HTTPException\OKException();
}
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(defaults($_GET, 'hub_mode', '')));
- $hub_topic = Strings::escapeTags(trim(defaults($_GET, 'hub_topic', '')));
- $hub_challenge = Strings::escapeTags(trim(defaults($_GET, 'hub_challenge', '')));
- $hub_lease = Strings::escapeTags(trim(defaults($_GET, 'hub_lease_seconds', '')));
- $hub_verify = Strings::escapeTags(trim(defaults($_GET, 'hub_verify_token', '')));
+ $hub_mode = Strings::escapeTags(trim($_GET['hub_mode'] ?? ''));
+ $hub_topic = Strings::escapeTags(trim($_GET['hub_topic'] ?? ''));
+ $hub_challenge = Strings::escapeTags(trim($_GET['hub_challenge'] ?? ''));
+ $hub_verify = Strings::escapeTags(trim($_GET['hub_verify_token'] ?? ''));
Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);
}
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);
function pubsub_post(App $a)
{
- $xml = file_get_contents('php://input');
+ $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])) : '');
- $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)) {
}
}
+ 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();
}
projects / friendica.git / blobdiff