X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=cf90406e24a029d5afbc2cd83eceebfce9d95922;hb=2b0610eaf5ea67cc6b6a8e59b4f9c08249f90370;hp=5894814ea6c0e58dddda35b8c2272b779f5c27a5;hpb=faa30adf68a32955d9680526f722e0ca7f436a3b;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 5894814ea6..cf90406e24 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -6,7 +6,6 @@ namespace Friendica\Model;
 
 use Friendica\BaseObject;
 use Friendica\Content\Pager;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -27,66 +26,78 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * @brief functions for interacting with a contact
  */
 class Contact extends BaseObject
 {
 	/**
-	 * @name page/profile types
-	 *
-	 * PAGE_NORMAL is a typical personal profile account
-	 * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
-	 * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
-	 *      write access to wall and comments (no email and not included in page owner's ACL lists)
-	 * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
-	 *
-	 * @{
+	 * @deprecated since version 2019.03
+	 * @see User::PAGE_FLAGS_NORMAL
 	 */
-	const PAGE_NORMAL    = 0;
-	const PAGE_SOAPBOX   = 1;
-	const PAGE_COMMUNITY = 2;
-	const PAGE_FREELOVE  = 3;
-	const PAGE_BLOG      = 4;
-	const PAGE_PRVGROUP  = 5;
+	const PAGE_NORMAL    = User::PAGE_FLAGS_NORMAL;
+	/**
+	 * @deprecated since version 2019.03
+	 * @see User::PAGE_FLAGS_SOAPBOX
+	 */
+	const PAGE_SOAPBOX   = User::PAGE_FLAGS_SOAPBOX;
+	/**
+	 * @deprecated since version 2019.03
+	 * @see User::PAGE_FLAGS_COMMUNITY
+	 */
+	const PAGE_COMMUNITY = User::PAGE_FLAGS_COMMUNITY;
+	/**
+	 * @deprecated since version 2019.03
+	 * @see User::PAGE_FLAGS_FREELOVE
+	 */
+	const PAGE_FREELOVE  = User::PAGE_FLAGS_FREELOVE;
+	/**
+	 * @deprecated since version 2019.03
+	 * @see User::PAGE_FLAGS_BLOG
+	 */
+	const PAGE_BLOG      = User::PAGE_FLAGS_BLOG;
+	/**
+	 * @deprecated since version 2019.03
+	 * @see User::PAGE_FLAGS_PRVGROUP
+	 */
+	const PAGE_PRVGROUP  = User::PAGE_FLAGS_PRVGROUP;
 	/**
 	 * @}
 	 */
 
 	/**
-	 * @name account types
+	 * Account types
+	 *
+	 * TYPE_UNKNOWN - the account has been imported from gcontact where this is the default type value
 	 *
-	 * ACCOUNT_TYPE_PERSON - the account belongs to a person
+	 * TYPE_PERSON - the account belongs to a person
 	 *	Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
 	 *
-	 * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+	 * TYPE_ORGANISATION - the account belongs to an organisation
 	 *	Associated page type: PAGE_SOAPBOX
 	 *
-	 * ACCOUNT_TYPE_NEWS - the account is a news reflector
+	 * TYPE_NEWS - the account is a news reflector
 	 *	Associated page type: PAGE_SOAPBOX
 	 *
-	 * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+	 * TYPE_COMMUNITY - the account is community forum
 	 *	Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
 	 *
-	 * ACCOUNT_TYPE_RELAY - the account is a relay
+	 * TYPE_RELAY - the account is a relay
 	 *      This will only be assigned to contacts, not to user accounts
 	 * @{
 	 */
-	const ACCOUNT_TYPE_PERSON =       0;
-	const ACCOUNT_TYPE_ORGANISATION = 1;
-	const ACCOUNT_TYPE_NEWS =         2;
-	const ACCOUNT_TYPE_COMMUNITY =    3;
-	const ACCOUNT_TYPE_RELAY =        4;
+	const TYPE_UNKNOWN =     -1;
+	const TYPE_PERSON =       User::ACCOUNT_TYPE_PERSON;
+	const TYPE_ORGANISATION = User::ACCOUNT_TYPE_ORGANISATION;
+	const TYPE_NEWS =         User::ACCOUNT_TYPE_NEWS;
+	const TYPE_COMMUNITY =    User::ACCOUNT_TYPE_COMMUNITY;
+	const TYPE_RELAY =        User::ACCOUNT_TYPE_RELAY;
 	/**
 	 * @}
 	 */
 
 	/**
-	 * @name Contact_is
+	 * Contact_is
 	 *
 	 * Relationship types
 	 * @{
@@ -105,6 +116,8 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id a follower?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function isFollower($cid, $uid)
 	{
@@ -123,11 +136,13 @@ class Contact extends BaseObject
 
 	/**
 	 * @brief Get the basepath for a given contact link
-	 * @todo Add functionality to store this value in the contact table
+	 * @todo  Add functionality to store this value in the contact table
 	 *
 	 * @param string $url The contact link
 	 *
 	 * @return string basepath
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getBasepath($url)
 	{
@@ -147,6 +162,8 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return array with public and user's contact id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getPublicAndUserContacID($cid, $uid)
 	{
@@ -184,6 +201,7 @@ class Contact extends BaseObject
 	 * @param int     $cid     Either public contact id or user's contact id
 	 * @param int     $uid     User ID
 	 * @param boolean $blocked Is the contact blocked or unblocked?
+	 * @throws \Exception
 	 */
 	public static function setBlockedForUser($cid, $uid, $blocked)
 	{
@@ -206,6 +224,7 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id blocked for the given user?
+	 * @throws \Exception
 	 */
 	public static function isBlockedByUser($cid, $uid)
 	{
@@ -245,6 +264,7 @@ class Contact extends BaseObject
 	 * @param int     $cid     Either public contact id or user's contact id
 	 * @param int     $uid     User ID
 	 * @param boolean $ignored Is the contact ignored or unignored?
+	 * @throws \Exception
 	 */
 	public static function setIgnoredForUser($cid, $uid, $ignored)
 	{
@@ -267,6 +287,7 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id ignored for the given user?
+	 * @throws \Exception
 	 */
 	public static function isIgnoredByUser($cid, $uid)
 	{
@@ -306,6 +327,7 @@ class Contact extends BaseObject
 	 * @param int     $cid       Either public contact id or user's contact id
 	 * @param int     $uid       User ID
 	 * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
+	 * @throws \Exception
 	 */
 	public static function setCollapsedForUser($cid, $uid, $collapsed)
 	{
@@ -324,6 +346,8 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id blocked for the given user?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function isCollapsedByUser($cid, $uid)
 	{
@@ -349,6 +373,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $gid
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getByGroupId($gid)
 	{
@@ -362,6 +387,7 @@ class Contact extends BaseObject
 				WHERE `gid` = ?
 				AND `contact`.`uid` = ?
 				AND NOT `contact`.`self`
+				AND NOT `contact`.`deleted`
 				AND NOT `contact`.`blocked`
 				AND NOT `contact`.`pending`
 				ORDER BY `contact`.`name` ASC',
@@ -382,6 +408,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $gid
 	 * @return int
+	 * @throws \Exception
 	 */
 	public static function getOStatusCountByGroupId($gid)
 	{
@@ -410,6 +437,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $uid
 	 * @return bool Operation success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function createSelfFromUserId($uid)
 	{
@@ -454,8 +482,9 @@ class Contact extends BaseObject
 	/**
 	 * Updates the self-contact for the provided user id
 	 *
-	 * @param int $uid
+	 * @param int     $uid
 	 * @param boolean $update_avatar Force the avatar update
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function updateSelfFromUserID($uid, $update_avatar = false)
 	{
@@ -486,7 +515,7 @@ class Contact extends BaseObject
 			'gender' => $profile['gender'], 'avatar' => $profile['photo'],
 			'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
 
-		$avatar = DBA::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
+		$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
 		if (DBA::isResult($avatar)) {
 			if ($update_avatar) {
 				$fields['avatar-date'] = DateTimeFormat::utcNow();
@@ -516,8 +545,8 @@ class Contact extends BaseObject
 			$fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
 		}
 
-		$fields['forum'] = $user['page-flags'] == self::PAGE_COMMUNITY;
-		$fields['prv'] = $user['page-flags'] == self::PAGE_PRVGROUP;
+		$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
+		$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
 
 		// it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
 		$fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
@@ -556,6 +585,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $id contact id
 	 * @return null
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function remove($id)
 	{
@@ -579,9 +609,14 @@ class Contact extends BaseObject
 	 * @param array   $contact  Contact unfriended
 	 * @param boolean $dissolve Remove the contact on the remote side
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
 	{
+		if (empty($contact['network'])) {
+			return;
+		}
 		if (($contact['network'] == Protocol::DFRN) && $dissolve) {
 			DFRN::deliver($user, $contact, 'placeholder', true);
 		} elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
@@ -602,7 +637,7 @@ class Contact extends BaseObject
 		} elseif ($contact['network'] == Protocol::DIASPORA) {
 			Diaspora::sendUnshare($user, $contact);
 		} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
-			ActivityPub\Transmitter::sendContactUndo($contact['url'], $user['uid']);
+			ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
 
 			if ($dissolve) {
 				ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
@@ -621,12 +656,13 @@ class Contact extends BaseObject
 	 *
 	 * @param array $contact contact to mark for archival
 	 * @return null
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function markForArchival(array $contact)
 	{
 		if (!isset($contact['url']) && !empty($contact['id'])) {
 			$fields = ['id', 'url', 'archive', 'self', 'term-date'];
-			$contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+			$contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
 			if (!DBA::isResult($contact)) {
 				return;
 			}
@@ -634,6 +670,8 @@ class Contact extends BaseObject
 			Logger::log('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), Logger::DEBUG);
 		}
 
+		Logger::log('Contact '.$contact['id'].' is marked for archival', Logger::DEBUG);
+
 		// Contact already archived or "self" contact? => nothing to do
 		if ($contact['archive'] || $contact['self']) {
 			return;
@@ -667,10 +705,11 @@ class Contact extends BaseObject
 	/**
 	 * @brief Cancels the archival countdown
 	 *
-	 * @see Contact::markForArchival()
+	 * @see   Contact::markForArchival()
 	 *
 	 * @param array $contact contact to be unmarked for archival
 	 * @return null
+	 * @throws \Exception
 	 */
 	public static function unmarkForArchival(array $contact)
 	{
@@ -682,9 +721,11 @@ class Contact extends BaseObject
 			return;
 		}
 
+		Logger::log('Contact '.$contact['id'].' is marked as vital again', Logger::DEBUG);
+
 		if (!isset($contact['url']) && !empty($contact['id'])) {
 			$fields = ['id', 'url', 'batch'];
-			$contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+			$contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
 			if (!DBA::isResult($contact)) {
 				return;
 			}
@@ -696,7 +737,7 @@ class Contact extends BaseObject
 		DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
 
 		if (!empty($contact['batch'])) {
-			$condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
+			$condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
 			DBA::update('contact', $fields, $condition);
 		}
 	}
@@ -712,6 +753,7 @@ class Contact extends BaseObject
 	 * @param array  $default If not data was found take this data as default value
 	 *
 	 * @return array Contact data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getDetailsByURL($url, $uid = -1, array $default = [])
 	{
@@ -854,11 +896,11 @@ class Contact extends BaseObject
 	 * @param int    $uid  User id
 	 *
 	 * @return array Contact data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getDetailsByAddr($addr, $uid = -1)
 	{
-		static $cache = [];
-
 		if ($addr == '') {
 			return [];
 		}
@@ -909,17 +951,14 @@ class Contact extends BaseObject
 	 * @param array $contact contact
 	 * @param int   $uid     optional, default 0
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function photoMenu(array $contact, $uid = 0)
 	{
-		// @todo Unused, to be removed
-		$a = get_app();
-
-		$contact_url = '';
 		$pm_url = '';
 		$status_link = '';
 		$photos_link = '';
-		$posts_link = '';
 		$contact_drop_link = '';
 		$poke_link = '';
 
@@ -1003,7 +1042,7 @@ class Contact extends BaseObject
 
 		$args = ['contact' => $contact, 'menu' => &$menu];
 
-		Addon::callHooks('contact_photo_menu', $args);
+		Hook::callAll('contact_photo_menu', $args);
 
 		$menucondensed = [];
 
@@ -1022,11 +1061,9 @@ class Contact extends BaseObject
 	 * Returns either the total number of ungrouped contacts for the given user
 	 * id or a paginated list of ungrouped contacts.
 	 *
-	 * @param int $uid   uid
-	 * @param int $start optional, default 0
-	 * @param int $count optional, default 0
-	 *
+	 * @param int $uid uid
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getUngroupedList($uid)
 	{
@@ -1034,6 +1071,7 @@ class Contact extends BaseObject
 			   FROM `contact`
 			   WHERE `uid` = %d
 			   AND NOT `self`
+			   AND NOT `deleted`
 			   AND NOT `blocked`
 			   AND NOT `pending`
 			   AND `id` NOT IN (
@@ -1069,6 +1107,8 @@ class Contact extends BaseObject
 	 * @param boolean $in_loop   Internally used variable to prevent an endless loop
 	 *
 	 * @return integer Contact ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
 	{
@@ -1159,9 +1199,10 @@ class Contact extends BaseObject
 				$contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
 			}
 
+			// The link could be provided as http although we stored it as https
+			$ssl_url = str_replace('http://', 'https://', $url);
+
 			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' => [$url, Strings::normaliseLink($url), $ssl_url]];
 				$contact = DBA::selectFirst('contact', $fields, $condition);
 			}
@@ -1188,7 +1229,6 @@ class Contact extends BaseObject
 			$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
 		}
 
-		$url = $data["url"];
 		if (!$contact_id) {
 			$fields = [
 				'uid'       => $uid,
@@ -1326,6 +1366,7 @@ class Contact extends BaseObject
 	 * @param int $cid contact id
 	 *
 	 * @return boolean Is the contact blocked?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isBlocked($cid)
 	{
@@ -1351,6 +1392,7 @@ class Contact extends BaseObject
 	 * @param int $cid contact id
 	 *
 	 * @return boolean Is the contact hidden?
+	 * @throws \Exception
 	 */
 	public static function isHidden($cid)
 	{
@@ -1370,15 +1412,16 @@ class Contact extends BaseObject
 	 *
 	 * @param string $contact_url Contact URL
 	 *
+	 * @param bool   $thread_mode
+	 * @param int    $update
 	 * @return string posts in HTML
+	 * @throws \Exception
 	 */
 	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
 	{
 		$a = self::getApp();
 
-		require_once 'include/conversation.php';
-
-		$cid = Self::getIdForURL($contact_url);
+		$cid = self::getIdForURL($contact_url);
 
 		$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
 		if (!DBA::isResult($contact)) {
@@ -1391,7 +1434,7 @@ class Contact extends BaseObject
 			$sql = "`item`.`uid` = ?";
 		}
 
-		$contact_field = ($contact["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+		$contact_field = ($contact["contact-type"] == self::TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
 		if ($thread_mode) {
 			$condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
@@ -1411,7 +1454,7 @@ class Contact extends BaseObject
 
 			$items = Item::inArray($r);
 
-			$o = conversation($a, $items, $pager, 'contacts', $update);
+			$o = conversation($a, $items, $pager, 'contacts', $update, false, 'commented', local_user());
 		} else {
 			$r = Item::selectForUser(local_user(), [], $condition, $params);
 
@@ -1439,17 +1482,17 @@ class Contact extends BaseObject
 	{
 		// There are several fields that indicate that the contact or user is a forum
 		// "page-flags" is a field in the user table,
-		// "forum" and "prv" are used in the contact table. They stand for self::PAGE_COMMUNITY and self::PAGE_PRVGROUP.
-		// "community" is used in the gcontact table and is true if the contact is self::PAGE_COMMUNITY or self::PAGE_PRVGROUP.
-		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_COMMUNITY))
-			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_PRVGROUP))
+		// "forum" and "prv" are used in the contact table. They stand for User::PAGE_FLAGS_COMMUNITY and User::PAGE_FLAGS_PRVGROUP.
+		// "community" is used in the gcontact table and is true if the contact is User::PAGE_FLAGS_COMMUNITY or User::PAGE_FLAGS_PRVGROUP.
+		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_COMMUNITY))
+			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_PRVGROUP))
 			|| (isset($contact['forum']) && intval($contact['forum']))
 			|| (isset($contact['prv']) && intval($contact['prv']))
 			|| (isset($contact['community']) && intval($contact['community']))
 		) {
-			$type = self::ACCOUNT_TYPE_COMMUNITY;
+			$type = self::TYPE_COMMUNITY;
 		} else {
-			$type = self::ACCOUNT_TYPE_PERSON;
+			$type = self::TYPE_PERSON;
 		}
 
 		// The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
@@ -1462,15 +1505,15 @@ class Contact extends BaseObject
 		}
 
 		switch ($type) {
-			case self::ACCOUNT_TYPE_ORGANISATION:
+			case self::TYPE_ORGANISATION:
 				$account_type = L10n::t("Organisation");
 				break;
 
-			case self::ACCOUNT_TYPE_NEWS:
+			case self::TYPE_NEWS:
 				$account_type = L10n::t('News');
 				break;
 
-			case self::ACCOUNT_TYPE_COMMUNITY:
+			case self::TYPE_COMMUNITY:
 				$account_type = L10n::t("Forum");
 				break;
 
@@ -1487,6 +1530,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $uid
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function block($uid)
 	{
@@ -1500,6 +1544,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $uid
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function unblock($uid)
 	{
@@ -1517,6 +1562,8 @@ class Contact extends BaseObject
 	 * @param bool   $force  force picture update
 	 *
 	 * @return array Returns array of the different avatar sizes
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateAvatar($avatar, $uid, $cid, $force = false)
 	{
@@ -1556,6 +1603,8 @@ class Contact extends BaseObject
 	 * @param integer $id      contact id
 	 * @param string  $network Optional network we are probing for
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateFromProbe($id, $network = '')
 	{
@@ -1572,8 +1621,8 @@ class Contact extends BaseObject
 
 		$ret = Probe::uri($contact["url"], $network);
 
-		// If Probe::uri fails the network code will be different
-		if (($ret["network"] != $contact["network"]) && !in_array($ret["network"], [Protocol::ACTIVITYPUB, $network])) {
+		// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
+		if (($ret["network"] != $contact["network"]) && !in_array($ret["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, $network])) {
 			return false;
 		}
 
@@ -1631,13 +1680,15 @@ class Contact extends BaseObject
 	 * @param string $url
 	 * @param bool   $interactive
 	 * @param string $network
-	 * @return boolean|string
+	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createFromProbe($uid, $url, $interactive = false, $network = '')
 	{
 		$result = ['cid' => -1, 'success' => false, 'message' => ''];
 
-		$a = get_app();
+		$a = \get_app();
 
 		// remove ajax junk, e.g. Twitter
 		$url = str_replace('/#!/', '/', $url);
@@ -1702,7 +1753,7 @@ class Contact extends BaseObject
 			}
 		} elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
 			$result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
-			$result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+			$result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
 			return $result;
 		}
 
@@ -1745,6 +1796,8 @@ class Contact extends BaseObject
 
 		$hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
 
+		$pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]);
+
 		if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
 			$writeable = 1;
 		}
@@ -1780,7 +1833,7 @@ class Contact extends BaseObject
 				'hidden'  => $hidden,
 				'blocked' => 0,
 				'readonly'=> 0,
-				'pending' => 0,
+				'pending' => $pending,
 				'subhub'  => $subhub
 			]);
 		}
@@ -1826,7 +1879,13 @@ class Contact extends BaseObject
 				$ret = Diaspora::sendShare($a->user, $contact);
 				Logger::log('share returns: ' . $ret);
 			} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
-				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
+				$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
+				if (empty($activity_id)) {
+					// This really should never happen
+					return false;
+				}
+
+				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
 				Logger::log('Follow returns: ' . $ret);
 			}
 		}
@@ -1838,10 +1897,11 @@ class Contact extends BaseObject
 	/**
 	 * @brief Updated contact's SSL policy
 	 *
-	 * @param array  $contact Contact array
+	 * @param array  $contact    Contact array
 	 * @param string $new_policy New policy, valid: self,full
 	 *
 	 * @return array Contact array with updated values
+	 * @throws \Exception
 	 */
 	public static function updateSslPolicy(array $contact, $new_policy)
 	{
@@ -1940,7 +2000,7 @@ class Contact extends BaseObject
 			/// @TODO Encapsulate this into a function/method
 			$fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];
 			$user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
-			if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
+			if (DBA::isResult($user) && !in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
 				// create notification
 				$hash = Strings::getRandomHex();
 
@@ -1953,7 +2013,7 @@ class Contact extends BaseObject
 				Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
 				if (($user['notify-flags'] & NOTIFY_INTRO) &&
-					in_array($user['page-flags'], [self::PAGE_NORMAL])) {
+					in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
 
 					notification([
 						'type'         => NOTIFY_INTRO,
@@ -1971,7 +2031,7 @@ class Contact extends BaseObject
 					]);
 
 				}
-			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
+			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
 				$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
 				DBA::update('contact', ['pending' => false], $condition);
 
@@ -2045,6 +2105,7 @@ class Contact extends BaseObject
 	 * Remove the unavailable contact ids from the provided list
 	 *
 	 * @param array $contact_ids Contact id list
+	 * @throws \Exception
 	 */
 	public static function pruneUnavailable(array &$contact_ids)
 	{
@@ -2069,16 +2130,18 @@ class Contact extends BaseObject
 	/**
 	 * @brief Returns a magic link to authenticate remote visitors
 	 *
-	 * @todo check if the return is either a fully qualified URL or a relative path to Friendica basedir
+	 * @todo  check if the return is either a fully qualified URL or a relative path to Friendica basedir
 	 *
 	 * @param string $contact_url The address of the target contact profile
-	 * @param string $url An url that we will be redirected to after the authentication
+	 * @param string $url         An url that we will be redirected to after the authentication
 	 *
 	 * @return string with "redir" link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function magicLink($contact_url, $url = '')
 	{
-		if (!local_user()) {
+		if (!local_user() && !remote_user()) {
 			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
 		}
 
@@ -2094,28 +2157,32 @@ class Contact extends BaseObject
 	 * @brief Returns a magic link to authenticate remote visitors
 	 *
 	 * @param integer $cid The contact id of the target contact profile
-	 * @param integer $url An url that we will be redirected to after the authentication
+	 * @param string  $url An url that we will be redirected to after the authentication
 	 *
 	 * @return string with "redir" link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function magicLinkbyId($cid, $url = '')
 	{
 		$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
 
 		return self::magicLinkbyContact($contact, $url);
-        }
+	}
 
 	/**
 	 * @brief Returns a magic link to authenticate remote visitors
 	 *
-	 * @param array $contact The contact array with "uid", "network" and "url"
-	 * @param string $url An url that we will be redirected to after the authentication
+	 * @param array  $contact The contact array with "uid", "network" and "url"
+	 * @param string $url     An url that we will be redirected to after the authentication
 	 *
 	 * @return string with "redir" link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function magicLinkbyContact($contact, $url = '')
 	{
-		if (!local_user() || ($contact['network'] != Protocol::DFRN)) {
+		if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
 			return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
 		}