Merge pull request #2682 from annando/1607-api-generic-xml

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 79958a8849a4235b7a53156cc5c2fdddd26de046..0b468faea189e522505ed5c686facd22be905406 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -20,48 +20,32 @@ function discover_poco_run(&$argv, &$argc){
 
        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'));
 
@@ -69,13 +53,22 @@ function discover_poco_run(&$argv, &$argc){
 
        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;
@@ -123,7 +116,7 @@ function discover_users() {
                else
                        $server_url = poco_detect_server($user["url"]);
 
-               if (poco_check_server($server_url, $gcontacts[0]["network"])) {
+               if (($server_url == "") OR poco_check_server($server_url, $gcontacts[0]["network"])) {
                        logger('Check user '.$user["url"]);
                        poco_last_updated($user["url"], true);
 
@@ -186,6 +179,36 @@ function discover_directory($search) {
        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();