X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=27ac3d33e1fec3669d71e66ef00177022879906a;hb=e17db489eee549f47c39c9b5494063476ed4aeb0;hp=47b2a8b1e614eaeee98af9070a0fa0d4135cc3f2;hpb=a2ca14def48485b44cec701ae255838253196538;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 47b2a8b1e6..27ac3d33e1 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -22,6 +22,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
+use Friendica\Util\BaseURL;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -109,6 +110,20 @@ class Contact extends BaseObject
 	 * @}
 	 */
 
+	/**
+	 * @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
+	 * @return array
+	 * @throws \Exception
+	 */
+	public static function select(array $fields = [], array $condition = [], array $params = [])
+	{
+		$statement = DBA::select('contact', $fields, $condition, $params);
+
+		return DBA::toArray($statement);
+	}
+
 	/**
 	 * @param  integer       $id
 	 * @return array|boolean Contact record if it exists, false otherwise
@@ -222,6 +237,28 @@ class Contact extends BaseObject
 		return ['public' => $pcid, 'user' => $ucid];
 	}
 
+	/**
+	 * Returns contact details for a given contact id in combination with a user id
+	 *
+	 * @param int $cid A contact ID
+	 * @param int $uid The User ID
+	 * @param array $fields The selected fields for the contact
+	 *
+	 * @return array The contact details
+	 *
+	 * @throws \Exception
+	 */
+	public static function getContactForUser($cid, $uid, array $fields = [])
+	{
+		$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => $uid]);
+
+		if (!DBA::isResult($contact)) {
+			return [];
+		} else {
+			return $contact;
+		}
+	}
+
 	/**
 	 * @brief Block contact id for user id
 	 *
@@ -599,7 +636,10 @@ class Contact extends BaseObject
 		}
 
 		if ($update) {
-			$fields['name-date'] = DateTimeFormat::utcNow();
+			if ($fields['name'] != $self['name']) {
+				$fields['name-date'] = DateTimeFormat::utcNow();
+			}
+			$fields['updated'] = DateTimeFormat::utcNow();
 			DBA::update('contact', $fields, ['id' => $self['id']]);
 
 			// Update the public contact as well
@@ -649,9 +689,15 @@ class Contact extends BaseObject
 		if (empty($contact['network'])) {
 			return;
 		}
-		if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+
+		$protocol = $contact['network'];
+		if (($protocol == Protocol::DFRN) && !self::isLegacyDFRNContact($contact)) {
+			$protocol = Protocol::ACTIVITYPUB;
+		}
+
+		if (($protocol == Protocol::DFRN) && $dissolve) {
 			DFRN::deliver($user, $contact, 'placeholder', true);
-		} elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+		} elseif (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
 			// create an unfollow slap
 			$item = [];
 			$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
@@ -666,9 +712,9 @@ class Contact extends BaseObject
 			if (!empty($contact['notify'])) {
 				Salmon::slapper($user, $contact['notify'], $slap);
 			}
-		} elseif ($contact['network'] == Protocol::DIASPORA) {
+		} elseif ($protocol == Protocol::DIASPORA) {
 			Diaspora::sendUnshare($user, $contact);
-		} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+		} elseif ($protocol == Protocol::ACTIVITYPUB) {
 			ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
 
 			if ($dissolve) {
@@ -1118,11 +1164,12 @@ class Contact extends BaseObject
 	 * 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 string  $url Contact URL
+	 * @param integer $cid Contact ID
 	 *
 	 * @return array Contact array in the "probe" structure
 	*/
-	private static function getProbeDataFromDatabase($url)
+	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);
@@ -1130,9 +1177,17 @@ class Contact extends BaseObject
 		$fields = ['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($contact)) {
+		if (!DBA::isResult($data)) {
 			$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
 			$data = DBA::selectFirst('contact', $fields, $condition);
 		}
@@ -1147,7 +1202,7 @@ class Contact extends BaseObject
 			'photo', 'keywords', 'location', 'about', 'network'];
 		$data = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
 
