X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=81b05559f7a5b1273e345f54ae85c0bb457db532;hb=d2c734c0256a2b6e8a5eef4422480edd820544b1;hp=35127ebfcc4488a00c4c920d7f2bb498a866ae9f;hpb=307af4a4fd3472d3c640b384eaa1097bb6357639;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 35127ebfcc..cacc3e4f1e 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -21,19 +21,19 @@
 
 namespace Friendica\Model;
 
-use DOMDocument;
-use DOMXPath;
 use Friendica\App\BaseURL;
 use Friendica\Content\Pager;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 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;
@@ -53,6 +53,10 @@ use Friendica\Util\Strings;
  */
 class Contact
 {
+	const DEFAULT_AVATAR_PHOTO = '/images/person-300.jpg';
+	const DEFAULT_AVATAR_THUMB = '/images/person-80.jpg';
+	const DEFAULT_AVATAR_MICRO = '/images/person-48.jpg';
+
 	/**
 	 * @deprecated since version 2019.03
 	 * @see User::PAGE_FLAGS_NORMAL
@@ -87,6 +91,8 @@ class Contact
 	 * @}
 	 */
 
+	const LOCK_INSERT = 'contact-insert';
+
 	/**
 	 * Account types
 	 *
@@ -124,6 +130,7 @@ class Contact
 	 * Relationship types
 	 * @{
 	 */
+	const NOTHING  = 0;
 	const FOLLOWER = 1;
 	const SHARING  = 2;
 	const FRIEND   = 3;
@@ -131,7 +138,12 @@ class Contact
 	 * @}
 	 */
 
-	/**
+	 const MIRROR_DEACTIVATED = 0;
+	 const MIRROR_FORWARDED = 1;
+	 const MIRROR_OWN_POST = 2;
+	 const MIRROR_NATIVE_RESHARE = 3;
+
+	 /**
 	 * @param array $fields    Array of selected fields, empty for all
 	 * @param array $condition Array of fields for condition
 	 * @param array $params    Array of several parameters
@@ -161,15 +173,23 @@ class Contact
 	 * Insert a row into the contact table
 	 * Important: You can't use DBA::lastInsertId() after this call since it will be set to 0.
 	 *
-	 * @param array        $fields              field array
-	 * @param bool         $on_duplicate_update Do an update on a duplicate entry
+	 * @param array $fields         field array
+	 * @param int   $duplicate_mode Do an update on a duplicate entry
 	 *
 	 * @return boolean was the insert successful?
 	 * @throws \Exception
 	 */
