X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDiscoverPoCo.php;h=d495b4c2a6a8db94c6a7e070eb09f94afad25931;hb=4c5b97834b26745fab2f23040cc3ca87686c6e87;hp=55eeec98f2e024843cb58a162746e8d3b4c92d7b;hpb=d577ab98eb0f28f9f807795f54c87d80ef9c0dc2;p=friendica.git

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 55eeec98f2..d495b4c2a6 100644
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -11,6 +11,8 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\GContact;
+use Friendica\Model\Contact;
+use Friendica\Model\GServer;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
@@ -62,7 +64,7 @@ class DiscoverPoCo
 
 		if ($mode == 8) {
 			if ($param1 != "") {
-				PortableContact::lastUpdated($param1, true);
+				GContact::updateFromProbe($param1, true);
 			}
 		} elseif ($mode == 7) {
 			if (!empty($param4)) {
@@ -85,7 +87,7 @@ class DiscoverPoCo
 				return;
 			}
 			$result = "Checking server ".$server_url." - ";
-			$ret = PortableContact::checkServer($server_url);
+			$ret = GServer::check($server_url);
 			if ($ret) {
 				$result .= "success";
 			} else {
@@ -99,7 +101,7 @@ class DiscoverPoCo
 		} elseif (($mode == 1) && ($search != "") && Config::get('system', 'poco_local_search')) {
 			self::discoverDirectory($search);
 			self::gsSearchUser($search);
-		} elseif (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') > 0)) {
+		} elseif (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') != PortableContact::DISABLED)) {
 			// Query Friendica and Hubzilla servers for their users
 			PortableContact::discover();
 
@@ -175,7 +177,7 @@ class DiscoverPoCo
 				continue;
 			}
 
-			$server_url = PortableContact::detectServer($user["url"]);
+			$server_url = Contact::getBasepath($user["url"]);
 			$force_update = false;
 
 			if ($user["server_url"] != "") {
@@ -185,7 +187,7 @@ class DiscoverPoCo
 				$server_url = $user["server_url"];
 			}
 
-			if ((($server_url == "") && ($user["network"] == Protocol::FEED)) || $force_update || PortableContact::checkServer($server_url, $user["network"])) {
+			if ((($server_url == "") && ($user["network"] == Protocol::FEED)) || $force_update || GServer::check($server_url, $user["network"])) {
 				Logger::log('Check profile '.$user["url"]);
 				Worker::add(PRIORITY_LOW, "DiscoverPoCo", "check_profile", $user["url"]);
 
@@ -230,13 +232,13 @@ class DiscoverPoCo
 						continue;
 					}
 					// Update the contact
-					PortableContact::lastUpdated($jj->url);
+					GContact::updateFromProbe($jj->url);
 					continue;
 				}
 
-				$server_url = PortableContact::detectServer($jj->url);
+				$server_url = Contact::getBasepath($jj->url);
 				if ($server_url != '') {
-					if (!PortableContact::checkServer($server_url)) {
+					if (!GServer::check($server_url)) {
 						Logger::log("Friendica server ".$server_url." doesn't answer.", Logger::DEBUG);
 						continue;
 					}
@@ -267,6 +269,9 @@ class DiscoverPoCo
 	 * @brief Search for GNU Social user with gstools.org
 	 *
 	 * @param string $search User name
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function gsSearchUser($search) {