-		if (!DBA::isResult($contact)) {
+		if (!DBA::isResult($data)) {
 			$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
 			$data = DBA::selectFirst('contact', $fields, $condition);
 		}
@@ -1172,7 +1227,7 @@ class Contact extends BaseObject
 			'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
 		$data = DBA::selectFirst('fcontact', $fields, ['url' => $url]);
 
-		if (!DBA::isResult($contact)) {
+		if (!DBA::isResult($data)) {
 			$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
 			$data = DBA::selectFirst('contact', $fields, $condition);
 		}
@@ -1229,11 +1284,11 @@ class Contact extends BaseObject
 
 		/// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
 		// We first try the nurl (http://server.tld/nick), most common case
-		$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
+		$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
 
 		// Then the addr (nick@server.tld)
 		if (!DBA::isResult($contact)) {
-			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
+			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
 		}
 
 		// Then the alias (which could be anything)
@@ -1241,20 +1296,25 @@ class Contact extends BaseObject
 			// The link could be provided as http although we stored it as https
 			$ssl_url = str_replace('http://', 'https://', $url);
 			$condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
-			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
+			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], $condition);
 		}
 
 		if (DBA::isResult($contact)) {
 			$contact_id = $contact["id"];
 
 			// Update the contact every 7 days
-			$update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
+			$update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days'));
 
 			// We force the update if the avatar is empty
 			if (empty($contact['avatar'])) {
 				$update_contact = true;
 			}
 
+			// Update the contact in the background if needed but it is called by the frontend
+			if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+				Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
+			}
+
 			if (!$update_contact || $no_update) {
 				return $contact_id;
 			}
@@ -1265,7 +1325,7 @@ class Contact extends BaseObject
 
 		// When we don't want to update, we look if we know this contact in any way
 		if ($no_update && empty($default)) {
-			$data = self::getProbeDataFromDatabase($url);
+			$data = self::getProbeDataFromDatabase($url, $contact_id);
 			$background_update = true;
 		} else {
 			$data = [];
@@ -1287,20 +1347,19 @@ class Contact extends BaseObject
 				return 0;
 			}
 
-			if (!empty($default)) {
-				$contact = $default;
-			} else {
-				$contact = self::getProbeDataFromDatabase($url);
-			}
-
-			if (!empty($contact)) {
+			$contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default);
+			if (empty($contact)) {
 				return 0;
-			} else {
-				$data = array_merge($data, $contact);
 			}
+
+			$data = array_merge($data, $contact);
+		}
+
+		if (empty($data)) {
+			return 0;
 		}
 
-		if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
+		if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
 			$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
 		}
 
@@ -1308,26 +1367,26 @@ class Contact extends BaseObject
 			$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"],
-				'photo'     => $data["photo"],
-				'keywords'  => $data["keywords"],
-				'location'  => $data["location"],
-				'about'     => $data["about"],
-				'network'   => $data["network"],
-				'pubkey'    => $data["pubkey"],
+				'url'       => $data['url'],
+				'nurl'      => Strings::normaliseLink($data['url']),
+				'addr'      => defaults($data, 'addr', ''),
+				'alias'     => defaults($data, 'alias', ''),
+				'notify'    => defaults($data, 'notify', ''),
+				'poll'      => defaults($data, 'poll', ''),
+				'name'      => defaults($data, 'name', ''),
+				'nick'      => defaults($data, 'nick', ''),
+				'photo'     => defaults($data, 'photo', ''),
+				'keywords'  => defaults($data, 'keywords', ''),
+				'location'  => defaults($data, 'location', ''),
+				'about'     => defaults($data, 'about', ''),
+				'network'   => $data['network'],
+				'pubkey'    => defaults($data, 'pubkey', ''),
 				'rel'       => self::SHARING,
