X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=09d527733192565a7584d60b1a4f328b996cd662;hb=05bd0d0b671ad509465fa6cddabc3c2a07c796a7;hp=f60a362c57689ce22b3f14e88f6f98101db23736;hpb=89534b5be37dd817e93b51892d8e6dc6d036a7b8;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f60a362c57..09d5277331 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -190,6 +190,98 @@ class Contact
 		return DBA::selectFirst('contact', $fields, ['id' => $id]);
 	}
 
+	/**
+	 * Fetches a contact by a given url
+	 *
+	 * @param string  $url    profile url
+	 * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+	 * @param array   $fields Field list
+	 * @param integer $uid    User ID of the contact
+	 * @return array contact array
+	 */
+	public static function getByURL(string $url, $update = null, array $fields = [], int $uid = 0)
+	{
+		if ($update || is_null($update)) {
+			$cid = self::getIdForURL($url, $uid, $update);
+			if (empty($cid)) {
+				return [];
+			}
+			return self::getById($cid, $fields);
+		}
+
+		// Add internal fields
+		$removal = [];
+		if (!empty($fields)) {
+			foreach (['id', 'updated', 'network'] as $internal) {
+				if (!in_array($internal, $fields)) {
+					$fields[] = $internal;
+					$removal[] = $internal;
+				}
+			}
+		}
+
+		// We first try the nurl (http://server.tld/nick), most common case
+		$options = ['order' => ['id']];
+		$contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
+
+		// Then the addr (nick@server.tld)
+		if (!DBA::isResult($contact)) {
+			$contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
+		}
+
+		// Then the alias (which could be anything)
+		if (!DBA::isResult($contact)) {
+			// 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', $fields, $condition, $options);
+		}
+		
+		// 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' : ''));
+		}
+
+		// Remove the internal fields
+		foreach ($removal as $internal) {
+			unset($contact[$internal]);
+		}
+
+		return $contact;
+	}
+
+	/**
+	 * Fetches a contact for a given user by a given url.
+	 * In difference to "getByURL" the function will fetch a public contact when no user contact had been found.
+	 *
+	 * @param string  $url    profile url
+	 * @param integer $uid    User ID of the contact
+	 * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+	 * @param array   $fields Field list
+	 * @return array contact array
+	 */
+	public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = [])
+	{
+		if ($uid != 0) {
+			$contact = self::getByURL($url, $update, $fields, $uid);
+			if (!empty($contact)) {
+				if (!empty($contact['id'])) {
+					$contact['cid'] = $contact['id'];
+					$contact['zid'] = 0;
+				}
+				return $contact;
+			}
+		}
+
+		$contact = self::getByURL($url, $update, $fields);
+		if (!empty($contact['id'])) {		
+			$contact['cid'] = 0;
+			$contact['zid'] = $contact['id'];
+		}
+		return $contact;
+	}
+
 	/**
 	 * Tests if the given contact is a follower
 	 *
@@ -227,7 +319,7 @@ class Contact
 	 */
 	public static function isFollowerByURL($url, $uid)
 	{
-		$cid = self::getIdForURL($url, $uid, true);
+		$cid = self::getIdForURL($url, $uid, false);
 
 		if (empty($cid)) {
 			return false;
@@ -273,7 +365,7 @@ class Contact
 	 */
 	public static function isSharingByURL($url, $uid)
 	{
-		$cid = self::getIdForURL($url, $uid, true);
+		$cid = self::getIdForURL($url, $uid, false);
 
 		if (empty($cid)) {
 			return false;
@@ -368,7 +460,7 @@ class Contact
 		if (!DBA::isResult($self)) {
 			return false;
 		}
-		return self::getIdForURL($self['url'], 0, true);
+		return self::getIdForURL($self['url'], 0, false);
 	}
 
 	/**
@@ -398,14 +490,14 @@ class Contact
 		}
 
 		if ($contact['uid'] != 0) {
-			$pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+			$pcid = Contact::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, true);
+			$ucid = Contact::getIdForURL($contact['url'], $uid, false);
 		}
 
 		return ['public' => $pcid, 'user' => $ucid];
@@ -843,11 +935,12 @@ class Contact
 			// 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['tag'] = '';
+			$item['uri-id'] = 0;
 			$item['attach'] = '';
 			$slap = OStatus::salmon($item, $user);
 
@@ -887,10 +980,10 @@ class Contact
 				return;
 			}
 		} elseif (!isset($contact['url'])) {
-			Logger::log('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), Logger::DEBUG);
+			Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]);
 		}
 
-		Logger::log('Contact '.$contact['id'].' is marked for archival', Logger::DEBUG);
+		Logger::info('Contact is marked for archival', ['id' => $contact['id']]);
 
 		// Contact already archived or "self" contact? => nothing to do
 		if ($contact['archive'] || $contact['self']) {
@@ -936,7 +1029,7 @@ class Contact
 	{
 		// Always unarchive the relay contact entry
 		if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
-			$fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+			$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);
 		}
@@ -949,7 +1042,7 @@ class Contact
 			return;
 		}
 
-		Logger::log('Contact '.$contact['id'].' is marked as vital again', Logger::DEBUG);
+		Logger::info('Contact is marked as vital again', ['id' => $contact['id']]);
 
 		if (!isset($contact['url']) && !empty($contact['id'])) {
 			$fields = ['id', 'url', 'batch'];
@@ -960,222 +1053,12 @@ class Contact
 		}
 
 		// It's a miracle. Our dead contact has inexplicably come back to life.
-		$fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+		$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]);
 		GContact::updateFromPublicContactURL($contact['url']);
 	}
 
-	/**
-	 * Get contact data for a given profile link
-	 *
-	 * The function looks at several places (contact table and gcontact table) for the contact
-	 * It caches its result for the same script execution to prevent duplicate calls
-	 *
-	 * @param string $url     The profile link
-	 * @param int    $uid     User id
-	 * @param array  $default If not data was found take this data as default value
-	 *
-	 * @return array Contact data
-	 * @throws HTTPException\InternalServerErrorException
-	 */
-	public static function getDetailsByURL($url, $uid = -1, array $default = [])
-	{
-		static $cache = [];
-
-		if ($url == '') {
-			return $default;
-		}
-
-		if ($uid == -1) {
-			$uid = local_user();
-		}
-
-		if (isset($cache[$url][$uid])) {
-			return $cache[$url][$uid];
-		}
-
-		$ssl_url = str_replace('http://', 'https://', $url);
-
-		$nurl = Strings::normaliseLink($url);
-
-		// Fetch contact data from the contact table for the given user
-		$s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-			`keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
-		FROM `contact` WHERE `nurl` = ? AND `uid` = ?", $nurl, $uid);
-		$r = DBA::toArray($s);
-
-		// Fetch contact data from the contact table for the given user, checking with the alias
-		if (!DBA::isResult($r)) {
-			$s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-				`keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
-			FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", $nurl, $url, $ssl_url, $uid);
-			$r = DBA::toArray($s);
-		}
-
-		// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-		if (!DBA::isResult($r)) {
-			$s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-			`keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
-			FROM `contact` WHERE `nurl` = ? AND `uid` = 0", $nurl);
-			$r = DBA::toArray($s);
-		}
-
-		// Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
-		if (!DBA::isResult($r)) {
-			$s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-			`keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
-			FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", $nurl, $url, $ssl_url);
-			$r = DBA::toArray($s);
-		}
-
-		// Fetch the data from the gcontact table
-		if (!DBA::isResult($r)) {
-			$s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
-			`keywords`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
-			FROM `gcontact` WHERE `nurl` = ?", $nurl);
-			$r = DBA::toArray($s);
-		}
-
-		if (DBA::isResult($r)) {
-			$authoritativeResult = true;
-			// If there is more than one entry we filter out the connector networks
-			if (count($r) > 1) {
-				foreach ($r as $id => $result) {
-					if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) {
-						unset($r[$id]);
-					}
-				}
-			}
-
-			$profile = array_shift($r);
-
-			// "bd" always contains the upcoming birthday of a contact.
-			// "birthday" might contain the birthday including the year of birth.
-			if ($profile["birthday"] > DBA::NULL_DATE) {
-				$bd_timestamp = strtotime($profile["birthday"]);
-				$month = date("m", $bd_timestamp);
-				$day = date("d", $bd_timestamp);
-
-				$current_timestamp = time();
-				$current_year = date("Y", $current_timestamp);
-				$current_month = date("m", $current_timestamp);
-				$current_day = date("d", $current_timestamp);
-
-				$profile["bd"] = $current_year . "-" . $month . "-" . $day;
-				$current = $current_year . "-" . $current_month . "-" . $current_day;
-
-				if ($profile["bd"] < $current) {
-					$profile["bd"] = ( ++$current_year) . "-" . $month . "-" . $day;
-				}
-			} else {
-				$profile["bd"] = DBA::NULL_DATE;
-			}
-		} else {
-			$authoritativeResult = false;
-			$profile = $default;
-		}
-
-		if (empty($profile["photo"]) && isset($default["photo"])) {
-			$profile["photo"] = $default["photo"];
-		}
-
-		if (empty($profile["name"]) && isset($default["name"])) {
-			$profile["name"] = $default["name"];
-		}
-
-		if (empty($profile["network"]) && isset($default["network"])) {
-			$profile["network"] = $default["network"];
-		}
-
-		if (empty($profile["thumb"]) && isset($profile["photo"])) {
-			$profile["thumb"] = $profile["photo"];
-		}
-
-		if (empty($profile["micro"]) && isset($profile["thumb"])) {
-			$profile["micro"] = $profile["thumb"];
-		}
-
-		if ((empty($profile["addr"]) || empty($profile["name"])) && !empty($profile["gid"])
-			&& in_array($profile["network"], Protocol::FEDERATED)
-		) {
-			Worker::add(PRIORITY_LOW, "UpdateGContact", $url);
-		}
-
-		// Show contact details of Diaspora contacts only if connected
-		if (empty($profile["cid"]) && ($profile["network"] ?? "") == Protocol::DIASPORA) {
-			$profile["location"] = "";
-			$profile["about"] = "";
-			$profile["birthday"] = DBA::NULL_DATE;
-		}
-
-		// Only cache the result if it came from the DB since this method is used in widely different contexts
-		// @see display_fetch_author for an example of $default parameter diverging from the DB result
-		if ($authoritativeResult) {
-			$cache[$url][$uid] = $profile;
-		}
-
-		return $profile;
-	}
-
-	/**
-	 * Get contact data for a given address
-	 *
-	 * The function looks at several places (contact table and gcontact table) for the contact
-	 *
-	 * @param string $addr The profile link
-	 * @param int    $uid  User id
-	 *
-	 * @return array Contact data
-	 * @throws HTTPException\InternalServerErrorException
-	 * @throws \ImagickException
-	 */
-	public static function getDetailsByAddr($addr, $uid = -1)
-	{
-		if ($addr == '') {
-			return [];
-		}
-
-		if ($uid == -1) {
-			$uid = local_user();
-		}
-
-		// Fetch contact data from the contact table for the given user
-		$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-			`keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
-			FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`",
-			DBA::escape($addr),
-			intval($uid)
-		);
-		// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-		if (!DBA::isResult($r)) {
-			$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-				`keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
-				FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`",
-				DBA::escape($addr)
-			);
-		}
-
-		// Fetch the data from the gcontact table
-		if (!DBA::isResult($r)) {
-			$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
-				`keywords`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
-				FROM `gcontact` WHERE `addr` = '%s'",
-				DBA::escape($addr)
-			);
-		}
-
-		if (!DBA::isResult($r)) {
-			$data = Probe::uri($addr);
-
-			$profile = self::getDetailsByURL($data['url'], $uid);
-		} else {
-			$profile = $r[0];
-		}
-
-		return $profile;
-	}
-
 	/**
 	 * Returns the data array for the photo menu of a given contact
 	 *
@@ -1235,7 +1118,7 @@ class Contact
 		}
 
 		if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
-			$poke_link = DI::baseUrl() . '/poke/?c=' . $contact['id'];
+			$poke_link = 'contact/' . $contact['id'] . '/poke';
 		}
 
 		$contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
@@ -1440,7 +1323,7 @@ class Contact
 	 *
 	 * @param string  $url       Contact URL
 	 * @param integer $uid       The user id for the contact (0 = public contact)
-	 * @param boolean $no_update Don't update the 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 $in_loop   Internally used variable to prevent an endless loop
 	 *
@@ -1448,9 +1331,9 @@ class Contact
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
+	public static function getIdForURL($url, $uid = 0, $update = null, $default = [], $in_loop = false)
 	{
-		Logger::log("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), Logger::DEBUG);
+		Logger::info('Get contact data', ['url' => $url, 'user' => $uid]);
 
 		$contact_id = 0;
 
@@ -1458,38 +1341,12 @@ class Contact
 			return 0;
 		}
 
-		/// @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
-		$fields = ['id', 'avatar', 'updated', 'network'];
-		$options = ['order' => ['id']];
-		$contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
+		$contact = self::getByURL($url, false, ['id', 'avatar', 'updated', 'network'], $uid);
 
-		// Then the addr (nick@server.tld)
-		if (!DBA::isResult($contact)) {
-			$contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
-		}
-
-		// Then the alias (which could be anything)
-		if (!DBA::isResult($contact)) {
-			// 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', $fields, $condition, $options);
-		}
-
-		if (DBA::isResult($contact)) {
+		if (!empty($contact)) {
 			$contact_id = $contact["id"];
-			$update_contact = false;
-
-			// Update the contact every 7 days (Don't update mail or feed contacts)
-			if (in_array($contact['network'], Protocol::FEDERATED)) {
-				$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;
-				}
-			} elseif (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
+			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]);
@@ -1502,12 +1359,7 @@ class Contact
 				}
 			}
 
-			// 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, ($uid == 0 ? 'force' : ''));
-			}
-
-			if (!$update_contact || $no_update) {
+			if (empty($update)) {
 				return $contact_id;
 			}
 		} elseif ($uid != 0) {
@@ -1515,11 +1367,11 @@ class Contact
 			return 0;
 		}
 
-		if ($no_update && empty($default)) {
+		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 ($no_update && !empty($default['network'])) {
+		} elseif (!$update && !empty($default['network'])) {
 			// If there are default values, take these
 			$data = $default;
 			$background_update = false;
@@ -1528,12 +1380,8 @@ class Contact
 			$background_update = false;
 		}
 
-		if (empty($data)) {
+		if ((empty($data) && is_null($update)) || $update) {
 			$data = Probe::uri($url, "", $uid);
-			// Ensure that there is a gserver entry
-			if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
-				GServer::check($data['baseurl']);
-			}
 		}
 
 		// Take the default values when probing failed
@@ -1546,8 +1394,16 @@ class Contact
 			return 0;
 		}
 
-		if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
-			$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
+		if (!empty($data['baseurl'])) {
+			$data['baseurl'] = GServer::cleanURL($data['baseurl']);
+		}
+
+		if (!empty($data['baseurl']) && empty($data['gsid'])) {
+			$data['gsid'] = GServer::getID($data['baseurl']);
+		}
+
+		if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) {
+			$contact_id = self::getIdForURL($data["alias"], $uid, false, $default, true);
 		}
 
 		if (!$contact_id) {
@@ -1575,6 +1431,7 @@ class Contact
 				'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(),
@@ -1621,10 +1478,13 @@ class Contact
 				// Update the gcontact entry
 				if ($uid == 0) {
 					GContact::updateFromPublicContactID($contact_id);
+					if (($data['network'] == Protocol::ACTIVITYPUB) && in_array(DI::config()->get('system', 'gcontact_discovery'), [GContact::DISCOVERY_DIRECT, GContact::DISCOVERY_RECURSIVE])) {
+						GContact::discoverFollowers($data['url']);
+					}
 				}
 			}
 		} else {
-			$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl'];
+			$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid'];
 			$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
 			// This condition should always be true
@@ -1635,10 +1495,11 @@ class Contact
 			$updated = [
 				'url' => $data['url'],
 				'nurl' => Strings::normaliseLink($data['url']),
-				'updated' => DateTimeFormat::utcNow()
+				'updated' => DateTimeFormat::utcNow(),
+				'failed' => false
 			];
 
-			$fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl'];
+			$fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl', 'gsid'];
 
 			foreach ($fields as $field) {
 				$updated[$field] = ($data[$field] ?? '') ?: $contact[$field];
@@ -1753,7 +1614,6 @@ class Contact
 	 * Returns posts from a given contact url
 	 *
 	 * @param string $contact_url Contact URL
-	 *
 	 * @param bool   $thread_mode
 	 * @param int    $update
 	 * @return string posts in HTML
@@ -1761,9 +1621,21 @@ class Contact
 	 */
 	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
 	{
-		$a = DI::app();
+		return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update);
+	}
 
