Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8046 from annando/develop

Browse source 
Relocated functions from PortableContact to GServer
This commit is contained in:
Hypolite Petovan 2020-01-01 18:20:31 -05:00 committed by GitHub
parent 75c74e8562 fb550a0172
commit 7420d07699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 96 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/Search.php
View file

@ -205,10 +205,6 @@ class Search
} }
while ($row = DBA::fetch($data)) { while ($row = DBA::fetch($data)) {
if (PortableContact::alternateOStatusUrl($row["nurl"])) {
continue;
}
$urlParts = parse_url($row["nurl"]); $urlParts = parse_url($row["nurl"]);
// Ignore results that look strange. // Ignore results that look strange.

94
src/Model/GServer.php
View file

@ -1306,4 +1306,98 @@ class GServer
PortableContact::discoverSingleServer($gserver['id']); PortableContact::discoverSingleServer($gserver['id']);
} }
} }
/**
* Update GServer entries
*/
public static function discover()
{
// 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 = DBA::p("SELECT `id`, `url`, `nurl`, `network`, `poco`
FROM `gserver`
WHERE `last_contact` >= `last_failure`
AND `poco` != ''
AND `last_poco_query` < ?
ORDER BY RAND()", $last_update
);
while ($gserver = DBA::fetch($gservers)) {
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::info('Update directory', ['server' => $gserver['url'], 'id' => $gserver['id']]);
Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', $gserver);
if (--$no_of_queries == 0) {
break;
}
}
DBA::close($gservers);
}
/**
* Discover federated servers
*/
private static function discoverFederation()
{
$last = Config::get('poco', 'last_federation_discovery');
if ($last) {
$next = $last + (24 * 60 * 60);
if ($next > time()) {
return;
}
}
// Discover federated 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, 'UpdateGServer', 'https://' . $server['host']);
}
}
}
// Disvover Mastodon servers
$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, 'UpdateGServer', $url);
}
}
}
Config::set('poco', 'last_federation_discovery', time());
}
} }

111
src/Protocol/PortableContact.php
View file

@ -214,11 +214,6 @@ class PortableContact
DBA::delete('glink', $condition); DBA::delete('glink', $condition);
} }
public static function alternateOStatusUrl($url)
{
return(preg_match("=https?://.+/user/\d+=ism", $url, $matches));
}
/** /**
* @brief Returns a list of all known servers * @brief Returns a list of all known servers
* @return array List of server urls * @return array List of server urls
@ -275,69 +270,6 @@ class PortableContact
} }
} }
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, 'UpdateGServer', 'https://' . $server['host']);
}
}
}
// 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, 'UpdateGServer', $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) public static function discoverSingleServer($id)
{ {
$server = DBA::selectFirst('gserver', ['poco', 'nurl', 'url', 'network'], ['id' => $id]); $server = DBA::selectFirst('gserver', ['poco', 'nurl', 'url', 'network'], ['id' => $id]);
@ -410,48 +342,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`, `poco`
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, 'UpdateServerDirectory', $gserver);
if (!$complete && ( --$no_of_queries == 0)) {
break;
}
}
}
}
private static function discoverServerUsers(array $data, array $server) private static function discoverServerUsers(array $data, array $server)
{ {
if (!isset($data['entry'])) { if (!isset($data['entry'])) {
@ -602,5 +492,4 @@ class PortableContact
} }
return $success; return $success;
} }
} }

3
src/Worker/UpdateServerDirectories.php
View file

@ -7,6 +7,7 @@ namespace Friendica\Worker;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\GServer;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
class UpdateServerDirectories class UpdateServerDirectories
@ -21,7 +22,7 @@ class UpdateServerDirectories
} }
// Query Friendica and Hubzilla servers for their users // Query Friendica and Hubzilla servers for their users
PortableContact::discover(); GServer::discover();
// Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server) // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
if (!Config::get('system', 'ostatus_disabled')) { if (!Config::get('system', 'ostatus_disabled')) {