X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=9f6fa6264b3736272b421455aa3346f671643e4a;hb=19247b62aecb69f2854cdbb09e36767a4d580e73;hp=8cdf331b7a443fd1bf99f52b64a420e33da7353e;hpb=9e3aff9adeb3bb463bffa4db220bdf645a263a3d;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 8cdf331b7a..9f6fa6264b 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -176,7 +176,6 @@ class Contact extends BaseObject
 
 	/**
 	 * @brief Get the basepath for a given contact link
-	 * @todo  Add functionality to store this value in the contact table
 	 *
 	 * @param string $url The contact link
 	 *
@@ -186,13 +185,19 @@ class Contact extends BaseObject
 	 */
 	public static function getBasepath($url)
 	{
-		$data = Probe::uri($url);
-		if (!empty($data['baseurl'])) {
-			return $data['baseurl'];
+		$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+		if (!empty($contact['baseurl'])) {
+			return $contact['baseurl'];
 		}
 
-		// When we can't probe the server, we use some ugly function that does some pattern matching
-		return PortableContact::detectServer($url);
+		self::updateFromProbeByURL($url, true);
+
+		$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+		if (!empty($contact['baseurl'])) {
+			return $contact['baseurl'];
+		}
+
+		return '';
 	}
 
 	/**
@@ -792,6 +797,7 @@ class Contact extends BaseObject
 				 */
 				DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
 				DBA::update('contact', ['archive' => 1], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
+				GContact::updateFromPublicContactURL($contact['url']);
 			}
 		}
 	}
@@ -829,6 +835,7 @@ class Contact extends BaseObject
 		$fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
 		DBA::update('contact', $fields, ['id' => $contact['id']]);
 		DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
+		GContact::updateFromPublicContactURL($contact['url']);
 
 		if (!empty($contact['batch'])) {
 			$condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
@@ -965,7 +972,7 @@ class Contact extends BaseObject
 		if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
 			&& in_array($profile["network"], Protocol::FEDERATED)
 		) {
-			Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
+			Worker::add(PRIORITY_LOW, "UpdateGContact", $url);
 		}
 
 		// Show contact details of Diaspora contacts only if connected
@@ -1300,11 +1307,13 @@ 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', 'updated', 'network'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
+		$fields = ['id', 'avatar', 'updated', 'network'];
+		$options = ['order' => ['id']];
+		$contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
 
 		// Then the addr (nick@server.tld)
 		if (!DBA::isResult($contact)) {
-			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
+			$contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
 		}
 
 		// Then the alias (which could be anything)
@@ -1312,7 +1321,7 @@ 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', 'updated', 'network'], $condition);
+			$contact = DBA::selectFirst('contact', $fields, $condition, $options);
 		}
 
 		if (DBA::isResult($contact)) {
@@ -1339,10 +1348,14 @@ class Contact extends BaseObject
 			return 0;
 		}
 
-		// When we don't want to update, we look if we know this contact in any way
 		if ($no_update && empty($default)) {
+			// When we don't want to update, we look if we know this contact in any way
 			$data = self::getProbeDataFromDatabase($url, $contact_id);
 			$background_update = true;
+		} elseif ($no_update && !empty($default)) {
+			// If there are default values, take these
+			$data = $default;
+			$background_update = false;
 		} else {
 			$data = [];
 			$background_update = false;
@@ -1357,18 +1370,9 @@ class Contact extends BaseObject
 			}
 		}
 
