X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=18e041ab9849c1f18611f925b81e0e534deef8f1;hb=ea6f7aba40e4a99661d6fb4d4367e2762a27306e;hp=0184861c3c2d8403750bb075d5c69a03781cd43c;hpb=e0fdde32878216e1c291386e7d3931ac0de5c807;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 0184861c3c..18e041ab98 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -38,7 +38,6 @@ use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
@@ -134,6 +133,7 @@ class Contact
 	const FOLLOWER = 1;
 	const SHARING  = 2;
 	const FRIEND   = 3;
+	const SELF     = 4;
 	/**
 	 * @}
 	 */
@@ -176,7 +176,7 @@ class Contact
 	 * @param array $fields         field array
 	 * @param int   $duplicate_mode Do an update on a duplicate entry
 	 *
-	 * @return boolean was the insert successful?
+	 * @return int  id of the created contact
 	 * @throws \Exception
 	 */
 	public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT)
@@ -191,15 +191,40 @@ class Contact
 			$fields['created'] = DateTimeFormat::utcNow();
 		}
 
-		$ret = DBA::insert('contact', $fields, $duplicate_mode);
-		$contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => DBA::lastInsertId()]);
+		DBA::insert('contact', $fields, $duplicate_mode);
+		$contact = DBA::selectFirst('contact', [], ['id' => DBA::lastInsertId()]);
 		if (!DBA::isResult($contact)) {
 			// Shouldn't happen
-			return $ret;
+			Logger::warning('Created contact could not be found', ['fields' => $fields]);
+			return 0;
 		}
 
+		Contact\User::insertForContactArray($contact);
+
 		// Search for duplicated contacts and get rid of them
-		self::removeDuplicates($contact['nurl'], $contact['uid']);
+		if (!$contact['self']) {
+			self::removeDuplicates($contact['nurl'], $contact['uid']);
+		}
+
+		return $contact['id'];
+	}
+
+	/**
+	 * Updates rows in the contact table
+	 *
+	 * @param array         $fields     contains the fields that are updated
+	 * @param array         $condition  condition array with the key values
+	 * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields)
+	 *
+	 * @return boolean was the update successfull?
+	 * @throws \Exception
+	 */
+	public static function update(array $fields, array $condition, $old_fields = [])
+	{
+		$ret = DBA::update('contact', $fields, $condition, $old_fields);
+
+		// Apply changes to the "user-contact" table on dedicated fields
+		Contact\User::updateByContactUpdate($fields, $condition);
 
 		return $ret;
 	}
@@ -332,7 +357,7 @@ class Contact
 			return false;
 		}
 
-		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		$cdata = self::getPublicAndUserContactID($cid, $uid);
 		if (empty($cdata['user'])) {
 			return false;
 		}
@@ -378,7 +403,7 @@ class Contact
 			return false;
 		}
 
-		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		$cdata = self::getPublicAndUserContactID($cid, $uid);
 		if (empty($cdata['user'])) {
 			return false;
 		}
@@ -454,6 +479,11 @@ class Contact
 	 */
 	public static function isLocal($url)
 	{
+		if (!parse_url($url, PHP_URL_SCHEME)) {
+			$addr_parts = explode('@', $url);
+			return (count($addr_parts) == 2) && ($addr_parts[1] == DI::baseUrl()->getHostname());
+		}
+
 		return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl());
 	}
 
