]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Fetch data from the given contact number, if already present
[friendica.git] / src / Model / Contact.php
index 6d435c81c0b9e8ea431cb19416b10af1cc3ae11b..ecbf7411c323b6931c0413ea2f35a29fcec93879 100644 (file)
@@ -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    = 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_NORMAL    = 0;
-       const PAGE_SOAPBOX   = 1;
-       const PAGE_COMMUNITY = 2;
-       const PAGE_FREELOVE  = 3;
-       const PAGE_BLOG      = 4;
-       const PAGE_PRVGROUP  = 5;
+       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
         * @{
@@ -98,6 +109,79 @@ class Contact extends BaseObject
         * @}
         */
 
+       /**
+        * @param  integer       $id
+        * @return array|boolean Contact record if it exists, false otherwise
+        * @throws \Exception
+        */
+       public static function getById($id)
+       {
+               return DBA::selectFirst('contact', [], ['id' => $id]);
+       }
+
+       /**
+        * @brief Tests if the given contact is a follower
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @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)
+       {
+               if (self::isBlockedByUser($cid, $uid)) {
+                       return false;
+               }
+
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata['user'])) {
+                       return false;
+               }
+
+               $condition = ['id' => $cdata['user'], 'rel' => [self::FOLLOWER, self::FRIEND]];
+               return DBA::exists('contact', $condition);
+       }
+
+       /**
+        * @brief Get the basepath for a given contact link
+        * @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)
+       {
+               $data = Probe::uri($url);
+               if (!empty($data['baseurl'])) {
+                       return $data['baseurl'];
+               }
+
+               // When we can't probe the server, we use some ugly function that does some pattern matching
+               return PortableContact::detectServer($url);
+       }
+
+       /**
+        * Returns the public contact id of the given user id
+        *
+        * @param  integer $uid User ID
+        *
+        * @return integer|boolean Public contact id for given user id
+        * @throws Exception
+        */
+       public static function getPublicIdByUserId($uid)
+       {
+               $self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
+               if (!DBA::isResult($self)) {
+                       return false;
+               }
+               return self::getIdForURL($self['url'], 0, true);
+       }
+
        /**
         * @brief Returns the contact id for the user and the public contact id for a given contact id
         *
@@ -105,8 +189,10 @@ 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
         */
