X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FUpdateGContact.php;h=aacebcb80ae93d7482994261f06d8cd9e565ad67;hb=6bb418c5a7cdd71d28a8a572059efb14401b70bd;hp=b7a78b51f4bef72c7fb6d4b4b7fa7b8ba8c2918a;hpb=14fde5dc9b1915392601fb94efc6224c01f2b216;p=friendica.git

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index b7a78b51f4..aacebcb80a 100644
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -7,84 +7,17 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
+use Friendica\Model\GContact;
 use Friendica\Database\DBA;
-use Friendica\Network\Probe;
-use Friendica\Protocol\PortableContact;
-use Friendica\Util\DateTimeFormat;
 
 class UpdateGContact
 {
-	public static function execute($contact_id)
+	public static function execute($url, $command = '')
 	{
-		Logger::log('update_gcontact: start');
+		$force = ($command == "force");
 
-		if (empty($contact_id)) {
-			Logger::log('update_gcontact: no contact');
-			return;
-		}
+		$success = GContact::updateFromProbe($url, $force);
 
-		$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
-
-		if (!DBA::isResult($r)) {
-			return;
-		}
-
-		if (!in_array($r[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-			return;
-		}
-
-		$data = Probe::uri($r[0]["url"]);
-
-		if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-			if ($r[0]["server_url"] != "") {
-				PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
-			}
-
-			q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
-				DBA::escape(DateTimeFormat::utcNow()), intval($contact_id));
-			return;
-		}
-
-		if (($data["name"] == "") && ($r[0]['name'] != "")) {
-			$data["name"] = $r[0]['name'];
-		}
-
-		if (($data["nick"] == "") && ($r[0]['nick'] != "")) {
-			$data["nick"] = $r[0]['nick'];
-		}
-
-		if (($data["addr"] == "") && ($r[0]['addr'] != "")) {
-			$data["addr"] = $r[0]['addr'];
-		}
-
-		if (($data["photo"] == "") && ($r[0]['photo'] != "")) {
-			$data["photo"] = $r[0]['photo'];
-		}
-
-
-		q("UPDATE `gcontact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
-					WHERE `id` = %d",
-					DBA::escape($data["name"]),
-					DBA::escape($data["nick"]),
-					DBA::escape($data["addr"]),
-					DBA::escape($data["photo"]),
-			intval($contact_id)
-		);
-
-		q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
-					WHERE `uid` = 0 AND `addr` = '' AND `nurl` = '%s'",
-					DBA::escape($data["name"]),
-					DBA::escape($data["nick"]),
-					DBA::escape($data["addr"]),
-					DBA::escape($data["photo"]),
-					DBA::escape(normalise_link($data["url"]))
-		);
-
-		q("UPDATE `contact` SET `addr` = '%s'
-					WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
-					DBA::escape($data["addr"]),
-					DBA::escape(normalise_link($data["url"]))
-		);
+		Logger::info('Updated from probe', ['url' => $url, 'force' => $force, 'success' => $success]);
 	}
 }