@@ -507,7 +537,48 @@ class Contact
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getPublicAndUserContacID($cid, $uid)
+	public static function getPublicAndUserContactID($cid, $uid)
+	{
+		// We have to use the legacy function as long as the post update hasn't finished
+		if (DI::config()->get('system', 'post_update_version') < 1427) {
+			return self::legacyGetPublicAndUserContactID($cid, $uid);
+		}
+
+		if (empty($uid) || empty($cid)) {
+			return [];
+		}
+
+		$contact = DBA::selectFirst('account-user-view', ['id', 'uid', 'pid'], ['id' => $cid]);
+		if (!DBA::isResult($contact) || !in_array($contact['uid'], [0, $uid])) {
+			return [];
+		}
+
+		$pcid = $contact['pid'];
+		if ($contact['uid'] == $uid) {
+			$ucid = $contact['id'];
+		} else {
+			$contact = DBA::selectFirst('account-user-view', ['id', 'uid'], ['pid' => $cid, 'uid' => $uid]);
+			if (DBA::isResult($contact)) {
+				$ucid = $contact['id'];
+			} else {
+				$ucid = 0;
+			}
+		}
+
+		return ['public' => $pcid, 'user' => $ucid];
+	}
+
+	/**
+	 * Helper function for "getPublicAndUserContactID"
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return array with public and user's contact id
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function legacyGetPublicAndUserContactID($cid, $uid)
 	{
 		if (empty($uid) || empty($cid)) {
 			return [];
@@ -582,9 +653,9 @@ class Contact
 			'nick'        => $user['nickname'],
 			'pubkey'      => $user['pubkey'],
 			'prvkey'      => $user['prvkey'],
-			'photo'       => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
-			'thumb'       => DI::baseUrl() . '/photo/avatar/'  . $user['uid'] . '.jpg',
-			'micro'       => DI::baseUrl() . '/photo/micro/'   . $user['uid'] . '.jpg',
+			'photo'       => User::getAvatarUrlForId($user['uid']),
+			'thumb'       => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_THUMB),
+			'micro'       => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_MICRO),
 			'blocked'     => 0,
 			'pending'     => 0,
 			'url'         => DI::baseUrl() . '/profile/' . $user['nickname'],
@@ -605,7 +676,7 @@ class Contact
 
 		// Only create the entry if it doesn't exist yet
 		if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
-			$return = DBA::insert('contact', $contact);
+			$return = (bool)self::insert($contact);
 		}
 
 		// Create the public contact
@@ -614,7 +685,7 @@ class Contact
 			$contact['uid']    = 0;
 			$contact['prvkey'] = null;
 
-			DBA::insert('contact', $contact, Database::INSERT_IGNORE);
+			self::insert($contact, Database::INSERT_IGNORE);
 		}
 
 		return $return;
@@ -631,7 +702,7 @@ class Contact
 	public static function updateSelfFromUserID($uid, $update_avatar = false)
 	{
 		$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
-			'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
+			'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
 			'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
 		$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
 		if (!DBA::isResult($self)) {
@@ -645,7 +716,7 @@ class Contact
 		}
 
 		$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
-			'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
+			'country-name', 'pub_keywords', 'xmpp', 'matrix', 'net-publish'];
 		$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
 		if (!DBA::isResult($profile)) {
 			return false;
@@ -657,7 +728,7 @@ class Contact
 			'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
 			'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
 			'contact-type' => $user['account-type'], 'prvkey' => $user['prvkey'],
-			'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp'], 'network' => Protocol::DFRN];
+			'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp'], 'matrix' => $profile['matrix'], 'network' => Protocol::DFRN];
 
 		// it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
 		$fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname'];
@@ -697,7 +768,7 @@ class Contact
 			$fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO);
 		}
 
-		$fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
+		$fields['avatar'] = User::getAvatarUrlForId($uid);
 		$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
 		$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
 		$fields['unsearchable'] = !$profile['net-publish'];
@@ -715,16 +786,19 @@ class Contact
 				$fields['name-date'] = DateTimeFormat::utcNow();
 			}
 			$fields['updated'] = DateTimeFormat::utcNow();
-			DBA::update('contact', $fields, ['id' => $self['id']]);
+			self::update($fields, ['id' => $self['id']]);
 
 			// Update the public contact as well
 			$fields['prvkey'] = null;
 			$fields['self']   = false;
-			DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+			self::update($fields, ['uid' => 0, 'nurl' => $self['nurl']]);
 
 			// Update the profile
-			$fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
-				'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+			$fields = [
+				'photo' => User::getAvatarUrlForId($uid),
+				'thumb' => User::getAvatarUrlForId($uid, Proxy::SIZE_THUMB)
+			];
+
 			DBA::update('profile', $fields, ['uid' => $uid]);
 		}
 
@@ -735,7 +809,6 @@ class Contact
 	 * Marks a contact for removal
 	 *
 	 * @param int $id contact id
-	 * @return null
 	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public static function remove($id)
@@ -747,61 +820,69 @@ class Contact
 		}
 
 		// Archive the contact
-		DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
+		self::update(['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
 
 		// Delete it in the background
 		Worker::add(PRIORITY_MEDIUM, 'RemoveContact', $id);
 	}
 
 	/**
-	 * Sends an unfriend message. Does not remove the contact
+	 * Sends an unfriend message. Removes the contact for two-way unfriending or sharing only protocols (feed an mail)
+	 *
+	 * @param array   $user    User unfriending
+	 * @param array   $contact Contact (uid != 0) unfriended
+	 * @param boolean $two_way Revoke eventual inbound follow as well
+	 * @return bool|null true if successful, false if not, null if no action was performed
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public static function terminateFriendship(array $user, array $contact): bool
+	{
+		$result = Protocol::terminateFriendship($user, $contact);
+
+		if ($contact['rel'] == Contact::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+			self::remove($contact['id']);
+		} else {
+			self::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Revoke follow privileges of the remote user contact
 	 *
-	 * @param array   $user     User unfriending
 	 * @param array   $contact  Contact unfriended
-	 * @param boolean $dissolve Remove the contact on the remote side
-	 * @return void
+	 * @return bool|null Whether the remote operation is successful or null if no remote operation was performed
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
+	public static function revokeFollow(array $contact): bool
 	{
 		if (empty($contact['network'])) {
-			return;
+			throw new \InvalidArgumentException('Empty network in contact array');
 		}
 
-		$protocol = $contact['network'];
-		if (($protocol == Protocol::DFRN) && !self::isLegacyDFRNContact($contact)) {
-			$protocol = Protocol::ACTIVITYPUB;
+		if (empty($contact['uid'])) {
+			throw new \InvalidArgumentException('Unexpected public contact record');
 		}
 
-		if (($protocol == Protocol::DFRN) && $dissolve) {
-			DFRN::deliver($user, $contact, 'placeholder', true);
-		} elseif (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
-			// create an unfollow slap
-			$item = [];
-			$item['verb'] = Activity::O_UNFOLLOW;
-			$item['gravity'] = GRAVITY_ACTIVITY;
-			$item['follow'] = $contact["url"];
-			$item['body'] = '';
-			$item['title'] = '';
-			$item['guid'] = '';
-			$item['uri-id'] = 0;
-			$slap = OStatus::salmon($item, $user);
+		$result = Protocol::revokeFollow($contact);
 
-			if (!empty($contact['notify'])) {
-				Salmon::slapper($user, $contact['notify'], $slap);
-			}
-		} elseif ($protocol == Protocol::DIASPORA) {
-			Diaspora::sendUnshare($user, $contact);
-		} elseif ($protocol == Protocol::ACTIVITYPUB) {
-			ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
-
-			if ($dissolve) {
-				ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
+		// A null value here means the remote network doesn't support explicit follow revocation, we can still
+		// break the locally recorded relationship
+		if ($result !== false) {
+			if ($contact['rel'] == self::FRIEND) {
+				self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
+			} else {
+				self::remove($contact['id']);
 			}
 		}
+
+		return $result;
 	}
 
+
 	/**
 	 * Marks a contact for archival after a communication issue delay
 	 *
@@ -835,8 +916,8 @@ class Contact
 		}
 
 		if ($contact['term-date'] <= DBA::NULL_DATETIME) {
-			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', Strings::normaliseLink($contact['url']), DBA::NULL_DATETIME]);
+			self::update(['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+			self::update(['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', Strings::normaliseLink($contact['url']), DBA::NULL_DATETIME]);
 		} else {
 			/* @todo
 			 * We really should send a notification to the owner after 2-3 weeks
@@ -853,8 +934,8 @@ class Contact
 				 * delete, though if the owner tries to unarchive them we'll start
 				 * the whole process over again.
 				 */