-		// Last try in gcontact for unsupported networks
-		if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
-			if ($uid != 0) {
-				return 0;
-			}
-
-			$contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default);
-			if (empty($contact)) {
-				return 0;
-			}
-
-			$data = array_merge($data, $contact);
+		// Take the default values when probing failed
+		if (!empty($default) && !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
+			$data = array_merge($data, $default);
 		}
 
 		if (empty($data)) {
@@ -1403,6 +1407,7 @@ class Contact extends BaseObject
 				'request'   => defaults($data, 'request', ''),
 				'confirm'   => defaults($data, 'confirm', ''),
 				'poco'      => defaults($data, 'poco', ''),
+				'baseurl'   => defaults($data, 'baseurl', ''),
 				'name-date' => DateTimeFormat::utcNow(),
 				'uri-date'  => DateTimeFormat::utcNow(),
 				'avatar-date' => DateTimeFormat::utcNow(),
@@ -1413,108 +1418,75 @@ class Contact extends BaseObject
 
 			$condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
 
-			DBA::update('contact', $fields, $condition, true);
-
-			$s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]);
-			$contacts = DBA::toArray($s);
-			if (!DBA::isResult($contacts)) {
-				return 0;
-			}
-
-			$contact_id = $contacts[0]["id"];
+			// Before inserting we do check if the entry does exist now.
+			$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
+			if (!DBA::isResult($contact)) {
+				Logger::info('Create new contact', $fields);
 
-			// Update in the background when we fetched the data solely from the database
-			if ($background_update) {
-				Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
-			}
+				DBA::insert('contact', $fields);
 
-			// 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)) {
-				// Only use the information when the probing hadn't fetched these values
-				if (!empty($data['keywords'])) {
-					unset($gcontact['keywords']);
-				}
-				if (!empty($data['location'])) {
-					unset($gcontact['location']);
-				}
-				if (!empty($data['about'])) {
-					unset($gcontact['about']);
+				// We intentionally aren't using lastInsertId here. There is a chance for duplicates.
+				$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
+				if (!DBA::isResult($contact)) {
+					Logger::info('Contact creation failed', $fields);
+					// Shouldn't happen
+					return 0;
 				}
-				DBA::update('contact', $gcontact, ['id' => $contact_id]);
+			} else {
+				Logger::info('Contact had been created before', ['id' => $contact["id"], 'url' => $url, 'contact' => $fields]);
 			}
 
-			if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-				$condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self`",
-					Strings::normaliseLink($data["url"]), 0, $contact_id];
-				Logger::log('Deleting duplicate contact ' . json_encode($condition), Logger::DEBUG);
-				DBA::delete('contact', $condition);
-			}
+			$contact_id = $contact["id"];
 		}
 
 		if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
 			self::updateAvatar($data['photo'], $uid, $contact_id);
 		}
 
-		$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
-		$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
+		if (in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
+			if ($background_update) {
+				// Update in the background when we fetched the data solely from the database
+				Worker::add(PRIORITY_MEDIUM, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
+			} else {
+				// Else do a direct update
+				self::updateFromProbe($contact_id, '', false);
 
-		// This condition should always be true
-		if (!DBA::isResult($contact)) {
-			return $contact_id;
-		}
+				// Update the gcontact entry
+				if ($uid == 0) {
+					GContact::updateFromPublicContactID($contact_id);
+				}
+			}
+		} else {
+			$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl'];
+			$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
-		$updated = [
-			'addr' => $data['addr'] ?? '',
-			'alias' => defaults($data, 'alias', ''),
-			'url' => $data['url'],
-			'nurl' => Strings::normaliseLink($data['url']),
-			'name' => $data['name'],
-			'nick' => $data['nick']
-		];
+			// This condition should always be true
+			if (!DBA::isResult($contact)) {
+				return $contact_id;
+			}
 
-		if (!empty($data['keywords'])) {
-			$updated['keywords'] = $data['keywords'];
-		}
-		if (!empty($data['location'])) {
-			$updated['location'] = $data['location'];
-		}
+			$updated = [
+				'url' => $data['url'],
+				'nurl' => Strings::normaliseLink($data['url']),
+				'updated' => DateTimeFormat::utcNow()
+			];
 
-		// Update the technical stuff as well - if filled
-		if (!empty($data['notify'])) {
-			$updated['notify'] = $data['notify'];
-		}
-		if (!empty($data['poll'])) {
-			$updated['poll'] = $data['poll'];
-		}
-		if (!empty($data['batch'])) {
-			$updated['batch'] = $data['batch'];
-		}
-		if (!empty($data['request'])) {
-			$updated['request'] = $data['request'];
-		}
-		if (!empty($data['confirm'])) {
-			$updated['confirm'] = $data['confirm'];
-		}
-		if (!empty($data['poco'])) {
-			$updated['poco'] = $data['poco'];
-		}
+			$fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl'];
 
-		// Only fill the pubkey if it had been empty before. We have to prevent identity theft.
-		if (empty($contact['pubkey'])) {
-			$updated['pubkey'] = $data['pubkey'];
-		}
+			foreach ($fields as $field) {
+				$updated[$field] = defaults($data, $field, $contact[$field]);
+			}
 
-		if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
-			$updated['uri-date'] = DateTimeFormat::utcNow();
-		}
-		if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
-			$updated['name-date'] = DateTimeFormat::utcNow();
-		}
+			if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
+				$updated['uri-date'] = DateTimeFormat::utcNow();
+			}
 
-		$updated['updated'] = DateTimeFormat::utcNow();
+			if (($data['name'] != $contact['name']) || ($data['nick'] != $contact['nick'])) {
+				$updated['name-date'] = DateTimeFormat::utcNow();
+			}
 
-		DBA::update('contact', $updated, ['id' => $contact_id], $contact);
+			DBA::update('contact', $updated, ['id' => $contact_id], $contact);
+		}
 
 		return $contact_id;
 	}
@@ -1587,7 +1559,7 @@ class Contact extends BaseObject
 			return '';
 		}
 
-		if (in_array($contact["network"], array_merge(Protocol::FEDERATED ,['']))) {
+		if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
 			$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
 		} else {
 			$sql = "`item`.`uid` = ?";
@@ -1605,7 +1577,7 @@ class Contact extends BaseObject
 
 		$pager = new Pager($a->query_string);
 
-		$params = ['order' => ['created' => true],
+		$params = ['order' => ['received' => true],
 			'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
 		if ($thread_mode) {
@@ -1766,10 +1738,14 @@ class Contact extends BaseObject
 	{
 		DBA::update('contact', $fields, ['id' => $id]);
 
-		if ($uid != 0) {
+		// Search for duplicated contacts and get rid of them
+		if (self::handleDuplicates(Strings::normaliseLink($url), $uid, $id) || ($uid != 0)) {
 			return;
 		}
 
+		// Update the corresponding gcontact entry
+		GContact::updateFromPublicContactID($id);
+
 		// Archive or unarchive the contact. We only need to do this for the public contact.
 		// The archive/unarchive function will update the personal contacts by themselves.
 		$contact = DBA::selectFirst('contact', [], ['id' => $id]);
@@ -1799,6 +1775,56 @@ class Contact extends BaseObject
 		DBA::update('contact', $fields, $condition);
 	}
 
+        /**
+	 * @brief Helper function for "updateFromProbe". Remove duplicated contacts
+	 *
+	 * @param string  $nurl  Normalised contact url
+	 * @param integer $uid   User id
+	 * @param integer $id    Contact id of a duplicate
+	 * @return boolean
+	 * @throws \Exception
+	 */
+	private static function handleDuplicates($nurl, $uid, $id)
+	{
+		$condition = ['nurl' => $nurl, 'uid' => $uid, 'deleted' => false];
+		$count = DBA::count('contact', $condition);
+		if ($count <= 1) {
+			return false;
+		}
+
+		$first_contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
+		if (!DBA::isResult($first_contact)) {
+			// Shouldn't happen - so we handle it
+			return false;
+		}
+
+		$first = $first_contact['id'];
+		Logger::info('Found duplicates', ['count' => $count, 'id' => $id, 'first' => $first, 'uid' => $uid, 'nurl' => $nurl]);
+		if ($uid != 0) {
+			// Don't handle non public duplicates by now
+			Logger::info('Not handling non public duplicate', ['uid' => $uid, 'nurl' => $nurl]);
+			return false;
+		}
+
+		// Find all duplicates
+		$condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self` AND NOT `deleted`", $nurl, $uid, $first];
+		$duplicates = DBA::select('contact', ['id'], $condition);
+		while ($duplicate = DBA::fetch($duplicates)) {
+			$dup_id = $duplicate['id'];
+			Logger::info('Handling duplicate', ['search' => $dup_id, 'replace' => $first]);
+
+			// Search and replace
+			DBA::update('item', ['author-id' => $first], ['author-id' => $dup_id]);
+			DBA::update('item', ['owner-id' => $first], ['owner-id' => $dup_id]);
+			DBA::update('item', ['contact-id' => $first], ['contact-id' => $dup_id]);
+
+			// Remove the duplicate
+			DBA::delete('contact', ['id' => $dup_id]);
+		}
+		Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
+		return true;
+	}
+
 	/**
 	 * @param integer $id      contact id
 	 * @param string  $network Optional network we are probing for
@@ -1814,8 +1840,12 @@ class Contact extends BaseObject
 		  This will reliably kill your communication with old Friendica contacts.
 		 */
 
