X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiscover_poco.php;h=fd72d694017bd361bce7fd24dd307e287c39dcfa;hb=f3c8af485f67eda7cefb602793b94aebc17ffeb1;hp=f0bfb646bddc53d83cde92c994962042a9dded51;hpb=28b3fa4f1fad67816ae6904f94a20d0ee58b2ced;p=friendica.git

diff --git a/include/discover_poco.php b/include/discover_poco.php
index f0bfb646bd..fd72d69401 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,12 +1,19 @@
 <?php
-
-use \Friendica\Core\Config;
-
-require_once('include/socgraph.php');
-require_once('include/datetime.php');
-
-function discover_poco_run(&$argv, &$argc) {
-
+/**
+ * @file include/discover_poco.php
+ */
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
+use Friendica\Network\Probe;
+use Friendica\Protocol\PortableContact;
+
+require_once 'include/datetime.php';
+
+function discover_poco_run(&$argv, &$argc)
+{
 	/*
 	This function can be called in these ways:
 	- dirsearch <search pattern>: Searches for "search pattern" in the directory. "search pattern" is url encoded.
@@ -14,6 +21,9 @@ function discover_poco_run(&$argv, &$argc) {
 	- suggestions: Discover other servers for their contacts.
 	- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
 	- update_server: Frequently check the first 250 servers for vitality.
+	- update_server_directory: Discover the given server id for their contacts
+	- PortableContact::load: Load POCO data from a given POCO address
+	- check_profile: Update remote profile data
 	*/
 
 	if (($argc > 2) && ($argv[1] == "dirsearch")) {
@@ -27,19 +37,39 @@ function discover_poco_run(&$argv, &$argc) {
 		$mode = 4;
 	} elseif (($argc == 2) && ($argv[1] == "update_server")) {
 		$mode = 5;
+	} elseif (($argc == 3) && ($argv[1] == "update_server_directory")) {
+		$mode = 6;
+	} elseif (($argc > 5) && ($argv[1] == "load")) {
+		$mode = 7;
+	} elseif (($argc == 3) && ($argv[1] == "check_profile")) {
+		$mode = 8;
 	} elseif ($argc == 1) {
 		$search = "";
 		$mode = 0;
 	} else {
-		die("Unknown or missing parameter ".$argv[1]."\n");
+		logger("Unknown or missing parameter ".$argv[1]."\n");
+		return;
 	}
 
 	logger('start '.$search);
 
-	if ($mode == 5) {
+	if ($mode == 8) {
+		if ($argv[2] != "") {
+			PortableContact::lastUpdated($argv[2], true);
+		}
+	} elseif ($mode == 7) {
+		if ($argc == 6) {
+			$url = $argv[5];
+		} else {
+			$url = '';
+		}
+		PortableContact::load(intval($argv[2]), intval($argv[3]), intval($argv[4]), $url);
+	} elseif ($mode == 6) {
+		PortableContact::discoverSingleServer(intval($argv[2]));
+	} elseif ($mode == 5) {
 		update_server();
 	} elseif ($mode == 4) {
-		$server_url = base64_decode($argv[2]);
+		$server_url = $argv[2];
 		if ($server_url == "") {
 			return;
 		}
@@ -48,7 +78,7 @@ function discover_poco_run(&$argv, &$argc) {
 			return;
 		}
 		$result = "Checking server ".$server_url." - ";
-		$ret = poco_check_server($server_url);
+		$ret = PortableContact::checkServer($server_url);
 		if ($ret) {
 			$result .= "success";
 		} else {
@@ -56,19 +86,20 @@ function discover_poco_run(&$argv, &$argc) {
 		}
 		logger($result, LOGGER_DEBUG);
 	} elseif ($mode == 3) {
-		update_suggestions();
-	} elseif (($mode == 2) AND get_config('system','poco_completion')) {
+		GlobalContact::updateSuggestions();
+	} elseif (($mode == 2) && Config::get('system', 'poco_completion')) {
 		discover_users();
-	} elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search')) {
+	} elseif (($mode == 1) && ($search != "") && Config::get('system', 'poco_local_search')) {
 		discover_directory($search);
 		gs_search_user($search);
-	} elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0)) {
+	} elseif (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') > 0)) {
 		// Query Friendica and Hubzilla servers for their users
-		poco_discover();
+		PortableContact::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();
+		if (!Config::get('system', 'ostatus_disabled')) {
+			GlobalContact::discoverGsUsers();
+		}
 	}
 
 	logger('end '.$search);
@@ -83,19 +114,19 @@ function discover_poco_run(&$argv, &$argc) {
 function update_server() {
 	$r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
 	$updated = 0;
 
 	foreach ($r AS $server) {
-		if (!poco_do_update($server["created"], "", $server["last_failure"], $server["last_contact"])) {
+		if (!PortableContact::updateNeeded($server["created"], "", $server["last_failure"], $server["last_contact"])) {
 			continue;
 		}
 		logger('Update server status for server '.$server["url"], LOGGER_DEBUG);
 
-		proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server["url"]));
+		Worker::add(PRIORITY_LOW, "discover_poco", "server", $server["url"]);
 
 		if (++$updated > 250) {
 			return;
@@ -106,7 +137,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()",
@@ -140,14 +173,19 @@ function discover_users() {
 			continue;
 		}
 
+		$server_url = PortableContact::detectServer($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 == "") && ($user["network"] == NETWORK_FEED)) || $force_update || PortableContact::checkServer($server_url, $user["network"])) {
+			logger('Check profile '.$user["url"]);
+			Worker::add(PRIORITY_LOW, "discover_poco", "check_profile", $user["url"]);
 
 			if (++$checked > 100) {
 				return;
@@ -156,6 +194,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;
+		}
 	}
 }
 
@@ -174,35 +217,42 @@ 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
+				if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
 					($exists[0]["updated"] < $exists[0]["last_failure"])) {
 					continue;
 				}
 				// Update the contact
-				poco_last_updated($jj->url);
+				PortableContact::lastUpdated($jj->url);
 				continue;
 			}
 
-			$server_url = poco_detect_server($jj->url);
+			$server_url = PortableContact::detectServer($jj->url);
 			if ($server_url != '') {
-				if (!poco_check_server($server_url)) {
+				if (!PortableContact::checkServer($server_url)) {
 					logger("Friendica server ".$server_url." doesn't answer.", LOGGER_DEBUG);
 					continue;
 				}
 				logger("Friendica server ".$server_url." seems to be okay.", LOGGER_DEBUG);
 			}
 
-			$data = probe_url($jj->url);
+			$data = Probe::uri($jj->url);
 			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"];
+
+				GlobalContact::update($data);
 			} else {
 				logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
 			}
@@ -230,16 +280,20 @@ 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) {
-		$contact = probe_url($user->site_address."/".$user->name);
+
+	/// @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::uri($user->site_address."/".$user->name);
 		if ($contact["network"] != NETWORK_PHANTOM) {
 			$contact["about"] = $user->description;
-			update_gcontact($contact);
+			GlobalContact::update($contact);
 		}
 	}
 }