if(is_null($db)) {
@include(".htconfig.php");
- require_once("include/dba.php");
+ require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- };
+ unset($db_host, $db_user, $db_pass, $db_data);
+ };
require_once('include/session.php');
require_once('include/datetime.php');
- require_once('include/pidfile.php');
load_config('config');
load_config('system');
- $maxsysload = intval(get_config('system','maxloadavg'));
- if($maxsysload < 1)
- $maxsysload = 50;
- if(function_exists('sys_getloadavg')) {
- $load = sys_getloadavg();
- if(intval($load[0]) > $maxsysload) {
- logger('system: load ' . $load[0] . ' too high. discover_poco deferred to next scheduled run.');
+ // Don't check this stuff if the function is called by the poller
+ if (App::callstack() != "poller_run")
+ if (App::maxload_reached())
return;
- }
- }
if(($argc > 2) && ($argv[1] == "dirsearch")) {
$search = urldecode($argv[2]);
$mode = 1;
} elseif(($argc == 2) && ($argv[1] == "checkcontact")) {
$mode = 2;
+ } elseif(($argc == 2) && ($argv[1] == "suggestions")) {
+ $mode = 3;
} elseif ($argc == 1) {
$search = "";
$mode = 0;
} else
die("Unknown or missing parameter ".$argv[1]."\n");
- $lockpath = get_lockpath();
- if ($lockpath != '') {
- $pidfile = new pidfile($lockpath, 'discover_poco'.$mode.urlencode($search));
- if($pidfile->is_already_running()) {
- logger("discover_poco: Already running");
- if ($pidfile->running_time() > 19*60) {
- $pidfile->kill();
- logger("discover_poco: killed stale process");
- // Calling a new instance
- if ($mode == 0)
- proc_run('php','include/discover_poco.php');
- }
- exit;
- }
- }
+ // Don't check this stuff if the function is called by the poller
+ if (App::callstack() != "poller_run")
+ if (App::is_already_running('discover_poco'.$mode.urlencode($search), 'include/discover_poco.php', 1140))
+ return;
$a->set_baseurl(get_config('system','url'));
logger('start '.$search);
- if (($mode == 2) AND get_config('system','poco_completion'))
+ if ($mode==3)
+ update_suggestions();
+ elseif (($mode == 2) AND get_config('system','poco_completion'))
discover_users();
- elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search'))
+ elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search')) {
discover_directory($search);
- elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0))
+ gs_search_user($search);
+ } elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0)) {
+ // Query Friendica and Hubzilla servers for their users
poco_discover();
+ // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
+ if (!get_config('system','ostatus_disabled'))
+ gs_discover();
+ }
+
logger('end '.$search);
return;
}
function discover_users() {
- // To-Do: Maybe we should check old contact as well.
+ logger("Discover users", LOGGER_DEBUG);
+
$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url` FROM `gcontact`
- WHERE `updated` = '0000-00-00 00:00:00' AND `last_contact` = '0000-00-00 00:00:00' AND
- `last_failure` = '0000-00-00 00:00:00' AND `network` IN ('%s', '%s', '%s')
- ORDER BY rand()",
- dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+ 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()",
+ dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA),
+ dbesc(NETWORK_OSTATUS), dbesc(NETWORK_FEED));
if (!$users)
return;
$checked = 0;
foreach ($users AS $user) {
- if (poco_do_update($user["created"], $user["updated"], $user["last_failure"], $user["last_contact"])) {
- if ($user[0]["server_url"] != "")
- $server_url = $user[0]["server_url"];
- else
- $server_url = poco_detect_server($user["url"]);
+ $urlparts = parse_url($user["url"]);
+ if (!isset($urlparts["scheme"])) {
+ q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+ dbesc(NETWORK_PHANTOM), dbesc(normalise_link($user["url"])));
+ continue;
+ }
+
+ if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
+ "identi.ca", "alpha.app.net"))) {
+ $networks = array("www.facebook.com" => NETWORK_FACEBOOK,
+ "facebook.com" => NETWORK_FACEBOOK,
+ "twitter.com" => NETWORK_TWITTER,
+ "identi.ca" => NETWORK_PUMPIO,
+ "alpha.app.net" => NETWORK_APPNET);
+
+ q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+ dbesc($networks[$urlparts["host"]]), dbesc(normalise_link($user["url"])));
+ continue;
+ }
+
+ if ($user["server_url"] != "")
+ $server_url = $user["server_url"];
+ else
+ $server_url = poco_detect_server($user["url"]);
- if (poco_check_server($server_url, $gcontacts[0]["network"])) {
- logger('Check user '.$user["url"]);
- poco_last_updated($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 (++$checked > 100)
- return;
- }
- }
+ if (++$checked > 100)
+ return;
+ } else
+ q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
+ dbesc(datetime_convert()), dbesc(normalise_link($user["url"])));
}
}
}
}
- $x = fetch_url("http://dir.friendica.com/lsearch?p=1&n=500&search=".urlencode($search));
+ $x = fetch_url(get_server()."/lsearch?p=1&n=500&search=".urlencode($search));
$j = json_decode($x);
if(count($j->results))
poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0);
}
}
- Cache::set("dirsearch:".$search, time());
+ Cache::set("dirsearch:".$search, time(), CACHE_DAY);
}
+/**
+ * @brief Search for GNU Social user with gstools.org
+ *
+ * @param str $search User name
+ */
+function gs_search_user($search) {
+
+ $a = get_app();
+
+ $url = "http://gstools.org/api/users_search/".urlencode($search);
+
+ $result = z_fetch_url($url);
+ if (!$result["success"])
+ return false;
+
+ $contacts = json_decode($result["body"]);
+
+ if ($contacts->status == 'ERROR')
+ return false;
+
+ foreach($contacts->data AS $user) {
+ $contact = probe_url($user->site_address."/".$user->name);
+ if ($contact["network"] != NETWORK_PHANTOM) {
+ $contact["about"] = $user->description;
+ update_gcontact($contact);
+ }
+ }
+}
+
+
if (array_search(__file__,get_included_files())===0){
discover_poco_run($_SERVER["argv"],$_SERVER["argc"]);
killme();