-		$fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify',
-			'poll', 'request', 'confirm', 'poco', 'network', 'alias'];
+		// These fields aren't updated by this routine:
+		// 'xmpp', 'sensitive'
+
+		$fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'gender',
+			'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
+			'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
 		if (!DBA::isResult($contact)) {
 			return false;
@@ -1824,6 +1854,9 @@ class Contact extends BaseObject
 		$uid = $contact['uid'];
 		unset($contact['uid']);
 
+		$pubkey = $contact['pubkey'];
+		unset($contact['pubkey']);
+
 		$contact['photo'] = $contact['avatar'];
 		unset($contact['avatar']);
 
@@ -1831,6 +1864,15 @@ class Contact extends BaseObject
 
 		$updated = DateTimeFormat::utcNow();
 
+		// We must not try to update relay contacts via probe. They are no real contacts.
+		// We check after the probing to be able to correct falsely detected contact types.
+		if (($contact['contact-type'] == self::TYPE_RELAY) &&
+			(!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
+			self::updateContact($id, $uid, $contact['url'], ['last-update' => $updated, 'success_update' => $updated]);
+			Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]);
+			return true;
+		}
+
 		// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
 		if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT) ||
 			(in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network']))) {
@@ -1840,13 +1882,33 @@ class Contact extends BaseObject
 			return false;
 		}
 