-				'priority'  => $data["priority"],
-				'batch'     => $data["batch"],
-				'request'   => $data["request"],
-				'confirm'   => $data["confirm"],
-				'poco'      => $data["poco"],
+				'priority'  => defaults($data, 'priority', 0),
+				'batch'     => defaults($data, 'batch', ''),
+				'request'   => defaults($data, 'request', ''),
+				'confirm'   => defaults($data, 'confirm', ''),
+				'poco'      => defaults($data, 'poco', ''),
 				'name-date' => DateTimeFormat::utcNow(),
 				'uri-date'  => DateTimeFormat::utcNow(),
 				'avatar-date' => DateTimeFormat::utcNow(),
@@ -1357,13 +1416,13 @@ class Contact extends BaseObject
 			$gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => Strings::normaliseLink($data["url"])]);
 			if (DBA::isResult($gcontact)) {
 				// Only use the information when the probing hadn't fetched these values
-				if ($data['keywords'] != '') {
+				if (!empty($data['keywords'])) {
 					unset($gcontact['keywords']);
 				}
-				if ($data['location'] != '') {
+				if (!empty($data['location'])) {
 					unset($gcontact['location']);
 				}
-				if ($data['about'] != '') {
+				if (!empty($data['about'])) {
 					unset($gcontact['about']);
 				}
 				DBA::update('contact', $gcontact, ['id' => $contact_id]);
@@ -1377,7 +1436,9 @@ class Contact extends BaseObject
 			}
 		}
 
-		self::updateAvatar($data["photo"], $uid, $contact_id);
+		if (!empty($data['photo'])) {
+			self::updateAvatar($data['photo'], $uid, $contact_id);
+		}
 
 		$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
@@ -1388,36 +1449,36 @@ class Contact extends BaseObject
 		}
 
 		$updated = ['addr' => $data['addr'],
-			'alias' => $data['alias'],
+			'alias' => defaults($data, 'alias', ''),
 			'url' => $data['url'],
 			'nurl' => Strings::normaliseLink($data['url']),
 			'name' => $data['name'],
 			'nick' => $data['nick']];
 
-		if ($data['keywords'] != '') {
+		if (!empty($data['keywords'])) {
 			$updated['keywords'] = $data['keywords'];
 		}
-		if ($data['location'] != '') {
+		if (!empty($data['location'])) {
 			$updated['location'] = $data['location'];
 		}
 
 		// Update the technical stuff as well - if filled
-		if ($data['notify'] != '') {
+		if (!empty($data['notify'])) {
 			$updated['notify'] = $data['notify'];
 		}
-		if ($data['poll'] != '') {
+		if (!empty($data['poll'])) {
 			$updated['poll'] = $data['poll'];
 		}
-		if ($data['batch'] != '') {
+		if (!empty($data['batch'])) {
 			$updated['batch'] = $data['batch'];
 		}
-		if ($data['request'] != '') {
+		if (!empty($data['request'])) {
 			$updated['request'] = $data['request'];
 		}
-		if ($data['confirm'] != '') {
+		if (!empty($data['confirm'])) {
 			$updated['confirm'] = $data['confirm'];
 		}
-		if ($data['poco'] != '') {
+		if (!empty($data['poco'])) {
 			$updated['poco'] = $data['poco'];
 		}
 
@@ -1426,14 +1487,14 @@ class Contact extends BaseObject
 			$updated['pubkey'] = $data['pubkey'];
 		}
 
-		if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
+		if (($data['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
 			$updated['uri-date'] = DateTimeFormat::utcNow();
 		}
 		if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
 			$updated['name-date'] = DateTimeFormat::utcNow();
 		}
 
-		$updated['avatar-date'] = DateTimeFormat::utcNow();
+		$updated['updated'] = DateTimeFormat::utcNow();
 
 		DBA::update('contact', $updated, ['id' => $contact_id], $contact);
 
@@ -1710,7 +1771,11 @@ class Contact extends BaseObject
 		$ret = Probe::uri($contact['url'], $network, $uid, !$force);
 
 		// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
-		if ((in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM])) && ($ret['network'] != $contact['network'])) {
+		if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
+			return false;
+		}
+
+		if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT)) {
 			return false;
 		}
 
@@ -1732,6 +1797,7 @@ class Contact extends BaseObject
 		}
 
 		$ret['nurl'] = Strings::normaliseLink($ret['url']);
+		$ret['updated'] = DateTimeFormat::utcNow();
 
 		self::updateAvatar($ret['photo'], $uid, $id, true);
 
@@ -1744,6 +1810,40 @@ class Contact extends BaseObject
 		return true;
 	}
 
+	/**
+	 * 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.
+	 *
+	 * @param string $url contact url
+	 * @param string $network Network of that contact
+	 * @return string with protocol
+	 */
+	public static function getProtocol($url, $network)
+	{
+		if ($network != Protocol::DFRN) {
+			return $network;
+		}
+
+		$apcontact = APContact::getByURL($url);
+		if (!empty($apcontact) && !empty($apcontact['generator'])) {
+			return Protocol::ACTIVITYPUB;
+		} else {
+			return $network;
+		}
+	}
+
 	/**
 	 * Takes a $uid and a url/handle and adds a new contact
 	 * Currently if the contact is DFRN, interactive needs to be true, to redirect to the
@@ -1819,7 +1919,9 @@ class Contact extends BaseObject
 			$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
 		}
 
-		if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) {
+		$protocol = self::getProtocol($url, $ret['network']);
+
+		if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
 			if ($interactive) {
 				if (strlen($a->getURLPath())) {
 					$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
@@ -1838,7 +1940,7 @@ class Contact extends BaseObject
 		}
 
 		// This extra param just confuses things, remove it
-		if ($ret['network'] === Protocol::DIASPORA) {
+		if ($protocol === Protocol::DIASPORA) {
 			$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
 		}
 
@@ -1861,7 +1963,7 @@ class Contact extends BaseObject
 			return $result;
 		}
 
-		if ($ret['network'] === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
+		if ($protocol === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
 			$result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
 			$ret['notify'] = '';
 		}
@@ -1870,15 +1972,15 @@ class Contact extends BaseObject
 			$result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
 		}
 
-		$writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
+		$writeable = ((($protocol === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
 
-		$subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false);
+		$subhub = (($protocol === Protocol::OSTATUS) ? true : false);
 
-		$hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
+		$hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
 
-		$pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]);
+		$pending = in_array($protocol, [Protocol::ACTIVITYPUB]);
 
-		if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
+		if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
 			$writeable = 1;
 		}
 
@@ -1889,7 +1991,7 @@ class Contact extends BaseObject
 			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
 			DBA::update('contact', $fields, ['id' => $contact['id']]);
 		} else {
-			$new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
+			$new_relation = (in_array($protocol, [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
 
 			// create contact record
 			DBA::insert('contact', [
@@ -1906,6 +2008,7 @@ class Contact extends BaseObject
 				'name'    => $ret['name'],
 				'nick'    => $ret['nick'],
 				'network' => $ret['network'],
+				'protocol' => $protocol,
 				'pubkey'  => $ret['pubkey'],
 				'rel'     => $new_relation,
 				'priority'=> $ret['priority'],
@@ -1939,7 +2042,7 @@ class Contact extends BaseObject
 		$owner = User::getOwnerDataById($uid);
 
 		if (DBA::isResult($owner)) {
-			if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+			if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
 				// create a follow slap
 				$item = [];
 				$item['verb'] = ACTIVITY_FOLLOW;
@@ -1955,10 +2058,10 @@ class Contact extends BaseObject
 				if (!empty($contact['notify'])) {
 					Salmon::slapper($owner, $contact['notify'], $slap);
 				}
-			} elseif ($contact['network'] == Protocol::DIASPORA) {
+			} elseif ($protocol == Protocol::DIASPORA) {
 				$ret = Diaspora::sendShare($a->user, $contact);
 				Logger::log('share returns: ' . $ret);
-			} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+			} elseif ($protocol == Protocol::ACTIVITYPUB) {
 				$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
 				if (empty($activity_id)) {
 					// This really should never happen
@@ -1986,7 +2089,7 @@ class Contact extends BaseObject
 	public static function updateSslPolicy(array $contact, $new_policy)
 	{
 		$ssl_changed = false;
-		if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
+		if ((intval($new_policy) == BaseURL::SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
 			$ssl_changed = true;
 			$contact['url']     = 	str_replace('https:', 'http:', $contact['url']);
 			$contact['request'] = 	str_replace('https:', 'http:', $contact['request']);
@@ -1996,7 +2099,7 @@ class Contact extends BaseObject
 			$contact['poco']    = 	str_replace('https:', 'http:', $contact['poco']);
 		}
 
-		if ((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
+		if ((intval($new_policy) == BaseURL::SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
 			$ssl_changed = true;
 			$contact['url']     = 	str_replace('http:', 'https:', $contact['url']);
 			$contact['request'] = 	str_replace('http:', 'https:', $contact['request']);
@@ -2016,7 +2119,7 @@ class Contact extends BaseObject
 		return $contact;
 	}
 
-	public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) {
+	public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false, $note = '') {
 		// Should always be set
 		if (empty($datarray['author-id'])) {
 			return;
@@ -2036,18 +2139,25 @@ class Contact extends BaseObject
 		$network = $pub_contact['network'];
 
 		if (is_array($contact)) {
+			// Make sure that the existing contact isn't archived
+			self::unmarkForArchival($contact);
+
+			$protocol = self::getProtocol($url, $contact['network']);
+
 			if (($contact['rel'] == self::SHARING)
 				|| ($sharing && $contact['rel'] == self::FOLLOWER)) {
-				DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
+				DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true, 'pending' => false],
 						['id' => $contact['id'], 'uid' => $importer['uid']]);
 			}
 
-			if ($contact['network'] == Protocol::ACTIVITYPUB) {
+			if ($protocol == Protocol::ACTIVITYPUB) {
 				ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
 			}
 
 			// send email notification to owner?
 		} else {
+			$protocol = self::getProtocol($url, $network);
+
 			if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
 				Logger::log('ignoring duplicated connection request from pending contact ' . $url);
 				return;
@@ -2086,7 +2196,7 @@ class Contact extends BaseObject
 
 				if (is_array($contact_record)) {
 					DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
-								'blocked' => false, 'knowyou' => false,
+								'blocked' => false, 'knowyou' => false, 'note' => $note,
 								'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
 				}
 
@@ -2116,8 +2226,9 @@ class Contact extends BaseObject
 				DBA::update('contact', ['pending' => false], $condition);
 
 				$contact = DBA::selectFirst('contact', ['url', 'network', 'hub-verify'], ['id' => $contact_record['id']]);
+				$protocol = self::getProtocol($contact['url'], $contact['network']);
 
-				if ($contact['network'] == Protocol::ACTIVITYPUB) {
+				if ($protocol == Protocol::ACTIVITYPUB) {
 					ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
 				}
 			}
@@ -2225,12 +2336,12 @@ class Contact extends BaseObject
 			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
 		}
 
-		$cid = self::getIdForURL($contact_url, 0, true);
-		if (empty($cid)) {
+		$data = self::getProbeDataFromDatabase($contact_url);
+		if (empty($data)) {
 			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
 		}
 
-		return self::magicLinkbyId($cid, $url);
+		return self::magicLinkByContact($data, $contact_url);
 	}
 
 	/**