Add missing include/probe require for probe_url support

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 2923cd01f127489ca07276df210ef4538d05a5e2..e71c26fc180da224e2594f2fb71a6c80b2e04809 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,9 +1,10 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
-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) {
 
@@ -16,6 +17,7 @@ function discover_poco_run(&$argv, &$argc) {
        - 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")) {
@@ -33,6 +35,8 @@ function discover_poco_run(&$argv, &$argc) {
                $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;
@@ -42,7 +46,12 @@ function discover_poco_run(&$argv, &$argc) {
 
        logger('start '.$search);
 
-       if ($mode == 7) {
+       if ($mode == 8) {
+               $profile_url = base64_decode($argv[2]);
+               if ($profile_url != "") {
+                       poco_last_updated($profile_url, true);
+               }
+       } elseif ($mode == 7) {
                if ($argc == 6) {
                        $url = base64_decode($argv[5]);
                } else {
@@ -121,7 +130,9 @@ function update_server() {
 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()",
@@ -155,14 +166,19 @@ function discover_users() {
                        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 == "") AND ($user["network"] == NETWORK_FEED)) OR $force_update OR poco_check_server($server_url, $user["network"])) {
+                       logger('Check profile '.$user["url"]);
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"]));
 
                        if (++$checked > 100) {
                                return;
@@ -171,6 +187,11 @@ function discover_users() {
                        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;
+               }
        }
 }
 
@@ -189,10 +210,10 @@ function discover_directory($search) {
        $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
@@ -217,7 +238,14 @@ function discover_directory($search) {
                        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);
                        }
@@ -245,12 +273,16 @@ function gs_search_user($search) {
        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;