-				DBA::update('contact', ['archive' => true], ['id' => $contact['id']]);
-				DBA::update('contact', ['archive' => true], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
+				self::update(['archive' => true], ['id' => $contact['id']]);
+				self::update(['archive' => true], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
 			}
 		}
 	}
@@ -875,7 +956,7 @@ class Contact
 			$fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
 			$condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
 			if (!DBA::exists('contact', array_merge($condition, $fields))) {
-				DBA::update('contact', $fields, $condition);
+				self::update($fields, $condition);
 			}
 		}
 
@@ -899,8 +980,8 @@ class Contact
 
 		// It's a miracle. Our dead contact has inexplicably come back to life.
 		$fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
-		DBA::update('contact', $fields, ['id' => $contact['id']]);
-		DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
+		self::update($fields, ['id' => $contact['id']]);
+		self::update($fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
 	}
 
 	/**
@@ -917,7 +998,6 @@ class Contact
 		$pm_url = '';
 		$status_link = '';
 		$photos_link = '';
-		$contact_drop_link = '';
 		$poke_link = '';
 
 		if ($uid == 0) {
@@ -969,13 +1049,9 @@ class Contact
 
 		$posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
 
-		if (!$contact['self']) {
-			$contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
-		}
-
 		$follow_link = '';
 		$unfollow_link = '';
-		if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+		if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
 			if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
 				$unfollow_link = 'unfollow?url=' . urlencode($contact['url']) . '&auto=1';
 			} elseif(!$contact['pending']) {
@@ -983,10 +1059,6 @@ class Contact
 			}
 		}
 
-		if (!empty($follow_link) || !empty($unfollow_link)) {
-			$contact_drop_link = '';
-		}
-
 		/**
 		 * Menu array:
 		 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
@@ -1006,7 +1078,6 @@ class Contact
 				'photos'  => [DI::l10n()->t('View Photos')   , $photos_link      , true],
 				'network' => [DI::l10n()->t('Network Posts') , $posts_link       , false],
 				'edit'    => [DI::l10n()->t('View Contact')  , $contact_url      , false],
-				'drop'    => [DI::l10n()->t('Drop Contact')  , $contact_drop_link, false],
 				'pm'      => [DI::l10n()->t('Send PM')       , $pm_url           , false],
 				'poke'    => [DI::l10n()->t('Poke')          , $poke_link        , false],
 				'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link      , true],
@@ -1166,8 +1237,7 @@ class Contact
 					$contact_id = $contact['id'];
 					Logger::notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
 				} else {
-					DBA::insert('contact', $fields);
-					$contact_id = DBA::lastInsertId();
+					$contact_id = self::insert($fields);
 					if ($contact_id) {
 						Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
 					}
@@ -1294,12 +1364,13 @@ class Contact
 	 * @param bool   $thread_mode
 	 * @param int    $update      Update mode
 	 * @param int    $parent      Item parent ID for the update mode
+	 * @param bool   $only_media  Only display media content
 	 * @return string posts in HTML
 	 * @throws \Exception
 	 */