-	public static function insert(array $fields, bool $on_duplicate_update = false)
+	public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT)
 	{
-		$ret = DBA::insert('contact', $fields, $on_duplicate_update);
+		if (!empty($fields['baseurl']) && empty($fields['gsid'])) {
+			$fields['gsid'] = GServer::getID($fields['baseurl'], true);
+		}
+
+		if (empty($fields['created'])) {
+			$fields['created'] = DateTimeFormat::utcNow();
+		}
+
+		$ret = DBA::insert('contact', $fields, $duplicate_mode);
 		$contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => DBA::lastInsertId()]);
 		if (!DBA::isResult($contact)) {
 			// Shouldn't happen
@@ -220,7 +240,7 @@ class Contact
 		// Add internal fields
 		$removal = [];
 		if (!empty($fields)) {
-			foreach (['id', 'updated', 'network'] as $internal) {
+			foreach (['id', 'avatar', 'created', 'updated', 'last-update', 'success_update', 'failure_update', 'network'] as $internal) {
 				if (!in_array($internal, $fields)) {
 					$fields[] = $internal;
 					$removal[] = $internal;
@@ -250,9 +270,9 @@ class Contact
 		}
 
 		// Update the contact in the background if needed
-		if ((($contact['updated'] < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) &&
-			in_array($contact['network'], Protocol::FEDERATED)) {
-			Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], ($uid == 0 ? 'force' : ''));
+		$updated = max($contact['success_update'], $contact['created'], $contact['updated'], $contact['last-update'], $contact['failure_update']);
+		if (($updated < DateTimeFormat::utc('now -7 days')) && in_array($contact['network'], Protocol::FEDERATED)) {
+			Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']);
 		}
 
 		// Remove the internal fields
@@ -331,7 +351,7 @@ class Contact
 	 */
 	public static function isFollowerByURL($url, $uid)
 	{
-		$cid = self::getIdForURL($url, $uid, false);
+		$cid = self::getIdForURL($url, $uid);
 
 		if (empty($cid)) {
 			return false;
@@ -377,7 +397,7 @@ class Contact
 	 */
 	public static function isSharingByURL($url, $uid)
 	{
-		$cid = self::getIdForURL($url, $uid, false);
+		$cid = self::getIdForURL($url, $uid);
 
 		if (empty($cid)) {
 			return false;
@@ -410,7 +430,7 @@ class Contact
 		}
 
 		// Update the existing contact
-		self::updateFromProbe($contact['id'], '', true);
+		self::updateFromProbe($contact['id']);
 
 		// And fetch the result
 		$contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]);
@@ -472,7 +492,7 @@ class Contact
 		if (!DBA::isResult($self)) {
 			return false;
 		}
-		return self::getIdForURL($self['url'], 0, false);
+		return self::getIdForURL($self['url']);
 	}
 
 	/**
@@ -502,14 +522,14 @@ class Contact
 		}
 
 		if ($contact['uid'] != 0) {
-			$pcid = Contact::getIdForURL($contact['url'], 0, false, ['url' => $contact['url']]);
+			$pcid = self::getIdForURL($contact['url'], 0, false, ['url' => $contact['url']]);
 			if (empty($pcid)) {
 				return [];
 			}
 			$ucid = $contact['id'];
 		} else {
 			$pcid = $contact['id'];
-			$ucid = Contact::getIdForURL($contact['url'], $uid, false);
+			$ucid = self::getIdForURL($contact['url'], $uid);
 		}
 
 		return ['public' => $pcid, 'user' => $ucid];
@@ -551,7 +571,7 @@ class Contact
 			return true;
 		}
 
-		$user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
+		$user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]);
 		if (!DBA::isResult($user)) {
 			return false;
 		}
@@ -562,6 +582,8 @@ class Contact
 			'self'        => 1,
 			'name'        => $user['username'],
 			'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',
@@ -593,7 +615,7 @@ class Contact
 	 */
 	public static function updateSelfFromUserID($uid, $update_avatar = false)
 	{
-		$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar',
+		$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
 			'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
 			'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
 		$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
@@ -601,7 +623,7 @@ class Contact
 			return;
 		}
 
-		$fields = ['nickname', 'page-flags', 'account-type'];
+		$fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
 		$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
 		if (!DBA::isResult($user)) {
 			return;
@@ -619,8 +641,18 @@ class Contact
 		$fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
 			'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
 			'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
-			'contact-type' => $user['account-type'],
-			'xmpp' => $profile['xmpp']];
+			'contact-type' => $user['account-type'], 'prvkey' => $user['prvkey'],
+			'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp']];
+
+		// 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'];
+		$fields['nurl'] = Strings::normaliseLink($fields['url']);
+		$fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+		$fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname'];
+		$fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname'];
+		$fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname'];
+		$fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
+		$fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname'];
 
 		$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
 		if (DBA::isResult($avatar)) {
@@ -645,9 +677,9 @@ class Contact
 			$fields['micro'] = $prefix . '6' . $suffix;
 		} else {
 			// We hadn't found a photo entry, so we use the default avatar
-			$fields['photo'] = DI::baseUrl() . '/images/person-300.jpg';
-			$fields['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
-			$fields['micro'] = DI::baseUrl() . '/images/person-48.jpg';
+			$fields['photo'] = self::getDefaultAvatar($fields, Proxy::SIZE_SMALL);
+			$fields['thumb'] = self::getDefaultAvatar($fields, Proxy::SIZE_THUMB);
+			$fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO);
 		}
 
 		$fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
@@ -655,16 +687,6 @@ class Contact
 		$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
 		$fields['unsearchable'] = !$profile['net-publish'];
 
-		// 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'];
-		$fields['nurl'] = Strings::normaliseLink($fields['url']);
-		$fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
-		$fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname'];
-		$fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname'];
-		$fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname'];
-		$fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
-		$fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname'];
-
 		$update = false;
 
 		foreach ($fields as $field => $content) {
@@ -701,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;
 		}
 
@@ -745,7 +767,6 @@ class Contact
 			$item['title'] = '';
 			$item['guid'] = '';
 			$item['uri-id'] = 0;
-			$item['attach'] = '';
 			$slap = OStatus::salmon($item, $user);
 
 			if (!empty($contact['notify'])) {
@@ -787,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']) {
@@ -834,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];
@@ -845,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'];
@@ -884,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;
@@ -935,9 +958,9 @@ class Contact
 		$unfollow_link = '';
 		if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 			if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
-				$unfollow_link = 'unfollow?url=' . urlencode($contact['url']);
+				$unfollow_link = 'unfollow?url=' . urlencode($contact['url']) . '&auto=1';
 			} elseif(!$contact['pending']) {
-				$follow_link = 'follow?url=' . urlencode($contact['url']);
+				$follow_link = 'follow?url=' . urlencode($contact['url']) . '&auto=1';
 			}
 		}
 
@@ -994,86 +1017,6 @@ class Contact
 		return $menucondensed;
 	}
 
