X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FPortableContact.php;h=cfc140d66d9a45e03993010e1e29a6b2972ae3bf;hb=f4e1acedfcd86c81403c14747ecfd3b11583506e;hp=228a96762cf718810ea25e136cbbf80192c6b552;hpb=69ea65c0f23b224c41ef9b0882f506eeed5b4008;p=friendica.git diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index 228a96762c..cfc140d66d 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -1,34 +1,44 @@ . * - * @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; @@ -37,7 +47,7 @@ class PortableContact const USERS_GCONTACTS_FALLBACK = 3; /** - * @brief Fetch POCO data + * Fetch POCO data * * @param integer $cid Contact ID * @param integer $uid User ID @@ -57,11 +67,11 @@ class PortableContact public static function loadWorker($cid, $uid = 0, $zcid = 0, $url = null) { // Call the function "load" via the worker - Worker::add(PRIORITY_LOW, "DiscoverPoCo", "load", (int)$cid, (int)$uid, (int)$zcid, $url); + Worker::add(PRIORITY_LOW, 'FetchPoCo', (int)$cid, (int)$uid, (int)$zcid, $url); } /** - * @brief Fetch POCO data from the worker + * Fetch POCO data from the worker * * @param integer $cid Contact ID * @param integer $uid User ID @@ -88,11 +98,11 @@ class PortableContact 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); @@ -105,7 +115,7 @@ class PortableContact $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; @@ -123,7 +133,6 @@ class PortableContact $location = ''; $about = ''; $keywords = ''; - $gender = ''; $contact_type = -1; $generation = 0; @@ -168,10 +177,6 @@ class PortableContact $about = HTML::toBBCode($entry['aboutMe']); } - if (isset($entry['gender'])) { - $gender = $entry['gender']; - } - if (isset($entry['generation']) && ($entry['generation'] > 0)) { $generation = ++$entry['generation']; } @@ -192,7 +197,6 @@ class PortableContact "photo" => $profile_photo, "about" => $about, "location" => $location, - "gender" => $gender, "keywords" => $keywords, "connect" => $connect_url, "updated" => $updated, @@ -214,58 +218,8 @@ class PortableContact DBA::delete('glink', $condition); } - public static function alternateOStatusUrl($url) - { - return(preg_match("=https?://.+/user/\d+=ism", $url, $matches)); - } - - public static function updateNeeded($created, $updated, $last_failure, $last_contact) - { - $now = strtotime(DateTimeFormat::utcNow()); - - if ($updated > $last_contact) { - $contact_time = strtotime($updated); - } else { - $contact_time = strtotime($last_contact); - } - - $failure_time = strtotime($last_failure); - $created_time = strtotime($created); - - // If there is no "created" time then use the current time - if ($created_time <= 0) { - $created_time = $now; - } - - // If the last contact was less than 24 hours then don't update - if (($now - $contact_time) < (60 * 60 * 24)) { - return false; - } - - // If the last failure was less than 24 hours then don't update - if (($now - $failure_time) < (60 * 60 * 24)) { - return false; - } - - // If the last contact was less than a week ago and the last failure is older than a week then don't update - //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time)) - // return false; - - // If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week - if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) { - return false; - } - - // If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month - if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) { - return false; - } - - return true; - } - /** - * @brief Returns a list of all known servers + * Returns a list of all known servers * @return array List of server urls * @throws Exception */ @@ -273,7 +227,7 @@ class PortableContact { $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), @@ -289,14 +243,14 @@ class PortableContact } /** - * @brief Fetch server list from remote servers and adds them when they are new. + * Fetch server list from remote servers and adds them when they are new. * * @param string $poco URL to the POCO endpoint * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function fetchServerlist($poco) { - $curlResult = Network::curl($poco . "/@server"); + $curlResult = DI::httpRequest()->get($poco . "/@server"); if (!$curlResult->isSuccess()) { return; @@ -315,72 +269,9 @@ class PortableContact if (!DBA::isResult($r)) { Logger::log("Call server check for server ".$server_url, Logger::DEBUG); - Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server_url); - } - } - } - - private static function discoverFederation() - { - $last = Config::get('poco', 'last_federation_discovery'); - - if ($last) { - $next = $last + (24 * 60 * 60); - - if ($next > time()) { - return; - } - } - - // Discover Friendica, Hubzilla and Diaspora servers - $curlResult = Network::fetchUrl("http://the-federation.info/pods.json"); - - if (!empty($curlResult)) { - $servers = json_decode($curlResult, true); - - if (!empty($servers['pods'])) { - foreach ($servers['pods'] as $server) { - Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", "https://" . $server['host']); - } + Worker::add(PRIORITY_LOW, 'UpdateGServer', $server_url); } } - - // Disvover Mastodon servers - if (!Config::get('system', 'ostatus_disabled')) { - $accesstoken = Config::get('system', 'instances_social_key'); - - if (!empty($accesstoken)) { - $api = 'https://instances.social/api/1.0/instances/list?count=0'; - $header = ['Authorization: Bearer '.$accesstoken]; - $curlResult = Network::curl($api, false, ['headers' => $header]); - - if ($curlResult->isSuccess()) { - $servers = json_decode($curlResult->getBody(), true); - - foreach ($servers['instances'] as $server) { - $url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name']; - Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $url); - } - } - } - } - - // Currently disabled, since the service isn't available anymore. - // It is not removed since I hope that there will be a successor. - // Discover GNU Social Servers. - //if (!Config::get('system','ostatus_disabled')) { - // $serverdata = "http://gstools.org/api/get_open_instances/"; - - // $curlResult = Network::curl($serverdata); - // if ($curlResult->isSuccess()) { - // $servers = json_decode($result->getBody(), true); - - // foreach($servers['data'] as $server) - // GServer::check($server['instance_address']); - // } - //} - - Config::set('poco', 'last_federation_discovery', time()); } public static function discoverSingleServer($id) @@ -395,11 +286,11 @@ class PortableContact 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); @@ -408,8 +299,8 @@ class PortableContact 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; @@ -418,11 +309,11 @@ class PortableContact $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"]); @@ -433,7 +324,7 @@ class PortableContact } } - 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); } @@ -455,48 +346,6 @@ class PortableContact } } - public static function discover($complete = false) - { - // Update the server list - self::discoverFederation(); - - $no_of_queries = 5; - - $requery_days = intval(Config::get('system', 'poco_requery_days')); - - if ($requery_days == 0) { - $requery_days = 7; - } - - $last_update = date('c', time() - (60 * 60 * 24 * $requery_days)); - - $gservers = q("SELECT `id`, `url`, `nurl`, `network` - FROM `gserver` - WHERE `last_contact` >= `last_failure` - AND `poco` != '' - AND `last_poco_query` < '%s' - ORDER BY RAND()", DBA::escape($last_update) - ); - - if (DBA::isResult($gservers)) { - foreach ($gservers as $gserver) { - if (!GServer::check($gserver['url'], $gserver['network'])) { - // The server is not reachable? Okay, then we will try it later - $fields = ['last_poco_query' => DateTimeFormat::utcNow()]; - DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]); - continue; - } - - Logger::log('Update directory from server ' . $gserver['url'] . ' with ID ' . $gserver['id'], Logger::DEBUG); - Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'update_server_directory', (int) $gserver['id']); - - if (!$complete && ( --$no_of_queries == 0)) { - break; - } - } - } - } - private static function discoverServerUsers(array $data, array $server) { if (!isset($data['entry'])) { @@ -520,9 +369,9 @@ class PortableContact 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); @@ -553,7 +402,6 @@ class PortableContact $location = ''; $about = ''; $keywords = ''; - $gender = ''; $contact_type = -1; $generation = $default_generation; @@ -599,10 +447,6 @@ class PortableContact $about = HTML::toBBCode($entry['aboutMe']); } - if (isset($entry['gender'])) { - $gender = $entry['gender']; - } - if (isset($entry['generation']) && ($entry['generation'] > 0)) { $generation = ++$entry['generation']; } @@ -628,7 +472,6 @@ class PortableContact "photo" => $profile_photo, "about" => $about, "location" => $location, - "gender" => $gender, "keywords" => $keywords, "connect" => $connect_url, "updated" => $updated, @@ -647,5 +490,4 @@ class PortableContact } return $success; } - }