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

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index f611000934..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
  *
@@ -24,10 +24,7 @@ namespace Friendica\Model;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Notify\Type;
 use Friendica\Network\Probe;
-use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -61,7 +58,7 @@ class FContact
 					$update = true;
 				}
 
-				if ($person["guid"] == "") {
+				if (empty($person['guid']) || empty($person['uri-id'])) {
 					$update = true;
 				}
 			}
@@ -73,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);
 			}
@@ -93,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"]];
@@ -121,92 +131,11 @@ 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'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Add suggestions for a given contact
-	 *
-	 * @param integer $uid
-	 * @param integer $cid
-	 * @return bool   Was the adding successful?
-	 */
-	public static function addSuggestion(int $uid, int $cid)
-	{
-		$owner = User::getOwnerDataById($uid);
-		$contact = Contact::getById($cid);
-
-		if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($contact['url']), 'uid' => $uid])) {
-			return false;
-		}
-
-		$suggest = [];
-		$suggest['uid'] = $uid;
-		$suggest['cid'] = $contact['id'];
-		$suggest['url'] = $contact['url'];
-		$suggest['name'] = $contact['name'];
-		$suggest['photo'] = $contact['photo'];
-		$suggest['request'] = $contact['request'];
-		$suggest['title'] = '';
-		$suggest['body'] = '';
-
-		// Do we already have an fcontact record for this person?
-		$fid = 0;
-		$fcontact = DBA::selectFirst('fcontact', ['id'], ['url' => $suggest['url']]);
+		$fcontact = DBA::selectFirst('fcontact', ['url'], ["`url` != ? AND `network` = ? AND `guid` = ?", '', Protocol::DIASPORA, $fcontact_guid]);
 		if (DBA::isResult($fcontact)) {
-			$fid = $fcontact['id'];
-
-			$fields = ['name' => $suggest['name'], 'photo' => $suggest['photo'], 'request' => $suggest['request']];
-			DBA::update('fcontact', $fields, ['id' => $fid]);
-
-			// Quit if we already have an introduction for this person
-			if (DBA::exists('intro', ['uid' => $suggest['uid'], 'fid' => $fid])) {
-				return false;
-			}
-		}
-
-		if (empty($fid)) {
-			$fields = ['name' => $suggest['name'], 'url' => $suggest['url'],
-				'photo' => $suggest['photo'], 'request' => $suggest['request']];
-			DBA::insert('fcontact', $fields);
-			$fid = DBA::lastInsertId();
-			if (empty($fid)) {
-				Logger::warning('FContact had not been created', ['fcontact' => $fields]);
-				return false;
-			}
+			return $fcontact['url'];
 		}
 
-		$hash = Strings::getRandomHex();
-		$fields = ['uid' => $suggest['uid'], 'fid' => $fid, 'contact-id' => $suggest['cid'], 
-			'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
-		DBA::insert('intro', $fields);
-
-		notification([
-			'type'         => Type::SUGGEST,
-			'notify_flags' => $owner['notify-flags'],
-			'language'     => $owner['language'],
-			'to_name'      => $owner['name'],
-			'to_email'     => $owner['email'],
-			'uid'          => $owner['uid'],
-			'item'         => $suggest,
-			'link'         => DI::baseUrl().'/notifications/intros',
-			'source_name'  => $contact['name'],
-			'source_link'  => $contact['url'],
-			'source_photo' => $contact['photo'],
-			'verb'         => Activity::REQ_FRIEND,
-			'otype'        => 'intro'
-		]);
-
-		return true;
+		return null;
 	}
 }