-	/**
-	 * 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
-	 * @param integer $cid Contact ID
-	 *
-	 * @return array Contact array in the "probe" structure
-	*/
-	private static function getProbeDataFromDatabase($url, $cid = null)
-	{
-		// The link could be provided as http although we stored it as https
-		$ssl_url = str_replace('http://', 'https://', $url);
-
-		$fields = ['id', 'uid', 'url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-			'photo', 'keywords', 'location', 'about', 'network',
-			'priority', 'batch', 'request', 'confirm', 'poco'];
-
-		if (!empty($cid)) {
-			$data = DBA::selectFirst('contact', $fields, ['id' => $cid]);
-			if (DBA::isResult($data)) {
-				return $data;
-			}
-		}
-
-		$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'];
-		$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 [];
-	}
-
 	/**
 	 * Fetch the contact id for a given URL and user
 	 *
@@ -1094,8 +1037,8 @@ class Contact
 	 *
 	 * @param string  $url       Contact URL
 	 * @param integer $uid       The user id for the contact (0 = public contact)
-	 * @param boolean $update    true = always update, false = never update, null = update when not found or outdated
-	 * @param array   $default   Default value for creating the contact when every else fails
+	 * @param boolean $update    true = always update, false = never update, null = update when not found
+	 * @param array   $default   Default value for creating the contact when everything else fails
 	 *
 	 * @return integer Contact ID
 	 * @throws HTTPException\InternalServerErrorException
@@ -1103,204 +1046,132 @@ class Contact
 	 */
 	public static function getIdForURL($url, $uid = 0, $update = null, $default = [])
 	{
-		Logger::info('Get contact data', ['url' => $url, 'user' => $uid]);
-
 		$contact_id = 0;
 
 		if ($url == '') {
+			Logger::notice('Empty url, quitting', ['url' => $url, 'user' => $uid, 'default' => $default]);
 			return 0;
 		}
 
-		$contact = self::getByURL($url, false, ['id', 'avatar', 'updated', 'network'], $uid);
+		$contact = self::getByURL($url, false, ['id', 'network'], $uid);
 
 		if (!empty($contact)) {
 			$contact_id = $contact["id"];
 
-			if (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
-				// Update public mail accounts via their user's accounts
-				$fields = ['network', 'addr', 'name', 'nick', 'avatar', 'photo', 'thumb', 'micro'];
-				$mailcontact = DBA::selectFirst('contact', $fields, ["`addr` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
-				if (!DBA::isResult($mailcontact)) {
-					$mailcontact = DBA::selectFirst('contact', $fields, ["`nurl` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
-				}
-
-				if (DBA::isResult($mailcontact)) {
-					DBA::update('contact', $mailcontact, ['id' => $contact_id]);
-				}
-			}
-
 			if (empty($update)) {
+				Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
 				return $contact_id;
 			}
 		} elseif ($uid != 0) {
-			// Non-existing user-specific contact, exiting
+			Logger::debug('Contact does not exist for the user', ['url' => $url, 'uid' => $uid, 'update' => $update]);
+			return 0;
+		} elseif (empty($default) && !is_null($update) && !$update) {
+			Logger::info('Contact not found, update not desired', ['url' => $url, 'uid' => $uid, 'update' => $update]);
 			return 0;
 		}
 
-		if (!$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 (!$update && !empty($default['network'])) {
-			// If there are default values, take these
-			$data = $default;
-			$background_update = false;
-		} else {
-			$data = [];
-			$background_update = false;
-		}
+		$data = [];
 
-		if ((empty($data) && is_null($update)) || $update) {
+		if (empty($default['network']) || $update) {
 			$data = Probe::uri($url, "", $uid);
-		}
 
-		// Take the default values when probing failed
-		if (!empty($default) && (empty($data['network']) || !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO])))) {
-			$data = array_merge($data, $default);
+			// 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);
+			}
+		} elseif (!empty($default['network'])) {
+			$data = $default;
 		}
 
-		if (empty($data['network']) || ($data['network'] == Protocol::PHANTOM)) {
-			Logger::info('No valid network found', ['url' => $url, 'data' => $data, 'callstack' => System::callstack(20)]);
-			return 0;
-		}
+		if (($uid == 0) && (empty($data['network']) || ($data['network'] == Protocol::PHANTOM))) {
+			// Fetch data for the public contact via the first found personal contact
+			/// @todo Check if this case can happen at all (possibly with mail accounts?)
+			$fields = ['name', 'nick', 'url', 'addr', 'alias', 'avatar', 'contact-type',
+				'keywords', 'location', 'about', 'unsearchable', 'batch', 'notify', 'poll',
+				'request', 'confirm', 'poco', 'subscribe', 'network', 'baseurl', 'gsid'];
 
-		if (!empty($data['baseurl'])) {
-			$data['baseurl'] = GServer::cleanURL($data['baseurl']);
-		}
+			$personal_contact = DBA::selectFirst('contact', $fields, ["`addr` = ? AND `uid` != 0", $url]);
+			if (!DBA::isResult($personal_contact)) {
+				$personal_contact = DBA::selectFirst('contact', $fields, ["`nurl` = ? AND `uid` != 0", Strings::normaliseLink($url)]);
+			}
 
-		if (!empty($data['baseurl']) && empty($data['gsid'])) {
-			$data['gsid'] = GServer::getID($data['baseurl']);
+			if (DBA::isResult($personal_contact)) {
+				Logger::info('Take contact data from personal contact', ['url' => $url, 'update' => $update, 'contact' => $personal_contact, 'callstack' => System::callstack(20)]);
+				$data = $personal_contact;
+				$data['photo'] = $personal_contact['avatar'];
+				$data['account-type'] = $personal_contact['contact-type'];
+				$data['hide'] = $personal_contact['unsearchable'];
+				unset($data['avatar']);
+				unset($data['contact-type']);
+				unset($data['unsearchable']);
+			}
 		}
 
-		if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url'])) {
-			$contact = self::getByURL($data['alias'], false, ['id']);
-			if (!empty($contact['id'])) {
-				$contact_id = $contact['id'];
-				Logger::info('Fetched id by alias', ['cid' => $contact_id, 'url' => $url, 'probed_url' => $data['url'], 'alias' => $data['alias']]);
-			}
+		if (empty($data['network']) || ($data['network'] == Protocol::PHANTOM)) {
+			Logger::notice('No valid network found', ['url' => $url, 'uid' => $uid, 'default' => $default, 'update' => $update, 'callstack' => System::callstack(20)]);
+			return 0;
 		}
 
-		// Possibly there is a contact entry with the probed URL
-		if (!$contact_id  && ($url != $data['url']) && ($url != $data['alias'])) {
-			$contact = self::getByURL($data['url'], false, ['id']);
+		if (!$contact_id) {
+			$urls = [Strings::normaliseLink($url), Strings::normaliseLink($data['url'])];
+			if (!empty($data['alias'])) {
+				$urls[] = Strings::normaliseLink($data['alias']);
+			}
+			$contact = self::selectFirst(['id'], ['nurl' => $urls, 'uid' => $uid]);
 			if (!empty($contact['id'])) {
 				$contact_id = $contact['id'];
-				Logger::info('Fetched id by url', ['cid' => $contact_id, 'url' => $url, 'probed_url' => $data['url'], 'alias' => $data['alias']]);
+				Logger::info('Fetched id by url', ['cid' => $contact_id, 'uid' => $uid, 'url' => $url, 'data' => $data]);
 			}
 		}
 
-		if ($uid == 0) {
-			$data['last-item'] = Probe::getLastUpdate($data);
-			Logger::info('Fetched last item', ['url' => $url, 'probed_url' => $data['url'], 'last-item' => $data['last-item'], 'callstack' => System::callstack(20)]);
-		}
-
 		if (!$contact_id) {
+			// We only insert the basic data. The rest will be done in "updateFromProbeArray"
 			$fields = [
 				'uid'       => $uid,
-				'created'   => DateTimeFormat::utcNow(),
 				'url'       => $data['url'],
 				'nurl'      => Strings::normaliseLink($data['url']),
-				'addr'      => $data['addr'] ?? '',
-				'alias'     => $data['alias'] ?? '',
-				'notify'    => $data['notify'] ?? '',
-				'poll'      => $data['poll'] ?? '',
-				'name'      => $data['name'] ?? '',
-				'nick'      => $data['nick'] ?? '',
-				'keywords'  => $data['keywords'] ?? '',
-				'location'  => $data['location'] ?? '',
-				'about'     => $data['about'] ?? '',
 				'network'   => $data['network'],
-				'pubkey'    => $data['pubkey'] ?? '',
+				'created'   => DateTimeFormat::utcNow(),
 				'rel'       => self::SHARING,
-				'priority'  => $data['priority'] ?? 0,
-				'batch'     => $data['batch'] ?? '',
-				'request'   => $data['request'] ?? '',
-				'confirm'   => $data['confirm'] ?? '',
-				'poco'      => $data['poco'] ?? '',
-				'baseurl'   => $data['baseurl'] ?? '',
-				'gsid'      => $data['gsid'] ?? null,
-				'name-date' => DateTimeFormat::utcNow(),
-				'uri-date'  => DateTimeFormat::utcNow(),
-				'avatar-date' => DateTimeFormat::utcNow(),
 				'writable'  => 1,
 				'blocked'   => 0,
 				'readonly'  => 0,
 				'pending'   => 0];
 
-			if (!empty($data['last-item'])) {
-				$fields['last-item'] = $data['last-item'];
-			}
-
 			$condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
 
 			// 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);
-
-				self::insert($fields);
-
-				// We intentionally aren't using lastInsertId here. There is a chance for duplicates.
+			if (DI::lock()->acquire(self::LOCK_INSERT, 0)) {
 				$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
-				if (!DBA::isResult($contact)) {
-					Logger::info('Contact creation failed', $fields);
-					// Shouldn't happen
-					return 0;
+				if (DBA::isResult($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();
+					if ($contact_id) {
+						Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
+					}
 				}
+				DI::lock()->release(self::LOCK_INSERT);
 			} else {
-				Logger::info('Contact had been created before', ['id' => $contact["id"], 'url' => $url, 'contact' => $fields]);
+				Logger::warning('Contact lock had not been acquired');
 			}
 
-			$contact_id = $contact["id"];
-		}
-
-		if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
-			self::updateAvatar($contact_id, $data['photo']);
-		}
-
-		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);
+			if (!$contact_id) {
+				Logger::info('Contact was not inserted', ['url' => $url, 'uid' => $uid]);
+				return 0;
 			}
 		} else {
-			$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid', 'last-item'];
-			$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
-
-			// This condition should always be true
-			if (!DBA::isResult($contact)) {
-				return $contact_id;
-			}
-
-			$updated = [
-				'url' => $data['url'],
-				'nurl' => Strings::normaliseLink($data['url']),
-				'updated' => DateTimeFormat::utcNow(),
-				'failed' => false
-			];
-
-			$fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl', 'gsid'];
-
-			foreach ($fields as $field) {
-				$updated[$field] = ($data[$field] ?? '') ?: $contact[$field];
-			}
-
-			if (!empty($data['last-item']) && ($contact['last-item'] < $data['last-item'])) {
-				$updated['last-item'] = $data['last-item'];
-			}
-
-			if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
-				$updated['uri-date'] = DateTimeFormat::utcNow();
-			}
+			Logger::info('Contact will be updated', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
+		}
 
-			if (($data['name'] != $contact['name']) || ($data['nick'] != $contact['nick'])) {
-				$updated['name-date'] = DateTimeFormat::utcNow();
-			}
+		self::updateFromProbeArray($contact_id, $data);
 
-			DBA::update('contact', $updated, ['id' => $contact_id], $contact);
+		// 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;
@@ -1402,25 +1273,27 @@ class Contact
 	 *
 	 * @param string $contact_url Contact URL
 	 * @param bool   $thread_mode
-	 * @param int    $update
+	 * @param int    $update      Update mode 
+	 * @param int    $parent      Item parent ID for the update mode
 	 * @return string posts in HTML
 	 * @throws \Exception
 	 */
-	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
+	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0)
 	{
-		return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update);
+		return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent);
 	}
 
 	/**
 	 * Returns posts from a given contact id
 	 *
-	 * @param integer $cid
-	 * @param bool    $thread_mode
-	 * @param integer $update
+	 * @param int  $cid         Contact ID
+	 * @param bool $thread_mode
+	 * @param int  $update      Update mode 
+	 * @param int  $parent     Item parent ID for the update mode
 	 * @return string posts in HTML
 	 * @throws \Exception
 	 */
-	public static function getPostsFromId($cid, $thread_mode = false, $update = 0)
+	public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0)
 	{
 		$a = DI::app();
 
@@ -1430,21 +1303,30 @@ 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');
 
 		if ($thread_mode) {
-			$condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
-				$cid, GRAVITY_PARENT, local_user()];
+			$condition = ["((`$contact_field` = ? AND `gravity` = ?) OR (`author-id` = ? AND `gravity` = ? AND `vid` = ?)) AND " . $sql,
+				$cid, GRAVITY_PARENT, $cid, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), local_user()];
 		} else {
 			$condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
 				$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
 		}
 
