X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=cacc3e4f1ef1a7b56bbfc0697893b0c745a8e79e;hb=d2c734c0256a2b6e8a5eef4422480edd820544b1;hp=b645893776636353727a49907c8c0202280741aa;hpb=7e3196776bbc92a181bcc160f68b623fe8868ea1;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index b645893776..cacc3e4f1e 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -34,7 +34,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
@@ -724,7 +723,7 @@ class Contact
 	{
 		// We want just to make sure that we don't delete our "self" contact
 		$contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
-		if (!DBA::isResult($contact) || !intval($contact['uid'])) {
+		if (!DBA::isResult($contact)) {
 			return;
 		}
 
@@ -809,7 +808,7 @@ class Contact
 			Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]);
 		}
 
-		Logger::info('Contact is marked for archival', ['id' => $contact['id']]);
+		Logger::info('Contact is marked for archival', ['id' => $contact['id'], 'term-date' => $contact['term-date']]);
 
 		// Contact already archived or "self" contact? => nothing to do
 		if ($contact['archive'] || $contact['self']) {
@@ -856,7 +855,9 @@ class Contact
 		if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
 			$fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
 			$condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
-			DBA::update('contact', $fields, $condition);
+			if (!DBA::exists('contact', array_merge($condition, $fields))) {
+				DBA::update('contact', $fields, $condition);
+			}
 		}
 
 		$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME];
@@ -867,7 +868,7 @@ class Contact
 			return;
 		}
 
-		Logger::info('Contact is marked as vital again', ['id' => $contact['id']]);
+		Logger::info('Contact is marked as vital again', ['id' => $contact['id'], 'term-date' => $contact['term-date']]);
 
 		if (!isset($contact['url']) && !empty($contact['id'])) {
 			$fields = ['id', 'url', 'batch'];
@@ -906,7 +907,7 @@ class Contact
 
 		if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
 			if ($uid == 0) {
-				$profile_link = self::magicLink($contact['url']);
+				$profile_link = self::magicLinkByContact($contact);
 				$menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
 
 				return $menu;
@@ -1167,6 +1168,12 @@ class Contact
 
 		self::updateFromProbeArray($contact_id, $data);
 
+		// Don't return a number for a deleted account
+		if (!empty($data['account-type']) && $data['account-type'] == User::ACCOUNT_TYPE_DELETED) {
+			Logger::info('Contact is a tombstone', ['url' => $url, 'uid' => $uid]);
+			return 0;
+		}
+
 		return $contact_id;
 	}
 
@@ -1296,9 +1303,9 @@ class Contact
 		}
 
 		if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
-			$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
+			$sql = "(`uid` = 0 OR (`uid` = ? AND NOT `global`))";
 		} else {
-			$sql = "`item`.`uid` = ?";
+			$sql = "`uid` = ?";
 		}
 
 		$contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id');
@@ -1340,18 +1347,11 @@ class Contact
 		}
 
 		if ($thread_mode) {		
-			$r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri', 'thr-parent-id', 'author-id'], $condition, $params);
-			$items = [];
-			while ($item = DBA::fetch($r)) {
-				$items[] = $item;
-			}
-			DBA::close($r);
+			$items = Post::toArray(Post::selectForUser(local_user(), ['uri-id', 'gravity', 'parent-uri-id', 'thr-parent-id', 'author-id'], $condition, $params));
 
 			$o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user());
 		} else {
-			$r = Item::selectForUser(local_user(), [], $condition, $params);
-
-			$items = Item::inArray($r);
+			$items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
 
 			$o .= conversation($a, $items, 'contact-posts', $update);
 		}
@@ -1473,21 +1473,26 @@ class Contact
 	/**
 	 * Return the photo path for a given contact array in the given size
 	 *
-	 * @param array $contact  contact array
-	 * @param string $field   Fieldname of the photo in the contact array
-	 * @param string $size    Size of the avatar picture
-	 * @param string $avatar  Avatar path that is displayed when no photo had been found
+	 * @param array $contact    contact array
+	 * @param string $field     Fieldname of the photo in the contact array
+	 * @param string $size      Size of the avatar picture
+	 * @param string $avatar    Avatar path that is displayed when no photo had been found
+	 * @param bool  $no_update Don't perfom an update if no cached avatar was found
 	 * @return string photo path
 	 */