-	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0)
+	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0, bool $only_media = false)
 	{
-		return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent);
+		return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent, $only_media);
 	}
 
 	/**
@@ -1308,14 +1379,13 @@ class Contact
 	 * @param int  $cid         Contact ID
 	 * @param bool $thread_mode
 	 * @param int  $update      Update mode
-	 * @param int  $parent     Item parent ID for the update mode
+	 * @param int  $parent      Item parent ID for the update mode
+	 * @param bool $only_media  Only display media content
 	 * @return string posts in HTML
 	 * @throws \Exception
 	 */
-	public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0)
+	public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0, bool $only_media = false)
 	{
-		$a = DI::app();
-
 		$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
 		if (!DBA::isResult($contact)) {
 			return '';
@@ -1346,6 +1416,11 @@ class Contact
 			}
 		}
 
+		if ($only_media) {
+			$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+				Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]);
+		}
+
 		if (DI::mode()->isMobile()) {
 			$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
 				DI::config()->get('system', 'itemspage_network_mobile'));
@@ -1368,11 +1443,11 @@ class Contact
 		if ($thread_mode) {
 			$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());
+			$o .= DI::conversation()->create($items, 'contacts', $update, false, 'commented', local_user());
 		} else {
 			$items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
 
-			$o .= conversation($a, $items, 'contact-posts', $update);
+			$o .= DI::conversation()->create($items, 'contact-posts', $update);
 		}
 
 		if (!$update) {
@@ -1449,7 +1524,7 @@ class Contact
 	 */
 	public static function block($cid, $reason = null)
 	{
-		$return = DBA::update('contact', ['blocked' => true, 'block_reason' => $reason], ['id' => $cid]);
+		$return = self::update(['blocked' => true, 'block_reason' => $reason], ['id' => $cid]);
 
 		return $return;
 	}
@@ -1463,7 +1538,7 @@ class Contact
 	 */
 	public static function unblock($cid)
 	{
-		$return = DBA::update('contact', ['blocked' => false, 'block_reason' => null], ['id' => $cid]);
+		$return = self::update(['blocked' => false, 'block_reason' => null], ['id' => $cid]);
 
 		return $return;
 	}
@@ -1693,7 +1768,7 @@ class Contact
 	{
 		$condition = ["`nurl` = ? AND ((`uid` = ? AND `network` IN (?, ?)) OR `uid` = ?)",
 			Strings::normaliseLink($url), $uid, Protocol::FEED, Protocol::MAIL, 0];
-		$contact = self::selectFirst(['id', 'updated'], $condition);
+		$contact = self::selectFirst(['id', 'updated'], $condition, ['order' => ['uid' => true]]);
 		return self::getAvatarUrlForId($contact['id'] ?? 0, $size, $contact['updated'] ?? '');
 	}
 
@@ -1762,7 +1837,7 @@ class Contact
 		// Only update the cached photo links of public contacts when they already are cached
 		if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro']) && !$create_cache) {
 			if ($contact['avatar'] != $avatar) {
-				DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
+				self::update(['avatar' => $avatar], ['id' => $cid]);
 				Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
 			}
 			return;
@@ -1770,7 +1845,7 @@ class Contact
 
 		// User contacts use are updated through the public contacts
 		if (($uid != 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
-			$pcid = self::getIdForURL($contact['url'], false);
+			$pcid = self::getIdForURL($contact['url'], 0, false);
 			if (!empty($pcid)) {
 				Logger::debug('Update the private contact via the public contact', ['id' => $cid, 'uid' => $uid, 'public' => $pcid]);
 				self::updateAvatar($pcid, $avatar, $force, true);
@@ -1859,7 +1934,7 @@ class Contact
 		$cids[] = $cid;
 		$uids[] = $uid;
 		Logger::info('Updating cached contact avatars', ['cid' => $cids, 'uid' => $uids, 'fields' => $fields]);
-		DBA::update('contact', $fields, ['id' => $cids]);
+		self::update($fields, ['id' => $cids]);
 	}
 
 	public static function deleteContactByUrl(string $url)
@@ -1886,12 +1961,7 @@ class Contact
 	 */
 	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]);
-			return;
-		}
-
-		if (!DBA::update('contact', $fields, ['id' => $id])) {
+		if (!self::update($fields, ['id' => $id])) {
 			Logger::info('Couldn\'t update contact.', ['id' => $id, 'fields' => $fields]);
 			return;
 		}
@@ -1924,7 +1994,7 @@ class Contact
 		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($old_url)];
 
 		$condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