+		if (!empty($parent)) {
+			$condition = DBA::mergeConditions($condition, ['parent' => $parent]);
+		} else {
+			$last_received = isset($_GET['last_received']) ? DateTimeFormat::utc($_GET['last_received']) : '';
+			if (!empty($last_received)) {
+				$condition = DBA::mergeConditions($condition, ["`received` < ?", $last_received]);
+			}
+		}
+
 		if (DI::mode()->isMobile()) {
 			$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
 				DI::config()->get('system', 'itemspage_network_mobile'));
@@ -1455,25 +1337,31 @@ class Contact
 
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
-		$params = ['order' => ['received' => true],
-			'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+		$params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
-		if ($thread_mode) {
-			$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+			$o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+		} else {
+			$o = '';
+		}
 
-			$items = Item::inArray($r);
+		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 .= 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', false);
+			$o .= conversation($a, $items, 'contact-posts', $update);
 		}
 
 		if (!$update) {
-			$o .= $pager->renderMinimal(count($items));
+			if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+				$o .= HTML::scrollLoader();
+			} else {
+				$o .= $pager->renderMinimal(count($items));
+			}
 		}
 
 		return $o;
@@ -1585,24 +1473,28 @@ 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 $default Default path when no picture had been found
-	 * @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 $default, 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)) {
-			return $default;
+			$avatar = self::getDefaultAvatar([], $size);
 		}
 
 		if (Proxy::isLocalImage($avatar)) {
@@ -1615,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', DI::baseUrl() . '/images/person-300.jpg', 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', DI::baseUrl() . '/images/person-80.jpg', 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', DI::baseUrl() . '/images/person-48.jpg', 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 = [];
@@ -1668,7 +1564,7 @@ class Contact
 			}
 		}
 
