X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FFContact.php;h=6812f5fd09d87ef1070c21a1f570ef6c3aa5e205;hb=624e4c192c7f837ac0587a50da6e1409081eb519;hp=006a37a608510b3d3453a8ffb0ab4504d25ae94a;hpb=1274fe6f9bdf0ecf4d1fe74a3ff241e8b57d8c0f;p=friendica.git

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index 006a37a608..6812f5fd09 100644
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -40,12 +40,12 @@ class FContact
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getByURL($handle, $update = null, $network = Protocol::DIASPORA)
+	public static function getByURL($handle, $update = null)
 	{
-		$person = DBA::selectFirst('fcontact', [], ['network' => $network, 'addr' => $handle]);
+		$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
 		if (!DBA::isResult($person)) {
 			$urls = [$handle, str_replace('http://', 'https://', $handle), Strings::normaliseLink($handle)];
-			$person = DBA::selectFirst('fcontact', [], ['network' => $network, 'url' => $urls]);
+			$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'url' => $urls]);
 		}
 
 		if (DBA::isResult($person)) {
@@ -70,14 +70,14 @@ class FContact
 
 		if ($update) {
 			Logger::info('create or refresh', ['handle' => $handle]);
-			$r = Probe::uri($handle, $network);
+			$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"] === $network)) {
-				self::updateFContact($r);
+			if ($data['network'] ?? '' === Protocol::DIASPORA) {
+				self::updateFromProbeArray($data);
 
-				$person = self::getByURL($handle, false, $network);
+				$person = self::getByURL($handle, false);
 			}
 		}
 
@@ -90,15 +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' => ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]),
+			'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"]];