+		if (isset($ret['hide']) && is_bool($ret['hide'])) {
+			$ret['unsearchable'] = $ret['hide'];
+		}
+
+		if (isset($ret['account-type']) && is_int($ret['account-type'])) {
+			$ret['forum'] = false;
+			$ret['prv'] = false;
+			$ret['contact-type'] = $ret['account-type'];
+			if ($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+				$apcontact = APContact::getByURL($ret['url'], false);
+				if (isset($apcontact['manually-approve'])) {
+					$ret['forum'] = (bool)!$apcontact['manually-approve'];
+					$ret['prv'] = (bool)!$ret['forum'];
+				}
+			}
+		}
+
+		$new_pubkey = $ret['pubkey'];
+
 		$update = false;
 
-		// make sure to not overwrite existing values with blank entries
+		// make sure to not overwrite existing values with blank entries except some technical fields
+		$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
 		foreach ($ret as $key => $val) {
-			if (!isset($contact[$key])) {
+			if (!array_key_exists($key, $contact)) {
 				unset($ret[$key]);
-			} elseif (($contact[$key] != '') && ($val == '')) {
+			} elseif (($contact[$key] != '') && ($val === '') && !is_bool($ret[$key]) && !in_array($key, $keep)) {
 				$ret[$key] = $contact[$key];
 			} elseif ($ret[$key] != $contact[$key]) {
 				$update = true;
@@ -1867,6 +1929,19 @@ class Contact extends BaseObject
 		$ret['nurl'] = Strings::normaliseLink($ret['url']);
 		$ret['updated'] = $updated;
 
+		// Only fill the pubkey if it had been empty before. We have to prevent identity theft.
+		if (empty($pubkey) && !empty($new_pubkey)) {
+			$ret['pubkey'] = $new_pubkey;
+		}
+
+		if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
+			$ret['uri-date'] = DateTimeFormat::utcNow();
+		}
+
+		if (($ret['name'] != $contact['name']) || ($ret['nick'] != $contact['nick'])) {
+			$ret['name-date'] = $updated;
+		}
+
 		if ($force && ($uid == 0)) {
 			$ret['last-update'] = $updated;
 			$ret['success_update'] = $updated;
@@ -1876,12 +1951,22 @@ class Contact extends BaseObject
 
 		self::updateContact($id, $uid, $ret['url'], $ret);
 
-		// Update the corresponding gcontact entry
-		GContact::updateFromProbe($ret['url']);
-
 		return true;
 	}
 
+	public static function updateFromProbeByURL($url, $force = false)
+	{
+		$id = self::getIdForURL($url);
+
+		if (empty($id)) {
+			return $id;
+		}
+
+		self::updateFromProbe($id, '', $force);
+
+		return $id;
+	}
+
 	/**
 	 * Detects if a given contact array belongs to a legacy DFRN connection
 	 *
@@ -2080,6 +2165,7 @@ class Contact extends BaseObject
 				'name'    => $ret['name'],
 				'nick'    => $ret['nick'],
 				'network' => $ret['network'],
+				'baseurl' => $ret['baseurl'],
 				'protocol' => $protocol,
 				'pubkey'  => $ret['pubkey'],
 				'rel'     => $new_relation,