]> git.mxchange.org Git - friendica.git/blobdiff - include/socgraph.php
Use `use` instead of `\`
[friendica.git] / include / socgraph.php
index 01d2cff019f34cbf0e859b19f1284d4b5c96a6be..6713c7342dc29463d3c2dab4681f13feed991f33 100644 (file)
@@ -1,21 +1,33 @@
 <?php
 /**
  * @file include/socgraph.php
- * 
+ *
  * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
  * @todo Fetch profile data from profile page for Redmatrix users
  * @todo Detect if it is a forum
  */
 
-require_once('include/datetime.php');
-require_once("include/Scrape.php");
-require_once("include/network.php");
-require_once("include/html2bbcode.php");
-require_once("include/Contact.php");
-require_once("include/Photo.php");
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Network\Probe;
+
+use DomXPath;
+use DOMDocument;
+
+require_once 'include/datetime.php';
+require_once 'include/probe.php';
+require_once 'include/network.php';
+require_once 'include/html2bbcode.php';
+require_once 'include/Contact.php';
+require_once 'include/Photo.php';
 
-/*
- * poco_load
+/**
+ * @brief Fetch POCO data
+ *
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * @param integer $url POCO address that should be polled
  *
  * Given a contact-id (minimum), load the PortableContacts friend list for that contact,
  * and add the entries to the gcontact (Global Contact) table, or update existing entries
@@ -27,12 +39,21 @@ require_once("include/Photo.php");
  * pointing to the same global contact id.
  *
  */
+function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
+       // Call the function "poco_load_worker" via the worker
+       proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", intval($cid), intval($uid), intval($zcid), base64_encode($url));
+}
 
-
-
-
-function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
-
+/**
+ * @brief Fetch POCO data from the worker
+ *
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * @param integer $url POCO address that should be polled
+ *
+ */
+function poco_load_worker($cid, $uid, $zcid, $url) {
        $a = get_app();
 
        if($cid) {
@@ -81,7 +102,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                $connect_url = '';
                $name = '';
                $network = '';
-               $updated = '0000-00-00 00:00:00';
+               $updated = NULL_DATE;
                $location = '';
                $about = '';
                $keywords = '';
@@ -145,27 +166,27 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                if (isset($entry->contactType) AND ($entry->contactType >= 0))
                        $contact_type = $entry->contactType;
 
-               // If you query a Friendica server for its profiles, the network has to be Friendica
-               /// TODO It could also be a Redmatrix server
-               //if ($uid == 0)
-               //      $network = NETWORK_DFRN;
-
-               poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
-
-               $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
-               update_gcontact($gcontact);
-
-               // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
-               // Deactivated because we now update Friendica contacts in dfrn.php
-               //if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
-               //      q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
-               //              WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
-               //              dbesc($location),
-               //              dbesc($about),
-               //              dbesc($keywords),
-               //              dbesc($gender),
-               //              dbesc(normalise_link($profile_url)),
-               //              dbesc(NETWORK_DFRN));
+               $gcontact = array("url" => $profile_url,
+                               "name" => $name,
+                               "network" => $network,
+                               "photo" => $profile_photo,
+                               "about" => $about,
+                               "location" => $location,
+                               "gender" => $gender,
+                               "keywords" => $keywords,
+                               "connect" => $connect_url,
+                               "updated" => $updated,
+                               "contact-type" => $contact_type,
+                               "generation" => $generation);
+
+               try {
+                       $gcontact = sanitize_gcontact($gcontact);
+                       $gcid = update_gcontact($gcontact);
+
+                       link_gcontact($gcid, $uid, $cid, $zcid);
+               } catch (Exception $e) {
+                       logger($e->getMessage(), LOGGER_DEBUG);
+               }
        }
        logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
@@ -176,161 +197,158 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
        );
 
 }
+/**
+ * @brief Sanitize the given gcontact data
+ *
+ * @param array $gcontact array with gcontact data
+ * @throw Exception
+ *
+ * Generation:
+ *  0: No definition
+ *  1: Profiles on this server
+ *  2: Contacts of profiles on this server
+ *  3: Contacts of contacts of profiles on this server
+ *  4: ...
+ *
+ */
+function sanitize_gcontact($gcontact) {
 
-function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) {
-
-       // Generation:
-       //  0: No definition
-       //  1: Profiles on this server
-       //  2: Contacts of profiles on this server
-       //  3: Contacts of contacts of profiles on this server
-       //  4: ...
-
-       $gcid = "";
-
-       if ($profile_url == "")
-               return $gcid;
+       if ($gcontact['url'] == "") {
+               throw new Exception('URL is empty');
+       }
 
-       $urlparts = parse_url($profile_url);
-       if (!isset($urlparts["scheme"]))
-               return $gcid;
+       $urlparts = parse_url($gcontact['url']);
+       if (!isset($urlparts["scheme"])) {
+               throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url.");
+       }
 
        if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
-                                               "identi.ca", "alpha.app.net")))
-               return $gcid;
+                                               "identi.ca", "alpha.app.net"))) {
+               throw new Exception('Contact from a non federated network ignored. ('.$gcontact['url'].')');
+       }
 
        // Don't store the statusnet connector as network
        // We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
-       if ($network == NETWORK_STATUSNET)
-               $network = "";
+       if ($gcontact['network'] == NETWORK_STATUSNET) {
+               $gcontact['network'] = "";
+       }
 
        // Assure that there are no parameter fragments in the profile url
-       if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
-               $profile_url = clean_contact_url($profile_url);
-
-       $alternate = poco_alternate_ostatus_url($profile_url);
+       if (in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+               $gcontact['url'] = clean_contact_url($gcontact['url']);
+       }
 
-       $orig_updated = $updated;
+       $alternate = poco_alternate_ostatus_url($gcontact['url']);
 
        // The global contacts should contain the original picture, not the cached one
-       if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/"))) {
-               $profile_photo = "";
-       }
-
-       $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
-               dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
-       );
-       if (dbm::is_result($r)) {
-               $network = $r[0]["network"];
+       if (($gcontact['generation'] != 1) AND stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) {
+               $gcontact['photo'] = "";
        }
 
-       if (($network == "") OR ($network == NETWORK_OSTATUS)) {
-               $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
-                       dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
+       if (!isset($gcontact['network'])) {
+               $r = q("SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
+                       dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
                );
                if (dbm::is_result($r)) {
-                       $network = $r[0]["network"];
-                       //$profile_url = $r[0]["url"];
+                       $gcontact['network'] = $r[0]["network"];
+               }
+
+               if (($gcontact['network'] == "") OR ($gcontact['network'] == NETWORK_OSTATUS)) {
+                       $r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
+                               dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
+                       );
+                       if (dbm::is_result($r)) {
+                               $gcontact['network'] = $r[0]["network"];
+                       }
                }
        }
 
+       $gcontact['server_url'] = '';
+       $gcontact['network'] = '';
+
        $x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-               dbesc(normalise_link($profile_url))
+               dbesc(normalise_link($gcontact['url']))
        );
 
        if (count($x)) {
-               if (($network == "") AND ($x[0]["network"] != NETWORK_STATUSNET))
-                       $network = $x[0]["network"];
-
-               if ($updated == "0000-00-00 00:00:00")
-                       $updated = $x[0]["updated"];
-
-               $created = $x[0]["created"];
-               $server_url = $x[0]["server_url"];
-               $nick = $x[0]["nick"];
-               $addr = $x[0]["addr"];
-               $alias =  $x[0]["alias"];
-               $notify =  $x[0]["notify"];
-       } else {
-               $created = "0000-00-00 00:00:00";
-               $server_url = "";
-
-               $urlparts = parse_url($profile_url);
-               $nick = end(explode("/", $urlparts["path"]));
-               $addr = "";
-               $alias = "";
-               $notify = "";
+               if (!isset($gcontact['network']) AND ($x[0]["network"] != NETWORK_STATUSNET)) {
+                       $gcontact['network'] = $x[0]["network"];
+               }
+               if ($gcontact['updated'] <= NULL_DATE) {
+                       $gcontact['updated'] = $x[0]["updated"];
+               }
+               if (!isset($gcontact['server_url']) AND (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) {
+                       $gcontact['server_url'] = $x[0]["server_url"];
+               }
+               if (!isset($gcontact['addr'])) {
+                       $gcontact['addr'] = $x[0]["addr"];
+               }
        }
 
-       if ((($network == "") OR ($name == "") OR ($addr == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
-               AND poco_reachable($profile_url, $server_url, $network, false)) {
-               $data = probe_url($profile_url);
+       if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate)
+               AND poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) {
+               $data = Probe::uri($gcontact['url']);
 
-               $orig_profile = $profile_url;
+               if ($data["network"] == NETWORK_PHANTOM) {
+                       throw new Exception('Probing for URL '.$gcontact['url'].' failed');
+               }
+
+               $orig_profile = $gcontact['url'];
+
+               $gcontact["server_url"] = $data["baseurl"];
 
-               $network = $data["network"];
-               $name = $data["name"];
-               $nick = $data["nick"];
-               $addr = $data["addr"];
-               $alias = $data["alias"];
-               $notify = $data["notify"];
-               $profile_url = $data["url"];
-               $profile_photo = $data["photo"];
-               $server_url = $data["baseurl"];
+               $gcontact = array_merge($gcontact, $data);
 
-               if ($alternate AND ($network == NETWORK_OSTATUS)) {
+               if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) {
                        // Delete the old entry - if it exists
                        $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
                        if ($r) {
                                q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
                                q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
                        }
-
-                       // possibly create a new entry
-                       poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
                }
        }
 
-       if ($alternate AND ($network == NETWORK_OSTATUS))
-               return $gcid;
-
-       if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) {
-               q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
-                       dbesc($network),
-                       dbesc(normalise_link($profile_url))
-               );
+       if (!isset($gcontact['name']) OR !isset($gcontact['photo'])) {
+               throw new Exception('No name and photo for URL '.$gcontact['url']);
        }
 
-       if (($name == "") OR ($profile_photo == ""))
-               return $gcid;
+       if (!in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+               throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']);
+       }
 
-       if (!in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
-               return $gcid;
+       if (!isset($gcontact['server_url'])) {
+               // We check the server url to be sure that it is a real one
+               $server_url = poco_detect_server($gcontact['url']);
 
-       logger("profile-check generation: ".$generation." Network: ".$network." URL: ".$profile_url." name: ".$name." avatar: ".$profile_photo, LOGGER_DEBUG);
+               // We are now sure that it is a correct URL. So we use it in the future
+               if ($server_url != "") {
+                       $gcontact['server_url'] = $server_url;
+               }
+       }
 
-       poco_check_server($server_url, $network);
+       // The server URL doesn't seem to be valid, so we don't store it.
+       if (!poco_check_server($gcontact['server_url'], $gcontact['network'])) {
+               $gcontact['server_url'] = "";
+       }
 
-       $gcontact = array("url" => $profile_url,
-                       "addr" => $addr,
-                       "alias" => $alias,
-                       "name" => $name,
-                       "network" => $network,
-                       "photo" => $profile_photo,
-                       "about" => $about,
-                       "location" => $location,
-                       "gender" => $gender,
-                       "keywords" => $keywords,
-                       "server_url" => $server_url,
-                       "connect" => $connect_url,
-                       "notify" => $notify,
-                       "updated" => $updated,
-                       "generation" => $generation);
+       return $gcontact;
+}
 
-       $gcid = update_gcontact($gcontact);
+/**
+ * @brief Link the gcontact entry with user, contact and global contact
+ *
+ * @param integer $gcid Global contact ID
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * *
+ */
+function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
 
-       if(!$gcid)
-               return $gcid;
+       if ($gcid <= 0) {
+               return;
+       }
 
        $r = q("SELECT * FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d LIMIT 1",
                intval($cid),
@@ -338,8 +356,8 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                intval($gcid),
                intval($zcid)
        );
-       if (! dbm::is_result($r)) {
-               q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ",
+       if (!dbm::is_result($r)) {
+               q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
                        intval($cid),
                        intval($uid),
                        intval($gcid),
@@ -355,8 +373,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                        intval($zcid)
                );
        }
-
-       return $gcid;
 }
 
 function poco_reachable($profile, $server = "", $network = "", $force = false) {
@@ -401,13 +417,47 @@ function poco_detect_server($profile) {
 
        // Mastodon
        if ($server_url == "") {
-               $red = preg_replace("=(https?://)(.*)/users/(.*)=ism", "$1$2", $profile);
-               if ($red != $profile) {
-                       $server_url = $red;
+               $mastodon = preg_replace("=(https?://)(.*)/users/(.*)=ism", "$1$2", $profile);
+               if ($mastodon != $profile) {
+                       $server_url = $mastodon;
+                       $network = NETWORK_OSTATUS;
+               }
+       }
+
+       // Numeric OStatus variant
+       if ($server_url == "") {
+               $ostatus = preg_replace("=(https?://)(.*)/user/(.*)=ism", "$1$2", $profile);
+               if ($ostatus != $profile) {
+                       $server_url = $ostatus;
                        $network = NETWORK_OSTATUS;
                }
        }
 
+       // Wild guess
+       if ($server_url == "") {
+               $base = preg_replace("=(https?://)(.*?)/(.*)=ism", "$1$2", $profile);
+               if ($base != $profile) {
+                       $server_url = $base;
+                       $network = NETWORK_PHANTOM;
+               }
+       }
+
+       if ($server_url == "") {
+               return "";
+       }
+
+       $r = q("SELECT `id` FROM `gserver` WHERE `nurl` = '%s' AND `last_contact` > `last_failure`",
+               dbesc(normalise_link($server_url)));
+       if (dbm::is_result($r)) {
+               return $server_url;
+       }
+
+       // Fetch the host-meta to check if this really is a server
+       $serverret = z_fetch_url($server_url."/.well-known/host-meta");
+       if (!$serverret["success"]) {
+               return "";
+       }
+
        return $server_url;
 }
 
@@ -420,14 +470,27 @@ function poco_last_updated($profile, $force = false) {
        $gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
                        dbesc(normalise_link($profile)));
 
-       if ($gcontacts[0]["created"] == "0000-00-00 00:00:00")
-               q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'",
-                       dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+       if (!dbm::is_result($gcontacts)) {
+               return false;
+       }
+
+       $contact = array("url" => $profile);
+
+       if ($gcontacts[0]["created"] <= NULL_DATE) {
+               $contact['created'] = datetime_convert();
+       }
+
+       if ($force) {
+               $server_url = normalise_link(poco_detect_server($profile));
+       }
 
-       if ($gcontacts[0]["server_url"] != "")
+       if (($server_url == '') AND ($gcontacts[0]["server_url"] != "")) {
                $server_url = $gcontacts[0]["server_url"];
-       else
-               $server_url = poco_detect_server($profile);
+       }
+
+       if (!$force AND (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) {
+               $server_url = normalise_link(poco_detect_server($profile));
+       }
 
        if (!in_array($gcontacts[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""))) {
                logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
@@ -436,67 +499,64 @@ function poco_last_updated($profile, $force = false) {
 
        if ($server_url != "") {
                if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) {
-
-                       if ($force)
+                       if ($force) {
                                q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
                                        dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+                       }
 
                        logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG);
                        return false;
                }
-
-               q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'",
-                       dbesc($server_url), dbesc(normalise_link($profile)));
+               $contact['server_url'] = $server_url;
        }
 
        if (in_array($gcontacts[0]["network"], array("", NETWORK_FEED))) {
                $server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''",
                        dbesc(normalise_link($server_url)));
 
-               if ($server)
-                       q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
-                               dbesc($server[0]["network"]), dbesc(normalise_link($profile)));
-               else
+               if ($server) {
+                       $contact['network'] = $server[0]["network"];
+               } else {
                        return false;
+               }
        }
 
        // noscrape is really fast so we don't cache the call.
-       if (($gcontacts[0]["server_url"] != "") AND ($gcontacts[0]["nick"] != "")) {
+       if (($server_url != "") AND ($gcontacts[0]["nick"] != "")) {
 
                //  Use noscrape if possible
-               $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($gcontacts[0]["server_url"])));
+               $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url)));
 
                if ($server) {
                        $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
 
-                        if ($noscraperet["success"] AND ($noscraperet["body"] != "")) {
+                       if ($noscraperet["success"] AND ($noscraperet["body"] != "")) {
 
                                $noscrape = json_decode($noscraperet["body"], true);
 
                                if (is_array($noscrape)) {
-                                       $contact = array("url" => $profile,
-                                                       "network" => $server[0]["network"],
-                                                       "generation" => $gcontacts[0]["generation"]);
+                                       $contact["network"] = $server[0]["network"];
 
-                                       if (isset($noscrape["fn"]))
+                                       if (isset($noscrape["fn"])) {
                                                $contact["name"] = $noscrape["fn"];
-
-                                       if (isset($noscrape["comm"]))
+                                       }
+                                       if (isset($noscrape["comm"])) {
                                                $contact["community"] = $noscrape["comm"];
-
+                                       }
                                        if (isset($noscrape["tags"])) {
                                                $keywords = implode(" ", $noscrape["tags"]);
-                                               if ($keywords != "")
+                                               if ($keywords != "") {
                                                        $contact["keywords"] = $keywords;
+                                               }
                                        }
 
                                        $location = formatted_location($noscrape);
-                                       if ($location)
+                                       if ($location) {
                                                $contact["location"] = $location;
-
-                                       if (isset($noscrape["dfrn-notify"]))
+                                       }
+                                       if (isset($noscrape["dfrn-notify"])) {
                                                $contact["notify"] = $noscrape["dfrn-notify"];
-
+                                       }
                                        // Remove all fields that are not present in the gcontact table
                                        unset($noscrape["fn"]);
                                        unset($noscrape["key"]);
@@ -534,12 +594,14 @@ function poco_last_updated($profile, $force = false) {
        }
 
        // If we only can poll the feed, then we only do this once a while
-       if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"],  $gcontacts[0]["last_contact"])) {
+       if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) {
                logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG);
+
+               update_gcontact($contact);
                return $gcontacts[0]["updated"];
        }
 
-       $data = probe_url($profile);
+       $data = Probe::uri($profile);
 
        // Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711)
        // Then check the other link and delete this one
@@ -551,10 +613,18 @@ function poco_last_updated($profile, $force = false) {
                q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profile)));
                q("DELETE FROM `glink` WHERE `gcid` = %d", intval($gcontacts[0]["id"]));
 
-               poco_check($data["url"], $data["name"], $data["network"], $data["photo"], $gcontacts[0]["about"], $gcontacts[0]["location"],
-                               $gcontacts[0]["gender"], $gcontacts[0]["keywords"], $data["addr"], $gcontacts[0]["updated"], $gcontacts[0]["generation"]);
+               $gcontact = array_merge($gcontacts[0], $data);
+
+               $gcontact["server_url"] = $data["baseurl"];
+
+               try {
+                       $gcontact = sanitize_gcontact($gcontact);
+                       update_gcontact($gcontact);
 
-               poco_last_updated($data["url"], $force);
+                       poco_last_updated($data["url"], $force);
+               } catch (Exception $e) {
+                       logger($e->getMessage(), LOGGER_DEBUG);
+               }
 
                logger("Profile ".$profile." was deleted", LOGGER_DEBUG);
                return false;
@@ -568,21 +638,10 @@ function poco_last_updated($profile, $force = false) {
                return false;
        }
 
-       $contact = array("generation" => $gcontacts[0]["generation"]);
-
        $contact = array_merge($contact, $data);
 
        $contact["server_url"] = $data["baseurl"];
 
-       unset($contact["batch"]);
-       unset($contact["poll"]);
-       unset($contact["request"]);
-       unset($contact["confirm"]);
-       unset($contact["poco"]);
-       unset($contact["priority"]);
-       unset($contact["pubkey"]);
-       unset($contact["baseurl"]);
-
        update_gcontact($contact);
 
        $feedret = z_fetch_url($data["poll"]);
@@ -617,16 +676,18 @@ function poco_last_updated($profile, $force = false) {
        }
 
        // Maybe there aren't any entries. Then check if it is a valid feed
-       if ($last_updated == "")
-               if ($xpath->query('/atom:feed')->length > 0)
-                       $last_updated = "0000-00-00 00:00:00";
-
+       if ($last_updated == "") {
+               if ($xpath->query('/atom:feed')->length > 0) {
+                       $last_updated = NULL_DATE;
+               }
+       }
        q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
                dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile)));
 
-       if (($gcontacts[0]["generation"] == 0))
+       if (($gcontacts[0]["generation"] == 0)) {
                q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
                        dbesc(normalise_link($profile)));
+       }
 
        logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG);
 
@@ -680,6 +741,213 @@ function poco_to_boolean($val) {
        return ($val);
 }
 
+/**
+ * @brief Detect server type (Hubzilla or Friendica) via the poco data
+ *
+ * @param object $data POCO data
+ * @return array Server data
+ */
+function poco_detect_poco_data($data) {
+       $server = false;
+
+       if (!isset($data->entry)) {
+               return false;
+       }
+
+       if (count($data->entry) == 0) {
+               return false;
+       }
+
+       if (!isset($data->entry[0]->urls)) {
+               return false;
+       }
+
+       if (count($data->entry[0]->urls) == 0) {
+               return false;
+       }
+
+       foreach ($data->entry[0]->urls AS $url) {
+               if ($url->type == 'zot') {
+                       $server = array();
+                       $server["platform"] = 'Hubzilla';
+                       $server["network"] = NETWORK_DIASPORA;
+                       return $server;
+               }
+       }
+       return false;
+}
+
+/**
+ * @brief Detect server type by using the nodeinfo data
+ *
+ * @param string $server_url address of the server
+ * @return array Server data
+ */
+function poco_fetch_nodeinfo($server_url) {
+       $serverret = z_fetch_url($server_url."/.well-known/nodeinfo");
+       if (!$serverret["success"]) {
+               return false;
+       }
+
+       $nodeinfo = json_decode($serverret['body']);
+
+       if (!is_object($nodeinfo)) {
+               return false;
+       }
+
+       if (!is_array($nodeinfo->links)) {
+               return false;
+       }
+
+       $nodeinfo_url = '';
+
+       foreach ($nodeinfo->links AS $link) {
+               if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
+                       $nodeinfo_url = $link->href;
+               }
+       }
+
+       if ($nodeinfo_url == '') {
+               return false;
+       }
+
+       $serverret = z_fetch_url($nodeinfo_url);
+       if (!$serverret["success"]) {
+               return false;
+       }
+
+       $nodeinfo = json_decode($serverret['body']);
+
+       if (!is_object($nodeinfo)) {
+               return false;
+       }
+
+       $server = array();
+
+       $server['register_policy'] = REGISTER_CLOSED;
+
+       if (is_bool($nodeinfo->openRegistrations) AND $nodeinfo->openRegistrations) {
+               $server['register_policy'] = REGISTER_OPEN;
+       }
+
+       if (is_object($nodeinfo->software)) {
+               if (isset($nodeinfo->software->name)) {
+                       $server['platform'] = $nodeinfo->software->name;
+               }
+
+               if (isset($nodeinfo->software->version)) {
+                       $server['version'] = $nodeinfo->software->version;
+                       // Version numbers on Nodeinfo are presented with additional info, e.g.:
+                       // 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
+                       $server['version'] = preg_replace("=(.+)-(.{4,})=ism", "$1", $server['version']);
+               }
+       }
+
+       if (is_object($nodeinfo->metadata)) {
+               if (isset($nodeinfo->metadata->nodeName)) {
+                       $server['site_name'] = $nodeinfo->metadata->nodeName;
+               }
+       }
+
+       $diaspora = false;
+       $friendica = false;
+       $gnusocial = false;
+
+       if (is_array($nodeinfo->protocols->inbound)) {
+               foreach ($nodeinfo->protocols->inbound AS $inbound) {
+                       if ($inbound == 'diaspora') {
+                               $diaspora = true;
+                       }
+                       if ($inbound == 'friendica') {
+                               $friendica = true;
+                       }
+                       if ($inbound == 'gnusocial') {
+                               $gnusocial = true;
+                       }
+               }
+       }
+
+       if ($gnusocial) {
+               $server['network'] = NETWORK_OSTATUS;
+       }
+       if ($diaspora) {
+               $server['network'] = NETWORK_DIASPORA;
+       }
+       if ($friendica) {
+               $server['network'] = NETWORK_DFRN;
+       }
+
+       if (!$server) {
+               return false;
+       }
+
+       return $server;
+}
+
+/**
+ * @brief Detect server type (Hubzilla or Friendica) via the front page body
+ *
+ * @param string $body Front page of the server
+ * @return array Server data
+ */
+function poco_detect_server_type($body) {
+       $server = false;
+
+       $doc = new DOMDocument();
+       @$doc->loadHTML($body);
+       $xpath = new DomXPath($doc);
+
+       $list = $xpath->query("//meta[@name]");
+
+       foreach ($list as $node) {
+               $attr = array();
+               if ($node->attributes->length) {
+                       foreach ($node->attributes as $attribute) {
+                               $attr[$attribute->name] = $attribute->value;
+                       }
+               }
+               if ($attr['name'] == 'generator') {
+                       $version_part = explode(" ", $attr['content']);
+                       if (count($version_part) == 2) {
+                               if (in_array($version_part[0], array("Friendika", "Friendica"))) {
+                                       $server = array();
+                                       $server["platform"] = $version_part[0];
+                                       $server["version"] = $version_part[1];
+                                       $server["network"] = NETWORK_DFRN;
+                               }
+                       }
+               }
+       }
+
+       if (!$server) {
+               $list = $xpath->query("//meta[@property]");
+
+               foreach ($list as $node) {
+                       $attr = array();
+                       if ($node->attributes->length) {
+                               foreach ($node->attributes as $attribute) {
+                                       $attr[$attribute->name] = $attribute->value;
+                               }
+                       }
+                       if ($attr['property'] == 'generator') {
+                               if (in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
+                                       $server = array();
+                                       $server["platform"] = $attr['content'];
+                                       $server["version"] = "";
+                                       $server["network"] = NETWORK_DIASPORA;
+                               }
+                       }
+               }
+       }
+
+       if (!$server) {
+               return false;
+       }
+
+       $server["site_name"] = $xpath->evaluate($element."//head/title/text()", $context)->item(0)->nodeValue;
+       return $server;
+}
+
 function poco_check_server($server_url, $network = "", $force = false) {
 
        // Unify the server address
@@ -692,10 +960,10 @@ function poco_check_server($server_url, $network = "", $force = false) {
        $servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
        if (dbm::is_result($servers)) {
 
-               if ($servers[0]["created"] == "0000-00-00 00:00:00")
+               if ($servers[0]["created"] <= NULL_DATE) {
                        q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
                                dbesc(datetime_convert()), dbesc(normalise_link($server_url)));
-
+               }
                $poco = $servers[0]["poco"];
                $noscrape = $servers[0]["noscrape"];
 
@@ -723,13 +991,15 @@ function poco_check_server($server_url, $network = "", $force = false) {
                $info = "";
                $register_policy = -1;
 
-               $last_contact = "0000-00-00 00:00:00";
-               $last_failure = "0000-00-00 00:00:00";
+               $last_contact = NULL_DATE;
+               $last_failure = NULL_DATE;
        }
        logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$servers[0]["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
 
        $failure = false;
+       $possible_failure = false;
        $orig_last_failure = $last_failure;
+       $orig_last_contact = $last_contact;
 
        // Check if the page is accessible via SSL.
        $orig_server_url = $server_url;
@@ -743,6 +1013,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
        if (dbm::is_result($servers) AND ($orig_server_url == $server_url) AND
                ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
+               dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
                return false;
        }
 
@@ -757,6 +1028,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
                // Quit if there is a timeout
                if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                        logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
+                       dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
                        return false;
                }
 
@@ -766,21 +1038,55 @@ function poco_check_server($server_url, $network = "", $force = false) {
        if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
                // Workaround for bad configured servers (known nginx problem)
                if (!in_array($serverret["debug"]["http_code"], array("403", "404"))) {
-                       $last_failure = datetime_convert();
                        $failure = true;
                }
-       } elseif ($network == NETWORK_DIASPORA)
-               $last_contact = datetime_convert();
+               $possible_failure = true;
+       }
+
+       // If the server has no possible failure we reset the cached data
+       if (!$possible_failure) {
+               $version = "";
+               $platform = "";
+               $site_name = "";
+               $info = "";
+               $register_policy = -1;
+       }
+
+       // Look for poco
+       if (!$failure) {
+               $serverret = z_fetch_url($server_url."/poco");
+               if ($serverret["success"]) {
+                       $data = json_decode($serverret["body"]);
+                       if (isset($data->totalResults)) {
+                               $poco = $server_url."/poco";
+                               $server = poco_detect_poco_data($data);
+                               if ($server) {
+                                       $platform = $server['platform'];
+                                       $network = $server['network'];
+                                       $version = '';
+                                       $site_name = '';
+                               }
+                       }
+               }
+       }
 
        if (!$failure) {
-               // Test for Diaspora
+               // Test for Diaspora, Hubzilla, Mastodon or older Friendica servers
                $serverret = z_fetch_url($server_url);
 
-               if (!$serverret["success"] OR ($serverret["body"] == ""))
+               if (!$serverret["success"] OR ($serverret["body"] == "")) {
                        $failure = true;
-               else {
+               } else {
+                       $server = poco_detect_server_type($serverret["body"]);
+                       if ($server) {
+                               $platform = $server['platform'];
+                               $network = $server['network'];
+                               $version = $server['version'];
+                               $site_name = $server['site_name'];
+                       }
+
                        $lines = explode("\n",$serverret["header"]);
-                       if(count($lines))
+                       if(count($lines)) {
                                foreach($lines as $line) {
                                        $line = trim($line);
                                        if(stristr($line,'X-Diaspora-Version:')) {
@@ -795,14 +1101,13 @@ function poco_check_server($server_url, $network = "", $force = false) {
                                        if(stristr($line,'Server: Mastodon')) {
                                                $platform = "Mastodon";
                                                $network = NETWORK_OSTATUS;
-                                               // Mastodon doesn't reveal version numbers
-                                               $version = "";
                                        }
                                }
+                       }
                }
        }
 
-       if (!$failure) {
+       if (!$failure AND ($poco == "")) {
                // Test for Statusnet
                // Will also return data for Friendica and GNU Social - but it will be overwritten later
                // The "not implemented" is a special treatment for really, really old Friendica versions
@@ -810,7 +1115,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
                if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND
                        ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) {
                        $platform = "StatusNet";
-                       $version = trim($serverret["body"], '"');
+                       // Remove junk that some GNU Social servers return
+                       $version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]);
+                       $version = trim($version, '"');
                        $network = NETWORK_OSTATUS;
                }
 
@@ -819,17 +1126,42 @@ function poco_check_server($server_url, $network = "", $force = false) {
                if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND
                        ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) {
                        $platform = "GNU Social";
-                       $version = trim($serverret["body"], '"');
+                       // Remove junk that some GNU Social servers return
+                       $version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]);
+                       $version = trim($version, '"');
                        $network = NETWORK_OSTATUS;
                }
 
+               // Test for Mastodon
+               $serverret = z_fetch_url($server_url."/api/v1/instance");
+               if ($serverret["success"] AND ($serverret["body"] != '')) {
+                       $data = json_decode($serverret["body"]);
+                       if (isset($data->version)) {
+                               $platform = "Mastodon";
+                               $version = $data->version;
+                               $site_name = $data->title;
+                               $info = $data->description;
+                               $network = NETWORK_OSTATUS;
+                       }
+               }
+       }
+
+       if (!$failure) {
+               // Test for Hubzilla, Redmatrix or Friendica
                $serverret = z_fetch_url($server_url."/api/statusnet/config.json");
                if ($serverret["success"]) {
                        $data = json_decode($serverret["body"]);
-
                        if (isset($data->site->server)) {
-                               $last_contact = datetime_convert();
-
+                               if (isset($data->site->platform)) {
+                                       $platform = $data->site->platform->PLATFORM_NAME;
+                                       $version = $data->site->platform->STD_VERSION;
+                                       $network = NETWORK_DIASPORA;
+                               }
+                               if (isset($data->site->BlaBlaNet)) {
+                                       $platform = $data->site->BlaBlaNet->PLATFORM_NAME;
+                                       $version = $data->site->BlaBlaNet->STD_VERSION;
+                                       $network = NETWORK_DIASPORA;
+                               }
                                if (isset($data->site->hubzilla)) {
                                        $platform = $data->site->hubzilla->PLATFORM_NAME;
                                        $version = $data->site->hubzilla->RED_VERSION;
@@ -871,24 +1203,52 @@ function poco_check_server($server_url, $network = "", $force = false) {
                $serverret = z_fetch_url($server_url."/statistics.json");
                if ($serverret["success"]) {
                        $data = json_decode($serverret["body"]);
-                       if ($version == "")
+                       if (isset($data->version)) {
                                $version = $data->version;
+                               // Version numbers on statistics.json are presented with additional info, e.g.:
+                               // 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
+                               $version = preg_replace("=(.+)-(.{4,})=ism", "$1", $version);
+                       }
 
                        $site_name = $data->name;
 
-                       if (isset($data->network) AND ($platform == ""))
+                       if (isset($data->network)) {
                                $platform = $data->network;
+                       }
 
-                       if ($platform == "Diaspora")
+                       if ($platform == "Diaspora") {
                                $network = NETWORK_DIASPORA;
+                       }
 
-                       if ($data->registrations_open)
+                       if ($data->registrations_open) {
                                $register_policy = REGISTER_OPEN;
-                       else
+                       } else {
                                $register_policy = REGISTER_CLOSED;
+                       }
+               }
+       }
+
+       // Query nodeinfo. Working for (at least) Diaspora and Friendica.
+       if (!$failure) {
+               $server = poco_fetch_nodeinfo($server_url);
+               if ($server) {
+                       $register_policy = $server['register_policy'];
+
+                       if (isset($server['platform'])) {
+                               $platform = $server['platform'];
+                       }
+
+                       if (isset($server['network'])) {
+                               $network = $server['network'];
+                       }
+
+                       if (isset($server['version'])) {
+                               $version = $server['version'];
+                       }
 
-                       if (isset($data->version))
-                               $last_contact = datetime_convert();
+                       if (isset($server['site_name'])) {
+                               $site_name = $server['site_name'];
+                       }
                }
        }
 
@@ -904,7 +1264,6 @@ function poco_check_server($server_url, $network = "", $force = false) {
                        $data = json_decode($serverret["body"]);
 
                        if (isset($data->version)) {
-                               $last_contact = datetime_convert();
                                $network = NETWORK_DFRN;
 
                                $noscrape = $data->no_scrape_url;
@@ -929,16 +1288,22 @@ function poco_check_server($server_url, $network = "", $force = false) {
                }
        }
 
-       // Look for poco
-       if (!$failure) {
-               $serverret = z_fetch_url($server_url."/poco");
-               if ($serverret["success"]) {
-                       $data = json_decode($serverret["body"]);
-                       if (isset($data->totalResults)) {
-                               $poco = $server_url."/poco";
-                               $last_contact = datetime_convert();
-                       }
-               }
+       if ($possible_failure AND !$failure) {
+               $failure = true;
+       }
+
+       if ($failure) {
+               $last_contact = $orig_last_contact;
+               $last_failure = datetime_convert();
+       } else {
+               $last_contact = datetime_convert();
+               $last_failure = $orig_last_failure;
+       }
+
+       if (($last_contact <= $last_failure) AND !$failure) {
+               logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG);
+       } else if (($last_contact >= $last_failure) AND $failure) {
+               logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG);
        }
 
        // Check again if the server exists
@@ -949,7 +1314,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
        $info = strip_tags($info);
        $platform = strip_tags($platform);
 
-       if ($servers)
+       if ($servers) {
                 q("UPDATE `gserver` SET `url` = '%s', `version` = '%s', `site_name` = '%s', `info` = '%s', `register_policy` = %d, `poco` = '%s', `noscrape` = '%s',
                        `network` = '%s', `platform` = '%s', `last_contact` = '%s', `last_failure` = '%s' WHERE `nurl` = '%s'",
                        dbesc($server_url),
@@ -965,7 +1330,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
                        dbesc($last_failure),
                        dbesc(normalise_link($server_url))
                );
-       else
+       } elseif (!$failure) {
                q("INSERT INTO `gserver` (`url`, `nurl`, `version`, `site_name`, `info`, `register_policy`, `poco`, `noscrape`, `network`, `platform`, `created`, `last_contact`, `last_failure`)
                                        VALUES ('%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
                                dbesc($server_url),
@@ -983,7 +1348,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
                                dbesc($last_failure),
                                dbesc(datetime_convert())
                );
-
+       }
        logger("End discovery for server ".$server_url, LOGGER_DEBUG);
 
        return !$failure;
@@ -1065,7 +1430,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal
        $r = q("SELECT `gcontact`.*
                FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
                where `glink`.`zcid` = %d
-               and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) 
+               and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 )
                $sql_extra limit %d, %d",
                intval($zcid),
                intval($uid),
@@ -1147,7 +1512,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
                AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
                AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
-               AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`updated` >= '%s'
                AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
                AND `gcontact`.`network` IN (%s)
                GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d",
@@ -1155,6 +1520,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                intval($uid),
                intval($uid),
                intval($uid),
+               dbesc(NULL_DATE),
                $sql_network,
                intval($start),
                intval($limit)
@@ -1173,13 +1539,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                WHERE `glink`.`uid` = 0 AND `glink`.`cid` = 0 AND `glink`.`zcid` = 0 AND NOT `gcontact`.`nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = %d)
                AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
                AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
