X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=1b38fde2ed8f0241ce8e6f515a8f7cd6b0e4ec5f;hb=90eea919a42c6d2dc40afd967a9dcf6ebae4e22a;hp=fe373ae94a737923b3bc21be033e99a231b4ceaf;hpb=ef0545645a3054a6433340e7ac170c1933e670cc;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index fe373ae94a..1b38fde2ed 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -599,7 +599,10 @@ class Contact extends BaseObject
 		}
 
 		if ($update) {
-			$fields['name-date'] = DateTimeFormat::utcNow();
+			if ($fields['name'] != $self['name']) {
+				$fields['name-date'] = DateTimeFormat::utcNow();
+			}
+			$fields['updated'] = DateTimeFormat::utcNow();
 			DBA::update('contact', $fields, ['id' => $self['id']]);
 
 			// Update the public contact as well
@@ -1114,6 +1117,81 @@ class Contact extends BaseObject
 			   )", intval($uid), intval($uid));
 	}
 
+	/**
+	 * Have a look at all contact tables for a given profile url.
+	 * This function works as a replacement for probing the contact.
+	 *
+	 * @param string $url Contact URL
+	 *
+	 * @return array Contact array in the "probe" structure
+	*/
+	private static function getProbeDataFromDatabase($url)
+	{
+		// The link could be provided as http although we stored it as https
+		$ssl_url = str_replace('http://', 'https://', $url);
+
+		$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+			'photo', 'keywords', 'location', 'about', 'network',
+			'priority', 'batch', 'request', 'confirm', 'poco'];
+		$data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
+
+		if (!DBA::isResult($data)) {
+			$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
+			$data = DBA::selectFirst('contact', $fields, $condition);
+		}
+
+		if (DBA::isResult($data)) {
+			// For security reasons we don't fetch key data from our users
+			$data["pubkey"] = '';
+			return $data;
+		}
+
+		$fields = ['url', 'addr', 'alias', 'notify', 'name', 'nick',
+			'photo', 'keywords', 'location', 'about', 'network'];
+		$data = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
+
+		if (!DBA::isResult($data)) {
+			$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
+			$data = DBA::selectFirst('contact', $fields, $condition);
+		}
+
+		if (DBA::isResult($data)) {
+			$data["pubkey"] = '';
+			$data["poll"] = '';
+			$data["priority"] = 0;
+			$data["batch"] = '';
+			$data["request"] = '';
+			$data["confirm"] = '';
+			$data["poco"] = '';
+			return $data;
+		}
+
+		$data = ActivityPub::probeProfile($url, false);
+		if (!empty($data)) {
+			return $data;
+		}
+
+		$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+			'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
+		$data = DBA::selectFirst('fcontact', $fields, ['url' => $url]);
+
+		if (!DBA::isResult($data)) {
+			$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
+			$data = DBA::selectFirst('contact', $fields, $condition);
+		}
+
+		if (DBA::isResult($data)) {
+			$data["pubkey"] = '';
+			$data["keywords"] = '';
+			$data["location"] = '';
+			$data["about"] = '';
+			$data["poco"] = '';
+			return $data;
+		}
+
+		return [];
+	}
+
 	/**
 	 * @brief Fetch the contact id for a given URL and user
 	 *
@@ -1154,11 +1232,11 @@ class Contact extends BaseObject
 
 		/// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
 		// We first try the nurl (http://server.tld/nick), most common case
-		$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
+		$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
 
 		// Then the addr (nick@server.tld)
 		if (!DBA::isResult($contact)) {
-			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
+			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
 		}
 
 		// Then the alias (which could be anything)
@@ -1166,19 +1244,25 @@ class Contact extends BaseObject
 			// The link could be provided as http although we stored it as https
 			$ssl_url = str_replace('http://', 'https://', $url);
 			$condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
-			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
+			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], $condition);
 		}
 
 		if (DBA::isResult($contact)) {
 			$contact_id = $contact["id"];
 
 			// Update the contact every 7 days
-			$update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
+			$update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days'));
 
 			// We force the update if the avatar is empty
 			if (empty($contact['avatar'])) {
 				$update_contact = true;
 			}
+
+			// Update the contact in the background if needed but it is called by the frontend
+			if ($update_contact && $no_update) {
+				Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
+			}
+
 			if (!$update_contact || $no_update) {
 				return $contact_id;
 			}
@@ -1187,19 +1271,13 @@ class Contact extends BaseObject
 			return 0;
 		}
 
-		// When we don't want to update, we look if some of our users already know this contact
-		if ($no_update) {
-			$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-				'photo', 'keywords', 'location', 'about', 'network',
-				'priority', 'batch', 'request', 'confirm', 'poco'];
-			$data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-
-			if (DBA::isResult($data)) {
-				// For security reasons we don't fetch key data from our users
-				$data["pubkey"] = '';
-			}
+		// When we don't want to update, we look if we know this contact in any way
+		if ($no_update && empty($default)) {
+			$data = self::getProbeDataFromDatabase($url);
+			$background_update = true;
 		} else {
 			$data = [];
+			$background_update = false;
 		}
 
 		if (empty($data)) {
@@ -1217,44 +1295,20 @@ class Contact extends BaseObject
 				return 0;
 			}
 
-			// Get data from the gcontact table
-			$fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
-			$contact = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-			if (!DBA::isResult($contact)) {
-				$contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-			}
-
-			if (!DBA::isResult($contact)) {
-				$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-					'photo', 'keywords', 'location', 'about', 'network',
-					'priority', 'batch', 'request', 'confirm', 'poco'];
-				$contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
-			}
-
-			// The link could be provided as http although we stored it as https
-			$ssl_url = str_replace('http://', 'https://', $url);
-
-			if (!DBA::isResult($contact)) {
-				$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
-				$contact = DBA::selectFirst('contact', $fields, $condition);
-			}
-
-			if (!DBA::isResult($contact)) {
-				$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-					'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
-				$condition = ['url' => [$url, Strings::normaliseLink($url), $ssl_url]];
-				$contact = DBA::selectFirst('fcontact', $fields, $condition);
-			}
-
 			if (!empty($default)) {
 				$contact = $default;
-			}
-
-			if (!DBA::isResult($contact)) {
-				return 0;
 			} else {
-				$data = array_merge($data, $contact);
+				$contact = self::getProbeDataFromDatabase($url);
+				if (empty($contact)) {
+					return 0;
+				}
 			}
+
+			$data = array_merge($data, $contact);
+		}
+
+		if (empty($data)) {
+			return 0;
 		}
 
 		if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
@@ -1305,6 +1359,11 @@ class Contact extends BaseObject
 
 			$contact_id = $contacts[0]["id"];
 
+			// Update in the background when we fetched the data solely from the database
+			if ($background_update) {
+				Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
+			}
+
 			// Update the newly created contact from data in the gcontact table
 			$gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => Strings::normaliseLink($data["url"])]);
 			if (DBA::isResult($gcontact)) {
@@ -1385,7 +1444,7 @@ class Contact extends BaseObject
 			$updated['name-date'] = DateTimeFormat::utcNow();
 		}
 
-		$updated['avatar-date'] = DateTimeFormat::utcNow();
+		$updated['updated'] = DateTimeFormat::utcNow();
 
 		DBA::update('contact', $updated, ['id' => $contact_id], $contact);
 
@@ -1684,6 +1743,7 @@ class Contact extends BaseObject
 		}
 
 		$ret['nurl'] = Strings::normaliseLink($ret['url']);
+		$ret['updated'] = DateTimeFormat::utcNow();
 
 		self::updateAvatar($ret['photo'], $uid, $id, true);