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

Added "DiscoverContacts"

Browse source
This commit is contained in:
Michael 2019-12-20 21:04:38 +00:00
parent bf852cc096
commit 5fee84f2e2
3 changed files with 83 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Worker/Cron.php
View file

@ -42,7 +42,7 @@ class Cron
Worker::add(PRIORITY_LOW, "DiscoverPoCo"); Worker::add(PRIORITY_LOW, "DiscoverPoCo");
// run the process to update locally stored global contacts in the background // run the process to update locally stored global contacts in the background
Worker::add(PRIORITY_LOW, "DiscoverPoCo", "checkcontact"); Worker::add(PRIORITY_LOW, 'DiscoverContacts');
// Expire and remove user entries // Expire and remove user entries
Worker::add(PRIORITY_MEDIUM, "CronJobs", "expire_and_remove_users"); Worker::add(PRIORITY_MEDIUM, "CronJobs", "expire_and_remove_users");

81
src/Worker/DiscoverContacts.php Normal file
View file

@ -0,0 +1,81 @@
<?php
/**
* @file src/Worker/DiscoverContacts.php
*/
namespace Friendica\Worker;
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\Model\GServer;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
class DiscoverContacts
{
// Updates gcontact entries
public static function execute()
{
if (!Config::get('system', 'poco_completion')) {
return;
}
Logger::info('Discover contacts');
$starttime = time();
$contacts = DBA::select("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url`, `network` FROM `gcontact`
WHERE `last_contact` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
`last_failure` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
`network` IN (?, ?, ?, ?, '') ORDER BY rand()",
Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED);
$checked = 0;
while ($contact = DBA::fetch($contacts)) {
$urlparts = parse_url($contact['url']);
if (empty($urlparts['scheme'])) {
DBA::update('gcontact', ['network' => Protocol::PHANTOM],
['nurl' => Strings::normaliseLink($contact['url'])]);
continue;
}
if (in_array($urlparts['host'], ['twitter.com', 'identi.ca'])) {
$networks = ['twitter.com' => Protocol::TWITTER, 'identi.ca' => Protocol::PUMPIO];
DBA::update('gcontact', ['network' => $networks[$urlparts['host']]],
['nurl' => Strings::normaliseLink($contact['url'])]);
continue;
}
$server_url = Contact::getBasepath($contact['url']);
$force_update = false;
if (!empty($contact['server_url'])) {
$force_update = (Strings::normaliseLink($contact['server_url']) != Strings::normaliseLink($server_url));
$server_url = $contact['server_url'];
}
if ((empty($server_url) && ($contact['network'] == Protocol::FEED)) || $force_update || GServer::check($server_url, $contact['network'])) {
Logger::info('Check profile', ['profile' => $contact['url']]);
Worker::add(PRIORITY_LOW, 'UpdateGContact', $contact['url'], 'force');
if (++$checked > 100) {
return;
}
} else {
DBA::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
['nurl' => Strings::normaliseLink($contact['url'])]);
}
// Quit the loop after 3 minutes
if (time() > ($starttime + 180)) {
return;
}
}
}
}

67
src/Worker/DiscoverPoCo.php
View file

@ -34,9 +34,7 @@ class DiscoverPoCo
$search = ""; $search = "";
$mode = 0; $mode = 0;
if (($command == "checkcontact") && Config::get('system', 'poco_completion')) { if ($command == "server") {
self::discoverUsers();
} elseif ($command == "server") {
$server_url = $param1; $server_url = $param1;
if ($server_url == "") { if ($server_url == "") {
return; return;
@ -110,67 +108,4 @@ class DiscoverPoCo
} }
} }
} }
private static function discoverUsers() {
Logger::log("Discover users", Logger::DEBUG);
$starttime = time();
$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url`, `network` FROM `gcontact`
WHERE `last_contact` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
`last_failure` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
`network` IN ('%s', '%s', '%s', '%s', '') ORDER BY rand()",
DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA),
DBA::escape(Protocol::OSTATUS), DBA::escape(Protocol::FEED));
if (!$users) {
return;
}
$checked = 0;
foreach ($users AS $user) {
$urlparts = parse_url($user["url"]);
if (!isset($urlparts["scheme"])) {
DBA::update('gcontact', ['network' => Protocol::PHANTOM],
['nurl' => Strings::normaliseLink($user["url"])]);
continue;
}
if (in_array($urlparts["host"], ["twitter.com", "identi.ca"])) {
$networks = ["twitter.com" => Protocol::TWITTER, "identi.ca" => Protocol::PUMPIO];
DBA::update('gcontact', ['network' => $networks[$urlparts["host"]]],
['nurl' => Strings::normaliseLink($user["url"])]);
continue;
}
$server_url = Contact::getBasepath($user["url"]);
$force_update = false;
if ($user["server_url"] != "") {
$force_update = (Strings::normaliseLink($user["server_url"]) != Strings::normaliseLink($server_url));
$server_url = $user["server_url"];
}
if ((($server_url == "") && ($user["network"] == Protocol::FEED)) || $force_update || GServer::check($server_url, $user["network"])) {
Logger::log('Check profile '.$user["url"]);
Worker::add(PRIORITY_LOW, 'UpdateGContact', $user['url'], 'force');
if (++$checked > 100) {
return;
}
} else {
DBA::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
['nurl' => Strings::normaliseLink($user["url"])]);
}
// Quit the loop after 3 minutes
if (time() > ($starttime + 180)) {
return;
}
}
}
} }