-		if (!$update) {
+		if (!$update || $no_update) {
 			return $contact;
 		}
 
@@ -1684,33 +1580,88 @@ class Contact
 
 		/// add the default avatars if the fields aren't filled
 		if (isset($contact['photo']) && empty($contact['photo'])) {
-			$contact['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+			$contact['photo'] = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 		}
 		if (isset($contact['thumb']) && empty($contact['thumb'])) {
-			$contact['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+			$contact['thumb'] = self::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
 		}
 		if (isset($contact['micro']) && empty($contact['micro'])) {
-			$contact['micro'] = DI::baseUrl() . '/images/person-48.jpg';
+			$contact['micro'] = self::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
 		}
 
 		return $contact;
 	}
 
+	/**
+	 * Fetch the default avatar for the given contact and size
+	 *
+	 * @param array $contact  contact array
+	 * @param string $size    Size of the avatar picture
+	 * @return void
+	 */
+	public static function getDefaultAvatar(array $contact, string $size)
+	{
+		switch ($size) {
+			case Proxy::SIZE_MICRO:
+				$avatar['size'] = 48;
+				$default = self::DEFAULT_AVATAR_MICRO;
+				break;
+	
+			case Proxy::SIZE_THUMB:
+				$avatar['size'] = 80;
+				$default = self::DEFAULT_AVATAR_THUMB;
+				break;
+	
+			case Proxy::SIZE_SMALL:
+			default:
+				$avatar['size'] = 300;
+				$default = self::DEFAULT_AVATAR_PHOTO;
+				break;
+		}
+
+		if (!DI::config()->get('system', 'remote_avatar_lookup')) {
+			return DI::baseUrl() . $default;
+		}
+
+		if (!empty($contact['xmpp'])) {
+			$avatar['email'] = $contact['xmpp'];
+		} elseif (!empty($contact['addr'])) {
+			$avatar['email'] = $contact['addr'];
+		} elseif (!empty($contact['url'])) {
+			$avatar['email'] = $contact['url'];
+		} else {
+			return DI::baseUrl() . $default;
+		}
+
+		$avatar['url'] = '';
+		$avatar['success'] = false;
+
+		Hook::callAll('avatar_lookup', $avatar);
+
+		if ($avatar['success'] && !empty($avatar['url'])) {
+			return $avatar['url'];
+		}
+
+		return DI::baseUrl() . $default;
+	}
+
 	/**
 	 * Updates the avatar links in a contact only if needed
 	 *
-	 * @param int    $cid    Contact id
-	 * @param string $avatar Link to avatar picture
-	 * @param bool   $force  force picture update
+	 * @param int    $cid          Contact id
+	 * @param string $avatar       Link to avatar picture
+	 * @param bool   $force        force picture update
+	 * @param bool   $create_cache Enforces the creation of cached avatar fields
 	 *
 	 * @return void
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws HTTPException\NotFoundException
 	 * @throws \ImagickException
 	 */
-	public static function updateAvatar(int $cid, string $avatar, bool $force = false)
+	public static function updateAvatar(int $cid, string $avatar, bool $force = false, bool $create_cache = false)
 	{
-		$contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
+		$contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'xmpp', 'addr', 'nurl', 'url', 'network'],
+			['id' => $cid, 'self' => false]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
@@ -1718,7 +1669,7 @@ class Contact
 		$uid = $contact['uid'];
 
 		// Only update the cached photo links of public contacts when they already are cached
-		if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro'])) {
+		if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro']) && !$create_cache) {
 			if ($contact['avatar'] != $avatar) {
 				DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
 				Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
@@ -1726,35 +1677,109 @@ class Contact
 			return;
 		}
 
-		$data = [
-			$contact['photo'] ?? '',
-			$contact['thumb'] ?? '',
-			$contact['micro'] ?? '',
-		];
+		// 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);
+			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);
+				return;
+			}
+		}
 