-               AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`updated` >= '%s'
                AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
                AND `gcontact`.`network` IN (%s)
                ORDER BY rand() LIMIT %d, %d",
                intval($uid),
                intval($uid),
                intval($uid),
+               dbesc(NULL_DATE),
                $sql_network,
                intval($start),
                intval($limit)
@@ -1244,6 +1611,33 @@ function update_suggestions() {
        }
 }
 
+/**
+ * @brief Fetch server list from remote servers and adds them when they are new.
+ *
+ * @param string $poco URL to the POCO endpoint
+ */
+function poco_fetch_serverlist($poco) {
+       $serverret = z_fetch_url($poco."/@server");
+       if (!$serverret["success"]) {
+               return;
+       }
+       $serverlist = json_decode($serverret['body']);
+
+       if (!is_array($serverlist)) {
+               return;
+       }
+
+       foreach ($serverlist AS $server) {
+               $server_url = str_replace("/index.php", "", $server->url);
+
+               $r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
+               if (!dbm::is_result($r)) {
+                       logger("Call server check for server ".$server_url, LOGGER_DEBUG);
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server_url));
+               }
+       }
+}
+
 function poco_discover_federation() {
        $last = get_config('poco','last_federation_discovery');
 
@@ -1259,8 +1653,23 @@ function poco_discover_federation() {
        if ($serverdata) {
                $servers = json_decode($serverdata);
 
-               foreach($servers->pods AS $server)
-                       poco_check_server("https://".$server->host);
+               foreach ($servers->pods AS $server) {
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host));
+               }
+       }
+
+       // Disvover Mastodon servers
+       if (!Config::get('system','ostatus_disabled')) {
+               $serverdata = fetch_url("https://instances.mastodon.xyz/instances.json");
+
+               if ($serverdata) {
+                       $servers = json_decode($serverdata);
+
+                       foreach ($servers AS $server) {
+                               $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
+                               proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url));
+                       }
+               }
        }
 
        // Currently disabled, since the service isn't available anymore.
