Issue 9948: Remove "@" from full text search

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 4c1c2759d8a62fb0e3b8478aaf3dd87a66f991df..cbf678a93f8cc7de4c08f815bf9cb8fb9cdae205 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,10 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Feed;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
@@ -118,20 +139,15 @@ function pubsub_post(App $a)
                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();
 }