-		$cid = self::getIdForURL($contact_url);
+	/**
+	 * Returns posts from a given contact id
+	 *
+	 * @param integer $cid
+	 * @param bool    $thread_mode
+	 * @param integer $update
+	 * @return string posts in HTML
+	 * @throws \Exception
+	 */
+	public static function getPostsFromId($cid, $thread_mode = false, $update = 0)
+	{
+		$a = DI::app();
 
 		$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
 		if (!DBA::isResult($contact)) {
@@ -1911,7 +1783,7 @@ class Contact
 	 * @param int    $cid    Contact id
 	 * @param bool   $force  force picture update
 	 *
-	 * @return array Returns array of the different avatar sizes
+	 * @return void
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws HTTPException\NotFoundException
 	 * @throws \ImagickException
@@ -1920,8 +1792,7 @@ class Contact
 	{
 		$contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
 		if (!DBA::isResult($contact)) {
-			Logger::error('Contact not found', ['cid' => $cid]);
-			throw new HTTPException\NotFoundException('Contact not found');
+			return;
 		}
 
 		$data = [
@@ -1952,12 +1823,8 @@ class Contact
 						DBA::update('contact', $fields, ['id' => $pcontact['id']]);
 					}
 				}
-
-				return $photos;
 			}
 		}