-	private static function getAvatarPath(array $contact, string $field, string $size, string $avatar)
+	private static function getAvatarPath(array $contact, string $field, string $size, string $avatar, $no_update = false)
 	{
 		if (!empty($contact)) {
-			$contact = self::checkAvatarCacheByArray($contact);
+			$contact = self::checkAvatarCacheByArray($contact, $no_update);
 			if (!empty($contact[$field])) {
 				$avatar = $contact[$field];
 			}
 		}
 
+		if ($no_update && empty($avatar) && !empty($contact['avatar'])) {
+			$avatar = $contact['avatar'];
+		}
+
 		if (empty($avatar)) {
 			$avatar = self::getDefaultAvatar([], $size);
 		}
@@ -1502,46 +1507,50 @@ class Contact
 	/**
 	 * Return the photo path for a given contact array
 	 *
-	 * @param array $contact Contact array
-	 * @param string $avatar  Avatar path that is displayed when no photo had been found
+	 * @param array  $contact   Contact array
+	 * @param string $avatar    Avatar path that is displayed when no photo had been found
+	 * @param bool   $no_update Don't perfom an update if no cached avatar was found
 	 * @return string photo path
 	 */
-	public static function getPhoto(array $contact, string $avatar = '')
+	public static function getPhoto(array $contact, string $avatar = '', bool $no_update = false)
 	{
-		return self::getAvatarPath($contact, 'photo', Proxy::SIZE_SMALL, $avatar);
+		return self::getAvatarPath($contact, 'photo', Proxy::SIZE_SMALL, $avatar, $no_update);
 	}
 
 	/**
 	 * Return the photo path (thumb size) for a given contact array
 	 *
-	 * @param array $contact Contact array
-	 * @param string $avatar  Avatar path that is displayed when no photo had been found
+	 * @param array  $contact   Contact array
+	 * @param string $avatar    Avatar path that is displayed when no photo had been found
+	 * @param bool   $no_update Don't perfom an update if no cached avatar was found
 	 * @return string photo path
 	 */
-	public static function getThumb(array $contact, string $avatar = '')
+	public static function getThumb(array $contact, string $avatar = '', bool $no_update = false)
 	{
-		return self::getAvatarPath($contact, 'thumb', Proxy::SIZE_THUMB, $avatar);
+		return self::getAvatarPath($contact, 'thumb', Proxy::SIZE_THUMB, $avatar, $no_update);
 	}
 
 	/**
 	 * Return the photo path (micro size) for a given contact array
 	 *
-	 * @param array $contact Contact array
-	 * @param string $avatar  Avatar path that is displayed when no photo had been found
+	 * @param array  $contact   Contact array
+	 * @param string $avatar    Avatar path that is displayed when no photo had been found
+	 * @param bool   $no_update Don't perfom an update if no cached avatar was found
 	 * @return string photo path
 	 */
-	public static function getMicro(array $contact, string $avatar = '')
+	public static function getMicro(array $contact, string $avatar = '', bool $no_update = false)
 	{
-		return self::getAvatarPath($contact, 'micro', Proxy::SIZE_MICRO, $avatar);
+		return self::getAvatarPath($contact, 'micro', Proxy::SIZE_MICRO, $avatar, $no_update);
 	}
 
 	/**
 	 * Check the given contact array for avatar cache fields
 	 *
 	 * @param array $contact
+	 * @param bool  $no_update Don't perfom an update if no cached avatar was found
 	 * @return array contact array with avatar cache fields
 	 */
-	private static function checkAvatarCacheByArray(array $contact)
+	private static function checkAvatarCacheByArray(array $contact, bool $no_update = false)
 	{
 		$update = false;
 		$contact_fields = [];
@@ -1555,7 +1564,7 @@ class Contact
 			}
 		}
 
-		if (!$update) {
+		if (!$update || $no_update) {
 			return $contact;
 		}
 
@@ -1762,25 +1771,42 @@ class Contact
 		DBA::update('contact', $fields, ['id' => $cids]);
 	}
 
+	public static function deleteContactByUrl(string $url)
+	{
+		// Update contact data for all users
+		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
+		$contacts = DBA::select('contact', ['id', 'uid'], $condition);
+		while ($contact = DBA::fetch($contacts)) {
+			Logger::info('Deleting contact', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $url]);
+			self::remove($contact['id']);
+		}
+	}
+
 	/**
 	 * Helper function for "updateFromProbe". Updates personal and public contact
 	 *
 	 * @param integer $id      contact id
 	 * @param integer $uid     user id
-	 * @param string  $url     The profile URL of the contact
+	 * @param string  $old_url The previous profile URL of the contact
+	 * @param string  $new_url The profile URL of the contact
 	 * @param array   $fields  The fields that are updated
 	 *
 	 * @throws \Exception
 	 */