-       private static function getPublicAndUserContacID($cid, $uid)
+       public static function getPublicAndUserContacID($cid, $uid)
        {
                if (empty($uid) || empty($cid)) {
                        return [];
@@ -142,6 +228,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)
        {
@@ -155,6 +242,11 @@ class Contact extends BaseObject
                }
 
                DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+
+               if ($blocked) {
+                       // Blocked contact can't be in any group
+                       self::removeFromGroups($cid);
+               }
        }
 
        /**
@@ -164,6 +256,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)
        {
@@ -203,6 +296,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)
        {
@@ -225,6 +319,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)
        {
@@ -264,6 +359,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)
        {
@@ -282,6 +378,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)
        {
@@ -307,6 +405,7 @@ class Contact extends BaseObject
         *
         * @param int $gid
         * @return array
+        * @throws \Exception
         */
        public static function getByGroupId($gid)
        {
@@ -320,6 +419,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',
@@ -340,6 +440,7 @@ class Contact extends BaseObject
         *
         * @param int $gid
         * @return int
+        * @throws \Exception
         */
        public static function getOStatusCountByGroupId($gid)
        {
@@ -368,6 +469,7 @@ class Contact extends BaseObject
         *
         * @param int $uid
         * @return bool Operation success
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function createSelfFromUserId($uid)
        {
@@ -412,13 +514,15 @@ 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)
        {
                $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
-                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl'];
+                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl',
+                       'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
                if (!DBA::isResult($self)) {
                        return;
@@ -443,7 +547,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();
@@ -473,29 +577,32 @@ 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'];
                $fields['nurl'] = Strings::normaliseLink($fields['url']);
                $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
                $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname'];
-               $fields['notify'] = System::baseUrl() . '/dfrn_notify/'  . $user['nickname'];
-               $fields['poll'] = System::baseUrl() . '/dfrn_poll/'    . $user['nickname'];
+               $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname'];
+               $fields['poll'] = System::baseUrl() . '/dfrn_poll/'. $user['nickname'];
                $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
-               $fields['poco'] = System::baseUrl() . '/poco/'         . $user['nickname'];
+               $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname'];
 
                $update = false;
 
                foreach ($fields as $field => $content) {
-                       if (isset($self[$field]) && $self[$field] != $content) {
+                       if ($self[$field] != $content) {
                                $update = true;
                        }
                }
 
                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
@@ -513,6 +620,7 @@ class Contact extends BaseObject
         *
         * @param int $id contact id
         * @return null
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function remove($id)
        {
@@ -526,7 +634,7 @@ class Contact extends BaseObject
                DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
 
                // Delete it in the background
-               Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
+               Worker::add(PRIORITY_MEDIUM, 'RemoveContact', $id);
        }
 
        /**
@@ -536,9 +644,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])) {
@@ -559,7 +672,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']);
@@ -578,12 +691,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;
                        }
@@ -591,6 +705,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;
@@ -624,10 +740,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)
        {
@@ -639,9 +756,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;
                        }
@@ -653,7 +772,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);
                }
        }
@@ -669,6 +788,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 = [])
        {
@@ -740,7 +860,7 @@ class Contact extends BaseObject
 
                        // "bd" always contains the upcoming birthday of a contact.
                        // "birthday" might contain the birthday including the year of birth.
-                       if ($profile["birthday"] > '0001-01-01') {
+                       if ($profile["birthday"] > DBA::NULL_DATE) {
                                $bd_timestamp = strtotime($profile["birthday"]);
                                $month = date("m", $bd_timestamp);
                                $day = date("d", $bd_timestamp);
@@ -757,7 +877,7 @@ class Contact extends BaseObject
                                        $profile["bd"] = ( ++$current_year) . "-" . $month . "-" . $day;
                                }
                        } else {
-                               $profile["bd"] = '0001-01-01';
+                               $profile["bd"] = DBA::NULL_DATE;
                        }
                } else {
                        $profile = $default;
@@ -794,7 +914,7 @@ class Contact extends BaseObject
                        $profile["location"] = "";
                        $profile["about"] = "";
                        $profile["gender"] = "";
-                       $profile["birthday"] = '0001-01-01';
+                       $profile["birthday"] = DBA::NULL_DATE;
                }
 
                $cache[$url][$uid] = $profile;
@@ -811,11 +931,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 [];
                }
@@ -866,17 +986,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 = '';
 
@@ -902,7 +1019,7 @@ class Contact extends BaseObject
                $sparkle = false;
                if (($contact['network'] === Protocol::DFRN) && !$contact['self']) {
                        $sparkle = true;
-                       $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
+                       $profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url'];
                } else {
                        $profile_link = $contact['url'];
                }
@@ -912,9 +1029,9 @@ class Contact extends BaseObject
                }
 
                if ($sparkle) {
-                       $status_link = $profile_link . '?url=status';
-                       $photos_link = $profile_link . '?url=photos';
-                       $profile_link = $profile_link . '?url=profile';
+                       $status_link = $profile_link . '?tab=status';
+                       $photos_link = str_replace('/profile/', '/photos/', $profile_link);
+                       $profile_link = $profile_link . '?tab=profile';
                }
 
                if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
@@ -960,7 +1077,7 @@ class Contact extends BaseObject
 
                $args = ['contact' => $contact, 'menu' => &$menu];
 
-               Addon::callHooks('contact_photo_menu', $args);
+               Hook::callAll('contact_photo_menu', $args);
 
                $menucondensed = [];
 
@@ -979,11 +1096,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)
        {
@@ -991,6 +1106,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 (
@@ -1001,6 +1117,90 @@ class Contact extends BaseObject
                           )", intval($uid), intval($uid));
        }
 
+       /**
+        * 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)
+       {
+               // The link could be provided as http although we stored it as https
+               $ssl_url = str_replace('http://', 'https://', $url);
+
+               $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($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'];
+               $data = DBA::selectFirst('gcontact', $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)) {
+                       $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 [];
+       }
+
        /**
         * @brief Fetch the contact id for a given URL and user
         *
@@ -1026,6 +1226,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)
        {
@@ -1039,11 +1241,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'], ['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'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
                }
 
                // Then the alias (which could be anything)
@@ -1051,19 +1253,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'], $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 (!x($contact, 'avatar')) {
+                       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) {
+                               Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
+                       }
+
                        if (!$update_contact || $no_update) {
                                return $contact_id;
                        }
@@ -1072,19 +1280,13 @@ class Contact extends BaseObject
                        return 0;
                }
 
-               // When we don't want to update, we look if some of our users already know this contact
-               if ($no_update) {
-                       $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-                               'photo', 'keywords', 'location', 'about', 'network',
-                               'priority', 'batch', 'request', 'confirm', 'poco'];
-                       $data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-
-                       if (DBA::isResult($data)) {
-                               // For security reasons we don't fetch key data from our users
-                               $data["pubkey"] = '';
-                       }
+               // 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, $contact_id);
+                       $background_update = true;
                } else {
                        $data = [];
+                       $background_update = false;
                }
 
                if (empty($data)) {
@@ -1102,52 +1304,24 @@ class Contact extends BaseObject
                                return 0;
                        }
 
-                       // Get data from the gcontact table
-                       $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
-                       $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-                       if (!DBA::isResult($contact)) {
-                               $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-                       }
-
-                       if (!DBA::isResult($contact)) {
-                               $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-                                       'photo', 'keywords', 'location', 'about', 'network',
-                                       'priority', 'batch', 'request', 'confirm', 'poco'];
-                               $contact = DBA::selectFirst('contact', $fields, ['addr' => $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);
-                       }
-
-                       if (!DBA::isResult($contact)) {
-                               $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
-                                       'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
-                               $condition = ['url' => [$url, Strings::normaliseLink($url), $ssl_url]];
-                               $contact = DBA::selectFirst('fcontact', $fields, $condition);
+                       $contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default);
+                       if (empty($contact)) {
+                               return 0;
                        }
 
-                       if (!empty($default)) {
-                               $contact = $default;
-                       }
+                       $data = array_merge($data, $contact);
+               }
 
-                       if (!DBA::isResult($contact)) {
-                               return 0;
-                       } else {
-                               $data = array_merge($data, $contact);
-                       }
+               if (empty($data)) {
+                       return 0;
                }
 
                if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
                        $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
                }
 
-               $url = $data["url"];
                if (!$contact_id) {
-                       DBA::insert('contact', [
+                       $fields = [
                                'uid'       => $uid,
                                'created'   => DateTimeFormat::utcNow(),
                                'url'       => $data["url"],
@@ -1176,10 +1350,13 @@ class Contact extends BaseObject
                                'writable'  => 1,
                                'blocked'   => 0,
                                'readonly'  => 0,
-                               'pending'   => 0]
-                       );
+                               'pending'   => 0];
 
-                       $s = DBA::select('contact', ['id'], ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
+                       $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
+
+                       DBA::update('contact', $fields, $condition, true);
+
+                       $s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]);
                        $contacts = DBA::toArray($s);
                        if (!DBA::isResult($contacts)) {
                                return 0;
@@ -1187,6 +1364,11 @@ class Contact extends BaseObject
 
                        $contact_id = $contacts[0]["id"];
 
+                       // Update in the background when we fetched the data solely from the database
+                       if ($background_update) {
+                               Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
+                       }
+
                        // Update the newly created contact from data in the gcontact table
                        $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => Strings::normaliseLink($data["url"])]);
                        if (DBA::isResult($gcontact)) {
@@ -1204,8 +1386,10 @@ class Contact extends BaseObject
                        }
 
                        if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-                               DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
-                                       Strings::normaliseLink($data["url"]), $contact_id]);
+                               $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self`",
+                                       Strings::normaliseLink($data["url"]), 0, $contact_id];
+                               Logger::log('Deleting duplicate contact ' . json_encode($condition), Logger::DEBUG);
+                               DBA::delete('contact', $condition);
                        }
                }
 
@@ -1265,7 +1449,7 @@ class Contact extends BaseObject
                        $updated['name-date'] = DateTimeFormat::utcNow();
                }
 
-               $updated['avatar-date'] = DateTimeFormat::utcNow();
+               $updated['updated'] = DateTimeFormat::utcNow();
 
                DBA::update('contact', $updated, ['id' => $contact_id], $contact);
 
@@ -1278,6 +1462,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)
        {
@@ -1303,6 +1488,7 @@ class Contact extends BaseObject
         * @param int $cid contact id
         *
         * @return boolean Is the contact hidden?
+        * @throws \Exception
         */
        public static function isHidden($cid)
        {
@@ -1322,15 +1508,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)) {
@@ -1343,7 +1530,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,
@@ -1363,7 +1550,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);
 
@@ -1391,17 +1578,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.
@@ -1414,15 +1601,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;
 
@@ -1439,6 +1626,7 @@ class Contact extends BaseObject
         *
         * @param int $uid
         * @return bool
+        * @throws \Exception
         */
        public static function block($uid)
        {
@@ -1452,6 +1640,7 @@ class Contact extends BaseObject
         *
         * @param int $uid
         * @return bool
+        * @throws \Exception
         */
        public static function unblock($uid)
        {
@@ -1469,6 +1658,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)
        {
@@ -1507,25 +1698,35 @@ class Contact extends BaseObject
        /**
         * @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 \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function updateFromProbe($id, $network = '')
+       public static function updateFromProbe($id, $network = '', $force = false)
        {
                /*
                  Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
                  This will reliably kill your communication with Friendica contacts.
                 */
 
-               $fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
+               $fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify',
+                       'poll', 'request', 'confirm', 'poco', 'network', 'alias'];
                $contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
                if (!DBA::isResult($contact)) {
                        return false;
                }
 
-               $ret = Probe::uri($contact["url"], $network);
+               $uid = $contact['uid'];
+               unset($contact['uid']);
+
+               $contact['photo'] = $contact['avatar'];
+               unset($contact['avatar']);
 
-               // If Probe::uri fails the network code will be different
-               if (($ret["network"] != $contact["network"]) && !in_array($ret["network"], [Protocol::ACTIVITYPUB, $network])) {
+               $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'])) {
                        return false;
                }
 
@@ -1533,11 +1734,11 @@ class Contact extends BaseObject
 
                // make sure to not overwrite existing values with blank entries
                foreach ($ret as $key => $val) {
-                       if (isset($contact[$key]) && ($contact[$key] != "") && ($val == "")) {
+                       if (!isset($contact[$key])) {
+                               unset($ret[$key]);
+                       } elseif (($contact[$key] != '') && ($val == '')) {
                                $ret[$key] = $contact[$key];
-                       }
-
-                       if (isset($contact[$key]) && ($ret[$key] != $contact[$key])) {
+                       } elseif ($ret[$key] != $contact[$key]) {
                                $update = true;
                        }
                }
@@ -1546,20 +1747,13 @@ class Contact extends BaseObject
                        return true;
                }
 
-               DBA::update(
-                       'contact', [
-                               'url'     => $ret['url'],
-                               'nurl'    => Strings::normaliseLink($ret['url']),
-                               'network' => $ret['network'],
-                               'addr'    => $ret['addr'],
-                               'alias'   => $ret['alias'],
-                               'batch'   => $ret['batch'],
-                               'notify'  => $ret['notify'],
-                               'poll'    => $ret['poll'],
-                               'poco'    => $ret['poco']
-                       ],
-                       ['id' => $id]
-               );
+               $ret['nurl'] = Strings::normaliseLink($ret['url']);
+               $ret['updated'] = DateTimeFormat::utcNow();
+
+               self::updateAvatar($ret['photo'], $uid, $id, true);
+
+               unset($ret['photo']);
+               DBA::update('contact', $ret, ['id' => $id]);
 
                // Update the corresponding gcontact entry
                PortableContact::lastUpdated($ret["url"]);
@@ -1583,13 +1777,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);
@@ -1618,7 +1814,7 @@ class Contact extends BaseObject
                        return $result;
                }
 
-               if (x($arr['contact'], 'name')) {
+               if (!empty($arr['contact']['name'])) {
                        $ret = $arr['contact'];
                } else {
                        $ret = Probe::uri($url, $network, $uid, false);
@@ -1654,7 +1850,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;
                }
 
@@ -1664,16 +1860,15 @@ class Contact extends BaseObject
                }
 
                // do we have enough information?
-
-               if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
+               if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
                        $result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
-                       if (!x($ret, 'poll')) {
+                       if (empty($ret['poll'])) {
                                $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        }
-                       if (!x($ret, 'name')) {
+                       if (empty($ret['name'])) {
                                $result['message'] .= L10n::t('An author or name was not found.') . EOL;
                        }
-                       if (!x($ret, 'url')) {
+                       if (empty($ret['url'])) {
                                $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
                        }
                        if (strpos($url, '@') !== false) {
@@ -1698,6 +1893,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;
                }
@@ -1733,7 +1930,7 @@ class Contact extends BaseObject
                                'hidden'  => $hidden,
                                'blocked' => 0,
                                'readonly'=> 0,
-                               'pending' => 0,
+                               'pending' => $pending,
                                'subhub'  => $subhub
                        ]);
                }
@@ -1779,7 +1976,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);
                        }
                }
