X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FFContact.php;h=cc6b2d2a7a43d9a4d6093a2357e7f5922486f058;hb=88870d18be53fc38d70e842cdc35c7a1bc703b75;hp=90abc12ca6cba674cdf23fcf4efd98c5aa702bbd;hpb=e56a53647bd5469551bf4f9ef2df50a5dd16b943;p=friendica.git

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index 90abc12ca6..cc6b2d2a7a 100644
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -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(string $handle, $update = null): array
 	{
-		$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,18 +90,40 @@ class FContact
 	 * @param array $arr The fcontact data
 	 * @throws \Exception
 	 */
-	private static function updateFContact($arr)
+	public static function updateFromProbeArray(array $arr)
 	{
-		$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']]),
-			'updated' => DateTimeFormat::utcNow()];
+		$uriid = ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]);
 
-		$condition = ['url' => $arr["url"], 'network' => $arr["network"]];
+		$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']];
 
 		DBA::update('fcontact', $fields, $condition, true);
 	}
@@ -110,12 +132,11 @@ class FContact
 	 * get a url (scheme://domain.tld/u/user) from a given Diaspora*
 	 * fcontact guid
 	 *
-	 * @param mixed $fcontact_guid Hexadecimal string guid
-	 *
-	 * @return string the contact url or null
+	 * @param string $fcontact_guid Hexadecimal string guid
+	 * @return string|null the contact url or null
 	 * @throws \Exception
 	 */
-	public static function getUrlByGuid($fcontact_guid)
+	public static function getUrlByGuid(string $fcontact_guid)
 	{
 		Logger::info('fcontact', ['guid' => $fcontact_guid]);