<?php
/**
- * @file src/Protocol/PortableContact.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/>.
*
- * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
- * @todo Fetch profile data from profile page for Redmatrix users
- * @todo Detect if it is a forum
*/
namespace Friendica\Protocol;
-use DOMDocument;
-use DOMXPath;
use Exception;
use Friendica\Content\Text\HTML;
-use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
-use Friendica\Model\Contact;
+use Friendica\DI;
use Friendica\Model\GContact;
use Friendica\Model\GServer;
-use Friendica\Model\Profile;
-use Friendica\Module\Register;
-use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
use Friendica\Util\Strings;
-use Friendica\Util\XML;
+/**
+ *
+ * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
+ * @todo Fetch profile data from profile page for Redmatrix users
+ * @todo Detect if it is a forum
+ */
class PortableContact
{
const DISABLED = 0;
return;
}
- $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation');
+ $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation');
Logger::log('load: ' . $url, Logger::DEBUG);
- $fetchresult = Network::fetchUrlFull($url);
+ $fetchresult = DI::httpRequest()->fetchFull($url);
$s = $fetchresult->getBody();
Logger::log('load: returns ' . $s, Logger::DATA);
$j = json_decode($s, true);
- Logger::log('load: json: ' . print_r($j, true), Logger::DATA);
+ Logger::debug('load', ['json' => $j]);
if (!isset($j['entry'])) {
return;
$location = '';
$about = '';
$keywords = '';
- $gender = '';
$contact_type = -1;
$generation = 0;
$about = HTML::toBBCode($entry['aboutMe']);
}
- if (isset($entry['gender'])) {
- $gender = $entry['gender'];
- }
-
if (isset($entry['generation']) && ($entry['generation'] > 0)) {
$generation = ++$entry['generation'];
}
"photo" => $profile_photo,
"about" => $about,
"location" => $location,
- "gender" => $gender,
"keywords" => $keywords,
"connect" => $connect_url,
"updated" => $updated,
{
$r = q(
"SELECT `url`, `site_name` AS `displayName`, `network`, `platform`, `version` FROM `gserver`
- WHERE `network` IN ('%s', '%s', '%s') AND `last_contact` > `last_failure`
+ WHERE `network` IN ('%s', '%s', '%s') AND NOT `failed`
ORDER BY `last_contact`
LIMIT 1000",
DBA::escape(Protocol::DFRN),
*/
private static function fetchServerlist($poco)
{
- $curlResult = Network::curl($poco . "/@server");
+ $curlResult = DI::httpRequest()->get($poco . "/@server");
if (!$curlResult->isSuccess()) {
return;
self::fetchServerlist($server["poco"]);
// Fetch all users from the other server
- $url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+ $url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation";
Logger::info("Fetch all users from the server " . $server["url"]);
- $curlResult = Network::curl($url);
+ $curlResult = DI::httpRequest()->get($url);
if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
$data = json_decode($curlResult->getBody(), true);
self::discoverServer($data, 2);
}
- if (Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS) {
- $timeframe = Config::get('system', 'poco_discovery_since');
+ if (DI::config()->get('system', 'poco_discovery') >= self::USERS_GCONTACTS) {
+ $timeframe = DI::config()->get('system', 'poco_discovery_since');
if ($timeframe == 0) {
$timeframe = 30;
$updatedSince = date(DateTimeFormat::MYSQL, time() - $timeframe * 86400);
// Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
- $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+ $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation";
$success = false;
- $curlResult = Network::curl($url);
+ $curlResult = DI::httpRequest()->get($url);
if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
Logger::info("Fetch all global contacts from the server " . $server["nurl"]);
}
}
- if (!$success && !empty($data) && Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS_FALLBACK) {
+ if (!$success && !empty($data) && DI::config()->get('system', 'poco_discovery') >= self::USERS_GCONTACTS_FALLBACK) {
Logger::info("Fetch contacts from users of the server " . $server["nurl"]);
self::discoverServerUsers($data, $server);
}
Logger::log('Fetch contacts for the user ' . $username . ' from the server ' . $server['nurl'], Logger::DEBUG);
// Fetch all contacts from a given user from the other server
- $url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation';
+ $url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation';
- $curlResult = Network::curl($url);
+ $curlResult = DI::httpRequest()->get($url);
if ($curlResult->isSuccess()) {
$data = json_decode($curlResult->getBody(), true);
$location = '';
$about = '';
$keywords = '';
- $gender = '';
$contact_type = -1;
$generation = $default_generation;
$about = HTML::toBBCode($entry['aboutMe']);
}
- if (isset($entry['gender'])) {
- $gender = $entry['gender'];
- }
-
if (isset($entry['generation']) && ($entry['generation'] > 0)) {
$generation = ++$entry['generation'];
}
"photo" => $profile_photo,
"about" => $about,
"location" => $location,
- "gender" => $gender,
"keywords" => $keywords,
"connect" => $connect_url,
"updated" => $updated,
projects / friendica.git / blobdiff