-		DBA::update('contact', $fields, $condition);
+		self::update($fields, $condition);
 
 		// We mustn't set the update fields for OStatus contacts since they are updated in OnePoll
 		$condition['network'] = Protocol::OSTATUS;
@@ -1940,7 +2010,7 @@ class Contact
 			return;
 		}
 
-		DBA::update('contact', $fields, $condition);
+		self::update($fields, $condition);
 	}
 
 	/**
@@ -1953,7 +2023,7 @@ class Contact
 	 */
 	public static function removeDuplicates(string $nurl, int $uid)
 	{
-		$condition = ['nurl' => $nurl, 'uid' => $uid, 'deleted' => false, 'network' => Protocol::FEDERATED];
+		$condition = ['nurl' => $nurl, 'uid' => $uid, 'self' => false, 'deleted' => false, 'network' => Protocol::FEDERATED];
 		$count = DBA::count('contact', $condition);
 		if ($count <= 1) {
 			return false;
@@ -2021,11 +2091,11 @@ class Contact
 		 */
 
 		// These fields aren't updated by this routine:
-		// 'xmpp', 'sensitive'
+		// 'sensitive'
 
 		$fields = ['uid', 'uri-id', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
 			'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
-			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item'];
+			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
 		if (!DBA::isResult($contact)) {
 			return false;
@@ -2063,6 +2133,12 @@ class Contact
 
 		$updated = DateTimeFormat::utcNow();
 
+		if (Strings::normaliseLink($contact['url']) != Strings::normaliseLink($ret['url'])) {
+			Logger::notice('New URL differs from old URL', ['id' => $id, 'uid' => $uid, 'old' => $contact['url'], 'new' => $ret['url']]);
+			self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
+			return false;
+		}
+
 		// 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) &&
@@ -2079,7 +2155,7 @@ class Contact
 		}
 
 		if (Strings::normaliseLink($ret['url']) != Strings::normaliseLink($contact['url'])) {
-			$cid = self::getIdForURL($ret['url']);
+			$cid = self::getIdForURL($ret['url'], 0, false);
 			if (!empty($cid) && ($cid != $id)) {
 				Logger::notice('URL of contact changed.', ['id' => $id, 'new_id' => $cid, 'old' => $contact['url'], 'new' => $ret['url']]);
 				return self::updateFromProbeArray($cid, $ret);
@@ -2170,10 +2246,10 @@ class Contact
 		}
 
 		if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
-			$ret['uri-date'] = DateTimeFormat::utcNow();
+			$ret['uri-date'] = $updated;
 		}
 
-		if (($ret['name'] != $contact['name']) || ($ret['nick'] != $contact['nick'])) {
+		if ((!empty($ret['name']) && ($ret['name'] != $contact['name'])) || (!empty($ret['nick']) && ($ret['nick'] != $contact['nick']))) {
 			$ret['name-date'] = $updated;
 		}
 
@@ -2208,7 +2284,7 @@ class Contact
 			}
 		}
 		if (!empty($fields)) {
-			DBA::update('contact', $fields, ['id' => $id, 'self' => false]);
+			self::update($fields, ['id' => $id, 'self' => false]);
 			Logger::info('Updating local contact', ['id' => $id]);
 		}
 	}
@@ -2232,18 +2308,6 @@ class Contact
 		return $id;
 	}
 