@@ -1791,10 +1994,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)
        {
@@ -1893,7 +2097,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();
 
@@ -1906,7 +2110,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,
@@ -1924,7 +2128,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);
 
@@ -1962,44 +2166,33 @@ class Contact extends BaseObject
         */
        public static function updateBirthdays()
        {
-               // This only handles foreign or alien networks where a birthday has been provided.
-               // In-network birthdays are handled within local_delivery
-
-               $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               Logger::log('update_contact_birthday: ' . $rr['bd']);
-
-                               $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4);
-
-                               /*
-                                * Add new birthday event for this person
-                                *
-                                * $bdtext is just a readable placeholder in case the event is shared
-                                * with others. We will replace it during presentation to our $importer
-                                * to contain a sparkle link and perhaps a photo.
-                                */
-
-                               // Check for duplicates
-                               $condition = ['uid' => $rr['uid'], 'cid' => $rr['id'],
-                                       'start' => DateTimeFormat::utc($nextbd), 'type' => 'birthday'];
-                               if (DBA::exists('event', $condition)) {
-                                       continue;
-                               }
-
-                               $bdtext = L10n::t('%s\'s birthday', $rr['name']);
-                               $bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]');
-
-                               q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
-                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
-                                       DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utc($nextbd)),
-                                       DBA::escape(DateTimeFormat::utc($nextbd . ' + 1 day ')), DBA::escape($bdtext), DBA::escape($bdtext2), DBA::escape('birthday'),
-                                       intval(0)
-                               );
-
+               $condition = [
+                       '`bd` != ""
+                       AND `bd` > "0001-01-01"
+                       AND SUBSTRING(`bd`, 1, 4) != `bdyear`
+                       AND (`contact`.`rel` = ? OR `contact`.`rel` = ?)
+                       AND NOT `contact`.`pending`
+                       AND NOT `contact`.`hidden`
+                       AND NOT `contact`.`blocked`
+                       AND NOT `contact`.`archive`
+                       AND NOT `contact`.`deleted`',
+                       Contact::SHARING,
+                       Contact::FRIEND
+               ];
+
+               $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
+
+               while ($contact = DBA::fetch($contacts)) {
+                       Logger::log('update_contact_birthday: ' . $contact['bd']);
+
+                       $nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);
+
+                       if (Event::createBirthday($contact, $nextbd)) {
                                // update bdyear
-                               q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
-                                       DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])
+                               DBA::update(
+                                       'contact',
+                                       ['bdyear' => substr($nextbd, 0, 4), 'bd' => $nextbd],
+                                       ['id' => $contact['id']]
                                );
                        }
                }