-		$update = ($contact['avatar'] != $avatar) || $force;
+		$default_avatar = empty($avatar) || strpos($avatar, self::DEFAULT_AVATAR_PHOTO);
 
-		if (!$update) {
-			foreach ($data as $image_uri) {
-				$image_rid = Photo::ridFromURI($image_uri);
-				if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
-					Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
-					$update = true;
+		if ($default_avatar) {
+			$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+		}
+
+		if ($default_avatar && Proxy::isLocalImage($avatar)) {
+			$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
+				'photo' => $avatar,
+				'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
+				'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
+			Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
+		}
+
+		// Use the data from the self account
+		if (empty($fields)) {
+			$local_uid = User::getIdForURL($contact['url']);
+			if (!empty($local_uid)) {
+				$fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
+				Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+			}
+		}
+
+		if (empty($fields)) {
+			$update = ($contact['avatar'] != $avatar) || $force;
+
+			if (!$update) {
+				$data = [
+					$contact['photo'] ?? '',
+					$contact['thumb'] ?? '',
+					$contact['micro'] ?? '',
+				];
+		
+				foreach ($data as $image_uri) {
+					$image_rid = Photo::ridFromURI($image_uri);
+					if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+						Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+						$update = true;
+					}
+				}
+			}
+
+			if ($update) {
+				$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
+				if ($photos) {
+					$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
+					$update = !empty($fields);
+					Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+				} else {
+					$update = false;
 				}
 			}
+		} else {
+			$update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
 		}
 
-		if ($update) {
-			$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
-			if ($photos) {
-				$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
-				DBA::update('contact', $fields, ['id' => $cid]);
-			} elseif (empty($contact['avatar'])) {
-				// Ensure that the avatar field is set
-				DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);				
-				Logger::info('Failed profile import', ['id' => $cid, 'force' => $force, 'avatar' => $avatar, 'contact' => $contact]);
+		if (!$update) {
+			return;
+		}
+
+		$cids = [];
+		$uids = [];
+		if (($uid == 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+			// Collect all user contacts of the given public contact
+			$personal_contacts = DBA::select('contact', ['id', 'uid'],
+				["`nurl` = ? AND `id` != ? AND NOT `self`", $contact['nurl'], $cid]);
+			while ($personal_contact = DBA::fetch($personal_contacts)) {
+				$cids[] = $personal_contact['id'];
+				$uids[] = $personal_contact['uid'];
+			}
+			DBA::close($personal_contacts);
+
+			if (!empty($cids)) {
+				// Delete possibly existing cached user contact avatars
+				Photo::delete(['uid' => $uids, 'contact-id' => $cids, 'album' => Photo::CONTACT_PHOTOS]);
 			}
 		}
+
+		$cids[] = $cid;
+		$uids[] = $uid;
+		Logger::info('Updating cached contact avatars', ['cid' => $cids, 'uid' => $uids, 'fields' => $fields]);
+		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']);
+		}
 	}
 
 	/**
@@ -1762,54 +1787,68 @@ class 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) || ($uid != 0)) {
+		if (self::removeDuplicates(Strings::normaliseLink($new_url), $uid)) {
 			return;
 		}
 
-		// 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.
+		// Archive or unarchive the contact.
 		$contact = DBA::selectFirst('contact', [], ['id' => $id]);
 		if (!DBA::isResult($contact)) {
 			Logger::info('Couldn\'t select contact for archival.', ['id' => $id]);
 			return;
 		}
 
-		if (!empty($fields['success_update'])) {
-			self::unmarkForArchival($contact);
-		} elseif (!empty($fields['failure_update'])) {
-			self::markForArchival($contact);
+		if (isset($fields['failed'])) {
+			if ($fields['failed']) {
+				self::markForArchival($contact);
+			} else {
+				self::unmarkForArchival($contact);
+			}
+		}
+
+		if ($contact['uid'] != 0) {
+			return;
 		}
 
-		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), 'network' => Protocol::FEDERATED];
+		// Update contact data for all users
+		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($old_url)];
 
-		// These contacts are sharing with us, we don't poll them.
-		// This means that we don't set the update fields in "OnePoll.php".
-		$condition['rel'] = self::SHARING;
+		$condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
 		DBA::update('contact', $fields, $condition);
 
-		unset($fields['last-update']);
-		unset($fields['success_update']);
-		unset($fields['failure_update']);
+		// We mustn't set the update fields for OStatus contacts since they are updated in OnePoll
+		$condition['network'] = Protocol::OSTATUS;
+
+		// If the contact failed, propagate the update fields to all contacts
+		if (empty($fields['failed'])) {
+			unset($fields['last-update']);
+			unset($fields['success_update']);
+			unset($fields['failure_update']);
+		}
 
 		if (empty($fields)) {
 			return;
 		}
 
-		// We are polling these contacts, so we mustn't set the update fields here.
-		$condition['rel'] = [self::FOLLOWER, self::FRIEND];
 		DBA::update('contact', $fields, $condition);
 	}
 
@@ -1854,19 +1893,36 @@ 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;
 	}
 
 	/**
 	 * @param integer $id      contact id
 	 * @param string  $network Optional network we are probing for
-	 * @param boolean $force   Optional forcing of network probing (otherwise we use the cached data)
 	 * @return boolean
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function updateFromProbe(int $id, string $network = '', bool $force = false)
+	public static function updateFromProbe(int $id, string $network = '')
+	{
+		$contact = DBA::selectFirst('contact', ['uid', 'url'], ['id' => $id]);
+		if (!DBA::isResult($contact)) {
+			return false;
+		}
+
+		$ret = Probe::uri($contact['url'], $network, $contact['uid']);
+		return self::updateFromProbeArray($id, $ret);
+	}
+
+	/**
+	 * @param integer $id      contact id
+	 * @param array   $ret     Probed data
+	 * @return boolean
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function updateFromProbeArray(int $id, array $ret)
 	{
 		/*
 		  Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
@@ -1876,14 +1932,23 @@ class Contact
 		// These fields aren't updated by this routine:
 		// 'xmpp', 'sensitive'
 
-		$fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
+		$fields = ['uid', 'avatar', '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'];
+			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
 		if (!DBA::isResult($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']);
 
@@ -1893,31 +1958,23 @@ class Contact
 		$contact['photo'] = $contact['avatar'];
 		unset($contact['avatar']);
 
-		$ret = Probe::uri($contact['url'], $network, $uid, !$force);
-
 		$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'], ['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'])) {
-			if ($force && ($uid == 0)) {
-				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;
 		}
 
-		if (Contact\Relation::isDiscoverable($ret['url'])) {
-			Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
-		}
-
 		if (isset($ret['hide']) && is_bool($ret['hide'])) {
 			$ret['unsearchable'] = $ret['hide'];
 		}
@@ -1926,16 +1983,18 @@ class Contact
 			$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'];
-				}
+			if (($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && isset($ret['manually-approve'])) {
+				$ret['forum'] = (bool)!$ret['manually-approve'];
+				$ret['prv'] = (bool)!$ret['forum'];
 			}
 		}
 
-		$new_pubkey = $ret['pubkey'];
+		$new_pubkey = $ret['pubkey'] ?? '';
+
+		if ($uid == 0) {
+			$ret['last-item'] = Probe::getLastUpdate($ret);
+			Logger::info('Fetched last item', ['id' => $id, 'probed_url' => $ret['url'], 'last-item' => $ret['last-item'], 'callstack' => System::callstack(20)]);
+		}
 
 		$update = false;
 
@@ -1951,18 +2010,29 @@ class Contact
 			}
 		}
 
+		if (!empty($ret['last-item']) && ($contact['last-item'] < $ret['last-item'])) {
+			$update = true;
+		} else {
+			unset($ret['last-item']);
+		}
+
 		if (!empty($ret['photo']) && ($ret['network'] != Protocol::FEED)) {
-			self::updateAvatar($id, $ret['photo'], $update || $force);
+			self::updateAvatar($id, $ret['photo'], $update);
 		}
 
 		if (!$update) {
-			if ($force) {
-				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']);
+			}
+	
 			// Update the public contact
 			if ($uid != 0) {
-				self::updateFromProbeByURL($ret['url']);
+				$contact = self::getByURL($ret['url'], false, ['id']);
+				if (!empty($contact['id'])) {
+					self::updateFromProbeArray($contact['id'], $ret);
+				}
 			}
 
 			return true;
@@ -1970,13 +2040,14 @@ class Contact
 
 		$ret['nurl'] = Strings::normaliseLink($ret['url']);
 		$ret['updated'] = $updated;
+		$ret['failed'] = false;
 
 		// 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']))) {
+		if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
 			$ret['uri-date'] = DateTimeFormat::utcNow();
 		}
 
@@ -1984,20 +2055,29 @@ class Contact
 			$ret['name-date'] = $updated;
 		}
 
-		if ($force && ($uid == 0)) {
+		if (($uid == 0) || in_array($ret['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
 			$ret['last-update'] = $updated;
 			$ret['success_update'] = $updated;
-			$ret['failed'] = false;
 		}
 
 		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']);
+		}
 
 		return true;
 	}
 
-	public static function updateFromProbeByURL($url, $force = false)
+	/**
+	 * @param integer $url contact url
+	 * @return integer Contact id
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public static function updateFromProbeByURL($url)
 	{
 		$id = self::getIdForURL($url);
 
@@ -2005,7 +2085,7 @@ class Contact
 			return $id;
 		}
 
-		self::updateFromProbe($id, '', $force);
+		self::updateFromProbe($id);
 
 		return $id;
 	}
@@ -2101,7 +2181,7 @@ class Contact
 		if (!empty($arr['contact']['name'])) {
 			$ret = $arr['contact'];
 		} else {
-			$ret = Probe::uri($url, $network, $user['uid'], false);
+			$ret = Probe::uri($url, $network, $user['uid']);
 		}
 
 		if (($network != '') && ($ret['network'] != $network)) {
@@ -2146,7 +2226,7 @@ class Contact
 		}
 
 		// do we have enough information?
-		if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
+		if (empty($protocol) || ($protocol == Protocol::PHANTOM) || (empty($ret['url']) && empty($ret['addr']))) {
 			$result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL;
 			if (empty($ret['poll'])) {
 				$result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
@@ -2180,11 +2260,8 @@ class Contact
 		$hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
 
 		$pending = false;
-		if ($protocol == Protocol::ACTIVITYPUB) {
-			$apcontact = APContact::getByURL($ret['url'], false);
-			if (isset($apcontact['manually-approve'])) {
-				$pending = (bool)$apcontact['manually-approve'];
-			}
+		if (($protocol == Protocol::ACTIVITYPUB) && isset($ret['manually-approve'])) {
+			$pending = (bool)$ret['manually-approve'];
 		}
 
 		if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
@@ -2245,8 +2322,11 @@ class Contact
 		self::updateAvatar($contact_id, $ret['photo']);
 
 		// pull feed and consume it, which should subscribe to the hub.
-
-		Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
+		if ($contact['network'] == Protocol::OSTATUS) {
+			Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
+		} else {
+			Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
+		}
 
 		$owner = User::getOwnerDataById($user['uid']);
 
@@ -2261,7 +2341,6 @@ class Contact
 				$item['title'] = '';
 				$item['guid'] = '';
 				$item['uri-id'] = 0;
-				$item['attach'] = '';
 
 				$slap = OStatus::salmon($item, $owner);
 
@@ -2392,7 +2471,7 @@ class Contact
 			}
 
 			// Ensure to always have the correct network type, independent from the connection request method
-			self::updateFromProbe($contact['id'], '', true);
+			self::updateFromProbe($contact['id']);
 
 			return true;
 		} else {
@@ -2421,7 +2500,7 @@ class Contact
 			$contact_id = DBA::lastInsertId();
 
 			// Ensure to always have the correct network type, independent from the connection request method
-			self::updateFromProbe($contact_id, '', true);
+			self::updateFromProbe($contact_id);
 
 			self::updateAvatar($contact_id, $photo, true);
 
@@ -2442,22 +2521,16 @@ 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,
-						'notify_flags' => $user['notify-flags'],
-						'language'     => $user['language'],
-						'to_name'      => $user['username'],
-						'to_email'     => $user['email'],
-						'uid'          => $user['uid'],
-						'link'         => DI::baseUrl() . '/notifications/intros',
-						'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : DI::l10n()->t('[Name Withheld]')),
-						'source_link'  => $contact_record['url'],
-						'source_photo' => $contact_record['photo'],
-						'verb'         => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
-						'otype'        => 'intro'
+						'type'  => Notification\Type::INTRO,
+						'otype' => Notification\ObjectType::INTRO,
+						'verb'  => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
+						'uid'   => $user['uid'],
+						'cid'   => $contact_record['id'],
+						'link'  => DI::baseUrl() . '/notifications/intros',
 					]);
 				}
 			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
@@ -2468,7 +2541,7 @@ class Contact
 				$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
 				$fields = ['pending' => false];
 				if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) {
-					$fields['rel'] = Contact::FRIEND;
+					$fields['rel'] = self::FRIEND;
 				}
 
 				DBA::update('contact', $fields, $condition);
@@ -2485,7 +2558,7 @@ class Contact
 		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
 			DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
 		} else {
-			Contact::remove($contact['id']);
+			self::remove($contact['id']);
 		}
 	}
 
@@ -2494,7 +2567,7 @@ class Contact
 		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) {
 			DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]);
 		} else {
-			Contact::remove($contact['id']);
+			self::remove($contact['id']);
 		}
 	}
 
@@ -2515,8 +2588,8 @@ class Contact
 			AND NOT `contact`.`blocked`
 			AND NOT `contact`.`archive`
 			AND NOT `contact`.`deleted`',
-			Contact::SHARING,
-			Contact::FRIEND
+			self::SHARING,
+			self::FRIEND
 		];
 
 		$contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
@@ -2551,7 +2624,7 @@ class Contact
 			return [];
 		}
 
-		$contacts = Contact::selectToArray(['id'], [
+		$contacts = self::selectToArray(['id'], [
 			'id'      => $contact_ids,
 			'blocked' => false,
 			'pending' => false,
@@ -2579,15 +2652,15 @@ class Contact
 			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
 		}
 
-		$data = self::getProbeDataFromDatabase($contact_url);
-		if (empty($data)) {
+		$contact = self::getByURL($contact_url, false);
+		if (empty($contact)) {
 			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
 		}
 
 		// Prevents endless loop in case only a non-public contact exists for the contact URL
-		unset($data['uid']);
+		unset($contact['uid']);
 
-		return self::magicLinkByContact($data, $url ?: $contact_url);
+		return self::magicLinkByContact($contact, $url ?: $contact_url);
 	}
 
 	/**
@@ -2600,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]);
 
@@ -2621,7 +2694,7 @@ class Contact
 	{
 		$destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
 
-		if (!Session::isAuthenticated() || ($contact['network'] != Protocol::DFRN)) {
+		if (!Session::isAuthenticated()) {
 			return $destination;
 		}
 
@@ -2630,8 +2703,12 @@ class Contact
 			return $url;
 		}
 
-		if (!empty($contact['uid'])) {
-			return self::magicLink($contact['url'], $url);
+		if (DI::pConfig()->get(local_user(), 'system', 'stay_local') && ($url == '')) {
+			return 'contact/' . $contact['id'] . '/conversations';
+		}
+
+		if (!empty($contact['network']) && $contact['network'] != Protocol::DFRN) {
+			return $destination;
 		}
 
 		if (empty($contact['id'])) {
@@ -2711,7 +2788,7 @@ class Contact
 
 		// check if we search only communities or every contact
 		if ($mode === 'community') {
-			$extra_sql = sprintf(' AND `contact-type` = %d', Contact::TYPE_COMMUNITY);
+			$extra_sql = sprintf(' AND `contact-type` = %d', self::TYPE_COMMUNITY);
 		} else {
 			$extra_sql = '';
 		}
@@ -2740,40 +2817,43 @@ class Contact
 	{
 		$added = 0;
 		$updated = 0;
+		$unchanged = 0;
 		$count = 0;
 
 		foreach ($urls as $url) {
-			$contact = Contact::getByURL($url, false, ['id']); 
+			$contact = self::getByURL($url, false, ['id', 'updated']);
 			if (empty($contact['id'])) {
 				Worker::add(PRIORITY_LOW, 'AddContact', 0, $url);
 				++$added;
-			} else {
+			} elseif ($contact['updated'] < DateTimeFormat::utc('now -7 days')) {
 				Worker::add(PRIORITY_LOW, 'UpdateContact', $contact['id']);
 				++$updated;
+			} else {
+				++$unchanged;
 			}
 			++$count;
 		}
 
-		return ['count' => $count, 'added' => $added, 'updated' => $updated];
+		return ['count' => $count, 'added' => $added, 'updated' => $updated, 'unchanged' => $unchanged];
 	}
 
 	/**
-	 * 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 [];
 	}
 }