X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FFContact.php;h=6812f5fd09d87ef1070c21a1f570ef6c3aa5e205;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=c4d6251c3b4d951618afa5d83594988c846eaf87;hpb=2cbc9359446625c679352dfd759638d45339885b;p=friendica.git

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index c4d6251c3b..6812f5fd09 100644
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -58,7 +58,7 @@ class FContact
 					$update = true;
 				}
 
-				if ($person["guid"] == "") {
+				if (empty($person['guid']) || empty($person['uri-id'])) {
 					$update = true;
 				}
 			}
@@ -70,12 +70,12 @@ class FContact
 
 		if ($update) {
 			Logger::info('create or refresh', ['handle' => $handle]);
-			$r = Probe::uri($handle, Protocol::DIASPORA);
+			$data = Probe::uri($handle, Protocol::DIASPORA);
 
 			// Note that Friendica contacts will return a "Diaspora person"
 			// if Diaspora connectivity is enabled on their server
-			if ($r && ($r["network"] === Protocol::DIASPORA)) {
-				self::updateFContact($r);
+			if ($data['network'] ?? '' === Protocol::DIASPORA) {
+				self::updateFromProbeArray($data);
 
 				$person = self::getByURL($handle, false);
 			}
@@ -90,14 +90,27 @@ class FContact
 	 * @param array $arr The fcontact data
 	 * @throws \Exception
 	 */
-	private static function updateFContact($arr)
+	public static function updateFromProbeArray($arr)
 	{
+		$uriid = ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]);
+
+		$contact = Contact::getByUriId($uriid, ['id']);
+		if (!empty($contact['id'])) {
+			$last_interaction = DateTimeFormat::utc('now - 180 days');
+
+			$interacted  = DBA::count('contact-relation', ["`cid` = ? AND NOT `follows` AND `last-interaction` > ?", $contact['id'], $last_interaction]);
+			$interacting = DBA::count('contact-relation', ["`relation-cid` = ? AND NOT `follows` AND `last-interaction` > ?", $contact['id'], $last_interaction]);
+			$posts       = Post::countPosts(['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]);
+		}
+
 		$fields = ['name' => $arr["name"], 'photo' => $arr["photo"],
 			'request' => $arr["request"], 'nick' => $arr["nick"],
 			'addr' => strtolower($arr["addr"]), 'guid' => $arr["guid"],
 			'batch' => $arr["batch"], 'notify' => $arr["notify"],
 			'poll' => $arr["poll"], 'confirm' => $arr["confirm"],
 			'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"],
+			'uri-id' => $uriid, 'interacting_count' => $interacting ?? 0,
+			'interacted_count' => $interacted ?? 0, 'post_count' => $posts ?? 0,
 			'updated' => DateTimeFormat::utcNow()];
 
 		$condition = ['url' => $arr["url"], 'network' => $arr["network"]];
@@ -118,14 +131,9 @@ class FContact
 	{
 		Logger::info('fcontact', ['guid' => $fcontact_guid]);
 
-		$r = q(
-			"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
-			DBA::escape(Protocol::DIASPORA),
-			DBA::escape($fcontact_guid)
-		);
-
-		if (DBA::isResult($r)) {
-			return $r[0]['url'];
+		$fcontact = DBA::selectFirst('fcontact', ['url'], ["`url` != ? AND `network` = ? AND `guid` = ?", '', Protocol::DIASPORA, $fcontact_guid]);
+		if (DBA::isResult($fcontact)) {
+			return $fcontact['url'];
 		}
 
 		return null;