-	private static function updateContact($id, $uid, $url, array $fields)
+	private static function updateContact(int $id, int $uid, string $old_url, string $new_url, array $fields)
 	{
+		if (Strings::normaliseLink($new_url) != Strings::normaliseLink($old_url)) {
+			Logger::notice('New URL differs from old URL', ['old' => $old_url, 'new' => $new_url]);
+			// @todo It is to decide what to do when the URL is changed
+		}
+
 		if (!DBA::update('contact', $fields, ['id' => $id])) {
 			Logger::info('Couldn\'t update contact.', ['id' => $id, 'fields' => $fields]);
 			return;
 		}
 
 		// Search for duplicated contacts and get rid of them
-		if (self::removeDuplicates(Strings::normaliseLink($url), $uid)) {
+		if (self::removeDuplicates(Strings::normaliseLink($new_url), $uid)) {
 			return;
 		}
 
@@ -1804,7 +1830,7 @@ class Contact
 		}
 
 		// Update contact data for all users
-		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
+		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($old_url)];
 
 		$condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
 		DBA::update('contact', $fields, $condition);
@@ -1867,7 +1893,7 @@ class Contact
 			Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
 		}
 		DBA::close($duplicates);
-		Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
+		Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl, 'callstack' => System::callstack(20)]);
 		return true;
 	}
 
@@ -1914,6 +1940,15 @@ class Contact
 			return false;
 		}
 
+		if (!empty($ret['account-type']) && $ret['account-type'] == User::ACCOUNT_TYPE_DELETED) {
+			Logger::info('Deleted account', ['id' => $id, 'url' => $ret['url'], 'ret' => $ret]);
+			self::remove($id);
+
+			// Delete all contacts with the same URL
+			self::deleteContactByUrl($ret['url']);
+			return true;
+		}
+
 		$uid = $contact['uid'];
 		unset($contact['uid']);
 
@@ -1929,14 +1964,14 @@ class Contact
 		// 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'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+			self::updateContact($id, $uid, $contact['url'], $contact['url'], ['failed' => false, '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 ("feed" or "unkn")
-		if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
-			self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
+		if (($ret['network'] == Protocol::PHANTOM) || (($ret['network'] == Protocol::FEED) && ($ret['network'] != $contact['network']))) {
+			self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
 			return false;
 		}
 
@@ -1986,7 +2021,7 @@ class Contact
 		}
 
 		if (!$update) {
-			self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+			self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
 
 			if (Contact\Relation::isDiscoverable($ret['url'])) {
 				Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
@@ -2027,7 +2062,7 @@ class Contact
 
 		unset($ret['photo']);
 
-		self::updateContact($id, $uid, $ret['url'], $ret);
+		self::updateContact($id, $uid, $contact['url'], $ret['url'], $ret);
 
 		if (Contact\Relation::isDiscoverable($ret['url'])) {
 			Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
@@ -2486,12 +2521,12 @@ class Contact
 
 				Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
-				if (($user['notify-flags'] & Type::INTRO) &&
+				if (($user['notify-flags'] & Notification\Type::INTRO) &&
 					in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
 
 					notification([
-						'type'  => Type::INTRO,
-						'otype' => Notify\ObjectType::INTRO,
+						'type'  => Notification\Type::INTRO,
+						'otype' => Notification\ObjectType::INTRO,
 						'verb'  => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
 						'uid'   => $user['uid'],
 						'cid'   => $contact_record['id'],
@@ -2638,7 +2673,7 @@ class Contact
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function magicLinkbyId($cid, $url = '')
+	public static function magicLinkById($cid, $url = '')
 	{
 		$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
 
@@ -2672,14 +2707,10 @@ class Contact
 			return 'contact/' . $contact['id'] . '/conversations';
 		}
 
-		if ($contact['network'] != Protocol::DFRN) {
+		if (!empty($contact['network']) && $contact['network'] != Protocol::DFRN) {
 			return $destination;
 		}
 
-		if (!empty($contact['uid'])) {
-			return self::magicLink($contact['url'], $url);
-		}
-
 		if (empty($contact['id'])) {
 			return $destination;
 		}
@@ -2807,22 +2838,22 @@ class Contact
 	}
 
 	/**
-	 * Returns a random, global contact of the current node
+	 * Returns a random, global contact array of the current node
 	 *
-	 * @return string The profile URL
+	 * @return array The profile array
 	 * @throws Exception
 	 */
-	public static function getRandomUrl()
+	public static function getRandomContact()
 	{
-		$r = DBA::selectFirst('contact', ['url'], [
+		$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], [
 			"`uid` = ? AND `network` = ? AND NOT `failed` AND `last-item` > ?",
 			0, Protocol::DFRN, DateTimeFormat::utc('now - 1 month'),
 		], ['order' => ['RAND()']]);
 
-		if (DBA::isResult($r)) {
-			return $r['url'];
+		if (DBA::isResult($contact)) {
+			return $contact;
 		}
 
-		return '';
+		return [];
 	}
 }