@@ -2009,6 +2202,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)
        {
@@ -2033,15 +2227,21 @@ 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() && !remote_user()) {
+                       return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
+               }
+
                $cid = self::getIdForURL($contact_url, 0, true);
                if (empty($cid)) {
                        return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
@@ -2054,28 +2254,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);
-        }
+               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 = '')
+       public static function magicLinkByContact($contact, $url = '')
        {
-               if ($contact['network'] != Protocol::DFRN) {
+               if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
                        return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
                }
 
@@ -2096,4 +2300,36 @@ class Contact extends BaseObject
 
                return $redirect;
        }
+
+       /**
+        * Remove a contact from all groups
+        *
+        * @param integer $contact_id
+        *
+        * @return boolean Success
+        */
+       public static function removeFromGroups($contact_id)
+       {
+               return DBA::delete('group_member', ['contact-id' => $contact_id]);
+       }
+
+       /**
+        * Is the contact a forum?
+        *
+        * @param integer $contactid ID of the contact
+        *
+        * @return boolean "true" if it is a forum
+        */
+       public static function isForum($contactid)
+       {
+               $fields = ['forum', 'prv'];
+               $condition = ['id' => $contactid];
+               $contact = DBA::selectFirst('contact', $fields, $condition);
+               if (!DBA::isResult($contact)) {
+                       return false;
+               }
+
+               // Is it a forum?
+               return ($contact['forum'] || $contact['prv']);
+       }
 }