@@ -1281,77 +1690,100 @@ function poco_discover_federation() {
        set_config('poco','last_federation_discovery', time());
 }
 
-function poco_discover($complete = false) {
+function poco_discover_single_server($id) {
+       $r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
+       if (!dbm::is_result($r)) {
+               return false;
+       }
 
-       // Update the server list
-       poco_discover_federation();
+       $server = $r[0];
 
-       $no_of_queries = 5;
+       // Discover new servers out there (Works from Friendica version 3.5.2)
+       poco_fetch_serverlist($server["poco"]);
 
-       $requery_days = intval(get_config("system", "poco_requery_days"));
+       // Fetch all users from the other server
+       $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
-       if ($requery_days == 0)
-               $requery_days = 7;
+       logger("Fetch all users from the server ".$server["url"], LOGGER_DEBUG);
 
-       $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
+       $retdata = z_fetch_url($url);
+       if ($retdata["success"]) {
+               $data = json_decode($retdata["body"]);
 
-       $r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
-       if ($r)
-               foreach ($r AS $server) {
+               poco_discover_server($data, 2);
 
-                       if (!poco_check_server($server["url"], $server["network"])) {
-                               // The server is not reachable? Okay, then we will try it later
-                               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-                               continue;
+               if (get_config('system','poco_discovery') > 1) {
+
+                       $timeframe = get_config('system','poco_discovery_since');
+                       if ($timeframe == 0) {
+                               $timeframe = 30;
                        }
 
-                       // Fetch all users from the other server
-                       $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+                       $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
+
+                       // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
+                       $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
-                       logger("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG);
+                       $success = false;
 
                        $retdata = z_fetch_url($url);
                        if ($retdata["success"]) {
-                               $data = json_decode($retdata["body"]);
+                               logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
+                               $success = poco_discover_server(json_decode($retdata["body"]));
+                       }
 
-                               poco_discover_server($data, 2);
+                       if (!$success AND (get_config('system','poco_discovery') > 2)) {
+                               logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
+                               poco_discover_server_users($data, $server);
+                       }
+               }
 
-                               if (get_config('system','poco_discovery') > 1) {
+               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 
-                                       $timeframe = get_config('system','poco_discovery_since');
-                                       if ($timeframe == 0)
-                                               $timeframe = 30;
+               return true;
+       } else {
+               // If the server hadn't replied correctly, then force a sanity check
+               poco_check_server($server["url"], $server["network"], true);
 
-                                       $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
+               // If we couldn't reach the server, we will try it some time later
+               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 
-                                       // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
-                                       $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+               return false;
+       }
+}
 
-                                       $success = false;
+function poco_discover($complete = false) {
 
-                                       $retdata = z_fetch_url($url);
-                                       if ($retdata["success"]) {
-                                               logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
-                                               $success = poco_discover_server(json_decode($retdata["body"]));
-                                       }
+       // Update the server list
+       poco_discover_federation();
 
-                                       if (!$success AND (get_config('system','poco_discovery') > 2)) {
-                                               logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
-                                               poco_discover_server_users($data, $server);
-                                       }
-                               }
+       $no_of_queries = 5;
 
-                               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-                               if (!$complete AND (--$no_of_queries == 0))
-                                       break;
-                       } else {
-                               // If the server hadn't replied correctly, then force a sanity check
-                               poco_check_server($server["url"], $server["network"], true);
+       $requery_days = intval(get_config("system", "poco_requery_days"));
 
-                               // If we couldn't reach the server, we will try it some time later
+       if ($requery_days == 0) {
+               $requery_days = 7;
+       }
+       $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
+
+       $r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
+       if (dbm::is_result($r)) {
+               foreach ($r AS $server) {
+
+                       if (!poco_check_server($server["url"], $server["network"])) {
+                               // The server is not reachable? Okay, then we will try it later
                                q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+                               continue;
+                       }
+
+                       logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id']));
+
+                       if (!$complete AND (--$no_of_queries == 0)) {
+                               break;
                        }
                }
+       }
 }
 
 function poco_discover_server_users($data, $server) {
@@ -1395,7 +1827,7 @@ function poco_discover_server($data, $default_generation = 0) {
                $connect_url = '';
                $name = '';
                $network = '';
-               $updated = '0000-00-00 00:00:00';
+               $updated = NULL_DATE;
                $location = '';
                $about = '';
                $keywords = '';
@@ -1465,10 +1897,26 @@ function poco_discover_server($data, $default_generation = 0) {
                        $success = true;
 
                        logger("Store profile ".$profile_url, LOGGER_DEBUG);
-                       poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0);
 
-                       $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
-                       update_gcontact($gcontact);
+                       $gcontact = array("url" => $profile_url,
+                                       "name" => $name,
+                                       "network" => $network,
+                                       "photo" => $profile_photo,
+                                       "about" => $about,
+                                       "location" => $location,
+                                       "gender" => $gender,
+                                       "keywords" => $keywords,
+                                       "connect" => $connect_url,
+                                       "updated" => $updated,
+                                       "contact-type" => $contact_type,
+                                       "generation" => $generation);
+
+                       try {
+                               $gcontact = sanitize_gcontact($gcontact);
+                               update_gcontact($gcontact);
+                       } catch (Exception $e) {
+                               logger($e->getMessage(), LOGGER_DEBUG);
+                       }
 
                        logger("Done for profile ".$profile_url, LOGGER_DEBUG);
                }
@@ -1664,7 +2112,7 @@ function update_gcontact($contact) {
        fix_alternate_contact_address($contact);
 
        if (!isset($contact["updated"]))
-               $contact["updated"] = datetime_convert();
+               $contact["updated"] = dbm::date();
 
        if ($contact["server_url"] == "") {
                $server_url = $contact["url"];
@@ -1719,7 +2167,7 @@ function update_gcontact($contact) {
                        dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
                        intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
                        dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
-                       dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]),
+                       dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
                        dbesc($contact["server_url"]), dbesc($contact["connect"]),
                        dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
 
@@ -1763,6 +2211,8 @@ function update_gcontact_from_probe($url) {
                return;
        }
 
+       $data["server_url"] = $data["baseurl"];
+
        update_gcontact($data);
 }
 
@@ -1879,4 +2329,19 @@ function gs_discover() {
                q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
        }
 }
-?>
+
+/**
+ * @brief Returns a list of all known servers
+ * @return array List of server urls
+ */
+function poco_serverlist() {
+       $r = q("SELECT `url`, `site_name` AS `displayName`, `network`, `platform`, `version` FROM `gserver`
+               WHERE `network` IN ('%s', '%s', '%s') AND `last_contact` > `last_failure`
+               ORDER BY `last_contact`
+               LIMIT 1000",
+               dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+       if (!dbm::is_result($r)) {
+               return false;
+       }
+       return $r;
+}