<?php
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
+use Friendica\Core\Worker;
-require_once('include/socgraph.php');
-require_once('include/datetime.php');
+require_once 'include/probe.php';
+require_once 'include/socgraph.php';
+require_once 'include/datetime.php';
function discover_poco_run(&$argv, &$argc) {
- suggestions: Discover other servers for their contacts.
- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
- update_server: Frequently check the first 250 servers for vitality.
+ - update_server_directory: Discover the given server id for their contacts
+ - poco_load: Load POCO data from a given POCO address
+ - check_profile: Update remote profile data
*/
if (($argc > 2) && ($argv[1] == "dirsearch")) {
$mode = 4;
} elseif (($argc == 2) && ($argv[1] == "update_server")) {
$mode = 5;
+ } elseif (($argc == 3) && ($argv[1] == "update_server_directory")) {
+ $mode = 6;
+ } elseif (($argc > 5) && ($argv[1] == "poco_load")) {
+ $mode = 7;
+ } elseif (($argc == 3) && ($argv[1] == "check_profile")) {
+ $mode = 8;
} elseif ($argc == 1) {
$search = "";
$mode = 0;
logger('start '.$search);
- if ($mode == 5) {
+ if ($mode == 8) {
+ if ($argv[2] != "") {
+ poco_last_updated($argv[2], true);
+ }
+ } elseif ($mode == 7) {
+ if ($argc == 6) {
+ $url = $argv[5];
+ } else {
+ $url = '';
+ }
+ poco_load_worker(intval($argv[2]), intval($argv[3]), intval($argv[4]), $url);
+ } elseif ($mode == 6) {
+ poco_discover_single_server(intval($argv[2]));
+ } elseif ($mode == 5) {
update_server();
} elseif ($mode == 4) {
- $server_url = base64_decode($argv[2]);
+ $server_url = $argv[2];
if ($server_url == "") {
return;
}
logger($result, LOGGER_DEBUG);
} elseif ($mode == 3) {
update_suggestions();
- } elseif (($mode == 2) AND get_config('system','poco_completion')) {
+ } elseif (($mode == 2) && get_config('system','poco_completion')) {
discover_users();
- } elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search')) {
+ } elseif (($mode == 1) && ($search != "") && get_config('system','poco_local_search')) {
discover_directory($search);
gs_search_user($search);
- } elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0)) {
+ } elseif (($mode == 0) && ($search == "") && (get_config('system','poco_discovery') > 0)) {
// Query Friendica and Hubzilla servers for their users
poco_discover();
}
logger('Update server status for server '.$server["url"], LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server["url"]));
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", $server["url"]);
if (++$updated > 250) {
return;
function discover_users() {
logger("Discover users", LOGGER_DEBUG);
- $users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url` FROM `gcontact`
+ $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()",
continue;
}
+ $server_url = poco_detect_server($user["url"]);
+ $force_update = false;
+
if ($user["server_url"] != "") {
+
+ $force_update = (normalise_link($user["server_url"]) != normalise_link($server_url));
+
$server_url = $user["server_url"];
- } else {
- $server_url = poco_detect_server($user["url"]);
}
- if (($server_url == "") OR poco_check_server($server_url, $gcontacts[0]["network"])) {
- logger('Check user '.$user["url"]);
- poco_last_updated($user["url"], true);
+
+ if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) {
+ logger('Check profile '.$user["url"]);
+ Worker::add(PRIORITY_LOW, "discover_poco", "check_profile", $user["url"]);
if (++$checked > 100) {
return;
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
dbesc(datetime_convert()), dbesc(normalise_link($user["url"])));
}
+
+ // Quit the loop after 3 minutes
+ if (time() > ($starttime + 180)) {
+ return;
+ }
}
}
$j = json_decode($x);
if (count($j->results)) {
- foreach($j->results as $jj) {
+ foreach ($j->results as $jj) {
// Check if the contact already exists
$exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
- if ($exists) {
+ if (dbm::is_result($exists)) {
logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
- if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND
+ if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
($exists[0]["updated"] < $exists[0]["last_failure"])) {
continue;
}
if ($data["network"] == NETWORK_DFRN) {
logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG);
- poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0);
+
+ if ($jj->tags != "") {
+ $data["keywords"] = $jj->tags;
+ }
+
+ $data["server_url"] = $data["baseurl"];
+
+ update_gcontact($data);
} else {
logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
}
if (!$result["success"]) {
return false;
}
+
$contacts = json_decode($result["body"]);
if ($contacts->status == 'ERROR') {
return false;
}
- foreach($contacts->data AS $user) {
+
+ /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case)
+ /// @TODO find all those and convert to all lower-case which is a keyword then
+ foreach ($contacts->data AS $user) {
$contact = probe_url($user->site_address."/".$user->name);
if ($contact["network"] != NETWORK_PHANTOM) {
$contact["about"] = $user->description;
projects / friendica.git / blobdiff