-
-		return $data;
 	}
 
 	/**
@@ -2059,6 +1926,7 @@ class Contact
 
 			Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
 		}
+		DBA::close($duplicates);
 		Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
 		return true;
 	}
@@ -2081,9 +1949,9 @@ class Contact
 		// These fields aren't updated by this routine:
 		// 'xmpp', 'sensitive'
 
-		$fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about',
+		$fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
 			'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
-			'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey'];
+			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
 		if (!DBA::isResult($contact)) {
 			return false;
@@ -2106,7 +1974,7 @@ class Contact
 		// We check after the probing to be able to correct falsely detected contact types.
 		if (($contact['contact-type'] == self::TYPE_RELAY) &&
 			(!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
-			self::updateContact($id, $uid, $contact['url'], ['last-update' => $updated, 'success_update' => $updated]);
+			self::updateContact($id, $uid, $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
 			Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]);
 			return true;
 		}
@@ -2114,7 +1982,7 @@ class Contact
 		// 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'], ['last-update' => $updated, 'failure_update' => $updated]);
+				self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
 			}
 			return false;
 		}
@@ -2158,7 +2026,7 @@ class Contact
 
 		if (!$update) {
 			if ($force) {
-				self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
+				self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
 			}
 
 			// Update the public contact
@@ -2188,6 +2056,7 @@ class Contact
 		if ($force && ($uid == 0)) {
 			$ret['last-update'] = $updated;
 			$ret['success_update'] = $updated;
+			$ret['failed'] = false;
 		}
 
 		unset($ret['photo']);
@@ -2257,20 +2126,20 @@ class Contact
 	 * $return['message'] error text if success is false.
 	 *
 	 * Takes a $uid and a url/handle and adds a new contact
-	 * @param int    $uid
-	 * @param string $url
+	 *
+	 * @param array  $user        The user 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($uid, $url, $interactive = false, $network = '')
+	public static function createFromProbe(array $user, $url, $interactive = false, $network = '')
 	{
 		$result = ['cid' => -1, 'success' => false, 'message' => ''];
 
-		$a = DI::app();
-
 		// remove ajax junk, e.g. Twitter
 		$url = str_replace('/#!/', '/', $url);
 
@@ -2301,7 +2170,7 @@ class Contact
 		if (!empty($arr['contact']['name'])) {
 			$ret = $arr['contact'];
 		} else {
-			$ret = Probe::uri($url, $network, $uid, false);
+			$ret = Probe::uri($url, $network, $user['uid'], false);
 		}
 
 		if (($network != '') && ($ret['network'] != $network)) {
@@ -2313,21 +2182,21 @@ class Contact
 		// the poll url is more reliable than the profile url, as we may have
 		// indirect links or webfinger links
 
-		$condition = ['uid' => $uid, 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+		$condition = ['uid' => $user['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' => $uid, 'nurl' => Strings::normaliseLink($url), 'network' => $ret['network'], 'pending' => false];
+			$condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
 			$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
 		}
 
-		$protocol = self::getProtocol($url, $ret['network']);
+		$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/' . $a->user['nickname']);
+					$myaddr = bin2hex(DI::baseUrl() . '/profile/' . $user['nickname']);
 				} else {
-					$myaddr = bin2hex($a->user['nickname'] . '@' . DI::baseUrl()->getHostname());
+					$myaddr = bin2hex($user['nickname'] . '@' . DI::baseUrl()->getHostname());
 				}
 
 				DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr");
@@ -2357,7 +2226,7 @@ class Contact
 			if (empty($ret['url'])) {
 				$result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL;
 			}
-			if (strpos($url, '@') !== false) {
+			if (strpos($ret['url'], '@') !== false) {
 				$result['message'] .= DI::l10n()->t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
 				$result['message'] .= DI::l10n()->t('Use mailto: in front of address to force email check.') . EOL;
 			}
@@ -2381,7 +2250,7 @@ class Contact
 
 		$pending = false;
 		if ($protocol == Protocol::ACTIVITYPUB) {
-			$apcontact = APContact::getByURL($url, false);
+			$apcontact = APContact::getByURL($ret['url'], false);
 			if (isset($apcontact['manually-approve'])) {
 				$pending = (bool)$apcontact['manually-approve'];
 			}
@@ -2402,7 +2271,7 @@ class Contact
 
 			// create contact record
 			self::insert([
-				'uid'     => $uid,
+				'uid'     => $user['uid'],
 				'created' => DateTimeFormat::utcNow(),
 				'url'     => $ret['url'],
 				'nurl'    => Strings::normaliseLink($ret['url']),
@@ -2416,6 +2285,7 @@ class Contact
 				'nick'    => $ret['nick'],
 				'network' => $ret['network'],
 				'baseurl' => $ret['baseurl'],
+				'gsid'    => $ret['gsid'] ?? null,
 				'protocol' => $protocol,
 				'pubkey'  => $ret['pubkey'],
 				'rel'     => $new_relation,
@@ -2429,7 +2299,7 @@ class Contact
 			]);
 		}
 
-		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $user['uid']]);
 		if (!DBA::isResult($contact)) {
 			$result['message'] .= DI::l10n()->t('Unable to retrieve contact information.') . EOL;
 			return $result;
@@ -2438,27 +2308,28 @@ class Contact
 		$contact_id = $contact['id'];
 		$result['cid'] = $contact_id;
 
-		Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
+		Group::addMember(User::getDefaultGroup($user['uid'], $contact["network"]), $contact_id);
 
 		// Update the avatar
-		self::updateAvatar($ret['photo'], $uid, $contact_id);
+		self::updateAvatar($ret['photo'], $user['uid'], $contact_id);
 
 		// pull feed and consume it, which should subscribe to the hub.
 
 		Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
 
-		$owner = User::getOwnerDataById($uid);
+		$owner = User::getOwnerDataById($user['uid']);
 
 		if (DBA::isResult($owner)) {
 			if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
 				// create a follow slap
 				$item = [];
 				$item['verb'] = Activity::FOLLOW;
+				$item['gravity'] = GRAVITY_ACTIVITY;
 				$item['follow'] = $contact["url"];
 				$item['body'] = '';
 				$item['title'] = '';
 				$item['guid'] = '';
-				$item['tag'] = '';
+				$item['uri-id'] = 0;
 				$item['attach'] = '';
 
 				$slap = OStatus::salmon($item, $owner);
@@ -2467,7 +2338,7 @@ class Contact
 					Salmon::slapper($owner, $contact['notify'], $slap);
 				}
 			} elseif ($protocol == Protocol::DIASPORA) {
-				$ret = Diaspora::sendShare($a->user, $contact);
+				$ret = Diaspora::sendShare($owner, $contact);
 				Logger::log('share returns: ' . $ret);
 			} elseif ($protocol == Protocol::ACTIVITYPUB) {
 				$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
@@ -2476,7 +2347,7 @@ class Contact
 					return false;
 				}
 
-				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
+				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $user['uid'], $activity_id);
 				Logger::log('Follow returns: ' . $ret);
 			}
 		}
@@ -2661,7 +2532,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['uid'], $url, false, $network);
+					self::createFromProbe($importer, $url, false, $network);
 				}
 
 				$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
@@ -2734,6 +2605,7 @@ class Contact
 				);
 			}
 		}
+		DBA::close($contacts);
 	}
 
 	/**