-	/**
-	 * Detects if a given contact array belongs to a legacy DFRN connection
-	 *
-	 * @param array $contact
-	 * @return boolean
-	 */
-	public static function isLegacyDFRNContact($contact)
-	{
-		// Newer Friendica contacts are connected via AP, then these fields aren't set
-		return !empty($contact['dfrn-id']) || !empty($contact['issued-id']);
-	}
-
 	/**
 	 * Detects the communication protocol for a given contact url.
 	 * This is used to detect Friendica contacts that we can communicate via AP.
@@ -2280,16 +2344,15 @@ class Contact
 	 *
 	 * Takes a $uid and a url/handle and adds a new contact
 	 *
-	 * @param array  $user        The user the contact should be created for
+	 * @param int    $uid         The user id the contact should be created for
 	 * @param string $url         The profile URL of the contact
-	 * @param bool   $interactive
 	 * @param string $network
 	 * @return array
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws HTTPException\NotFoundException
 	 * @throws \ImagickException
 	 */
-	public static function createFromProbe(array $user, $url, $interactive = false, $network = '')
+	public static function createFromProbeForUser(int $uid, $url, $network = '')
 	{
 		$result = ['cid' => -1, 'success' => false, 'message' => ''];
 
@@ -2324,8 +2387,8 @@ class Contact
 			$probed = false;
 			$ret = $arr['contact'];
 		} else {
-			$probed = true;			
-			$ret = Probe::uri($url, $network, $user['uid']);
+			$probed = true;
+			$ret = Probe::uri($url, $network, $uid);
 		}
 
 		if (($network != '') && ($ret['network'] != $network)) {
@@ -2337,33 +2400,15 @@ class Contact
 		// the poll url is more reliable than the profile url, as we may have
 		// indirect links or webfinger links
 
-		$condition = ['uid' => $user['uid'], 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+		$condition = ['uid' => $uid, 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
 		$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
 		if (!DBA::isResult($contact)) {
-			$condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
+			$condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
 			$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
 		}
 
 		$protocol = self::getProtocol($ret['url'], $ret['network']);
 
-		if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
-			if ($interactive) {
-				if (strlen(DI::baseUrl()->getUrlPath())) {
-					$myaddr = bin2hex(DI::baseUrl() . '/profile/' . $user['nickname']);
-				} else {
-					$myaddr = bin2hex($user['nickname'] . '@' . DI::baseUrl()->getHostname());
-				}
-
-				DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr");
-
-				// NOTREACHED
-			}
-		} elseif (DI::config()->get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
-			$result['message'] = DI::l10n()->t('This site is not configured to allow communications with other networks.') . EOL;
-			$result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
-			return $result;
-		}
-
 		// This extra param just confuses things, remove it
 		if ($protocol === Protocol::DIASPORA) {
 			$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
@@ -2417,13 +2462,13 @@ class Contact
 			$new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
 
 			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
-			DBA::update('contact', $fields, ['id' => $contact['id']]);
+			self::update($fields, ['id' => $contact['id']]);
 		} else {
 			$new_relation = (in_array($protocol, [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
 
 			// create contact record
 			self::insert([
-				'uid'     => $user['uid'],
+				'uid'     => $uid,
 				'created' => DateTimeFormat::utcNow(),
 				'url'     => $ret['url'],
 				'nurl'    => Strings::normaliseLink($ret['url']),
@@ -2451,7 +2496,7 @@ class Contact
 			]);
 		}
 
-		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $user['uid']]);
+		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
 		if (!DBA::isResult($contact)) {
 			$result['message'] .= DI::l10n()->t('Unable to retrieve contact information.') . EOL;
 			return $result;
@@ -2460,7 +2505,7 @@ class Contact
 		$contact_id = $contact['id'];
 		$result['cid'] = $contact_id;
 
-		Group::addMember(User::getDefaultGroup($user['uid'], $contact["network"]), $contact_id);
+		Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
 
 		// Update the avatar
 		self::updateAvatar($contact_id, $ret['photo']);
@@ -2476,7 +2521,7 @@ class Contact
 			Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
 		}
 
-		$owner = User::getOwnerDataById($user['uid']);
+		$owner = User::getOwnerDataById($uid);
 
 		if (DBA::isResult($owner)) {
 			if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
@@ -2505,7 +2550,7 @@ class Contact
 					return false;
 				}
 
-				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $user['uid'], $activity_id);
+				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
 				Logger::log('Follow returns: ' . $ret);
 			}
 		}
