clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2276 from annando/1601-gs-discovery 

Search for GNU Social users in the background
This commit is contained in:
Tobias Diekershoff 2016-01-21 19:32:33 +01:00
parent 6174017048 1d502116a8
commit 0ed7a2376a
2 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/discover_poco.php
View File

@ -76,9 +76,10 @@ function discover_poco_run(&$argv, &$argc){
update_suggestions(); update_suggestions();
elseif (($mode == 2) AND get_config('system','poco_completion')) elseif (($mode == 2) AND get_config('system','poco_completion'))
discover_users(); 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); 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 // Query Friendica and Hubzilla servers for their users
poco_discover(); poco_discover();
@ -197,6 +198,36 @@ function discover_directory($search) {
Cache::set("dirsearch:".$search, time(), CACHE_DAY); 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){ if (array_search(__file__,get_included_files())===0){
discover_poco_run($_SERVER["argv"],$_SERVER["argc"]); discover_poco_run($_SERVER["argv"],$_SERVER["argc"]);
killme(); killme();

23
include/socgraph.php
View File

@ -1718,18 +1718,19 @@ function gs_fetch_users($server) {
$hostname = $statistics->instance_address; $hostname = $statistics->instance_address;
} }
foreach ($statistics->users AS $nick => $user) { if (is_object($statistics->users))
$profile_url = $server."/".$user->nickname; foreach ($statistics->users AS $nick => $user) {
$profile_url = $server."/".$user->nickname;
$contact = array("url" => $profile_url, $contact = array("url" => $profile_url,
"name" => $user->fullname, "name" => $user->fullname,
"addr" => $user->nickname."@".$hostname, "addr" => $user->nickname."@".$hostname,
"nick" => $user->nickname, "nick" => $user->nickname,
"about" => $user->bio, "about" => $user->bio,
"network" => NETWORK_OSTATUS, "network" => NETWORK_OSTATUS,
"photo" => $a->get_baseurl()."/images/person-175.jpg"); "photo" => $a->get_baseurl()."/images/person-175.jpg");
get_gcontact_id($contact); get_gcontact_id($contact);
} }
} }
/** /**