@@ -2550,7 +2595,7 @@ class Contact
 			$fields = ['url' => $contact['url'], 'request' => $contact['request'],
 					'notify' => $contact['notify'], 'poll' => $contact['poll'],
 					'confirm' => $contact['confirm'], 'poco' => $contact['poco']];
-			DBA::update('contact', $fields, ['id' => $contact['id']]);
+			self::update($fields, ['id' => $contact['id']]);
 		}
 
 		return $contact;
@@ -2566,14 +2611,9 @@ class Contact
 	 */
 	public static function follow(int $cid, int $uid)
 	{
-		$user = User::getById($uid);
-		if (empty($user)) {
-			return false;
-		}
-
 		$contact = self::getById($cid, ['url']);
 
-		$result = self::createFromProbe($user, $contact['url'], false);
+		$result = self::createFromProbeForUser($uid, $contact['url']);
 
 		return $result['cid'];
 	}
@@ -2588,7 +2628,7 @@ class Contact
 	 */
 	public static function unfollow(int $cid, int $uid)
 	{
-		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		$cdata = self::getPublicAndUserContactID($cid, $uid);
 		if (empty($cdata['user'])) {
 			return false;
 		}
@@ -2658,14 +2698,14 @@ class Contact
 
 			if (($contact['rel'] == self::SHARING)
 				|| ($sharing && $contact['rel'] == self::FOLLOWER)) {
-				DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true, 'pending' => false],
+				self::update(['rel' => self::FRIEND, 'writable' => true, 'pending' => false],
 						['id' => $contact['id'], 'uid' => $importer['uid']]);
 			}
 
 			// Ensure to always have the correct network type, independent from the connection request method
 			self::updateFromProbe($contact['id']);
 
-			Post\UserNotification::insertNotication($contact['id'], Verb::getID(Activity::FOLLOW), $importer['uid']);
+			Post\UserNotification::insertNotification($contact['id'], Verb::getID(Activity::FOLLOW), $importer['uid']);
 
 			return true;
 		} else {
@@ -2676,7 +2716,7 @@ class Contact
 			}
 
 			// create contact record
-			DBA::insert('contact', [
+			$contact_id = self::insert([
 				'uid'      => $importer['uid'],
 				'created'  => DateTimeFormat::utcNow(),
 				'url'      => $url,
@@ -2691,14 +2731,12 @@ class Contact
 				'writable' => 1,
 			]);
 
-			$contact_id = DBA::lastInsertId();
-
 			// Ensure to always have the correct network type, independent from the connection request method
 			self::updateFromProbe($contact_id);
 
 			self::updateAvatar($contact_id, $photo, true);
 
-			Post\UserNotification::insertNotication($contact_id, Verb::getID(Activity::FOLLOW), $importer['uid']);
+			Post\UserNotification::insertNotification($contact_id, Verb::getID(Activity::FOLLOW), $importer['uid']);
 
 			$contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
 
@@ -2731,7 +2769,7 @@ class Contact
 				}
 			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
 				if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) {
-					self::createFromProbe($importer, $url, false, $network);
+					self::createFromProbeForUser($importer['uid'], $url, $network);
 				}
 
 				$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
@@ -2740,7 +2778,7 @@ class Contact
 					$fields['rel'] = self::FRIEND;
 				}
 
-				DBA::update('contact', $fields, $condition);
+				self::update($fields, $condition);
 
 				return true;
 			}
@@ -2749,19 +2787,21 @@ class Contact
 		return null;
 	}
 
-	public static function removeFollower($importer, $contact)
+	public static function removeFollower(array $contact)
 	{
-		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
+		if (in_array($contact['rel'] ?? [], [self::FRIEND, self::SHARING])) {
 			DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
-		} else {
+		} elseif (!empty($contact['id'])) {
 			self::remove($contact['id']);
+		} else {
+			DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact, 'callstack' => System::callstack()]);
 		}
 	}
 
 	public static function removeSharer($importer, $contact)
 	{
 		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) {
-			DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]);
+			self::update(['rel' => self::FOLLOWER], ['id' => $contact['id']]);
 		} else {
 			self::remove($contact['id']);
 		}