]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Funkwhale context file moved
[friendica.git] / src / Model / Contact.php
index 2e7d4b68b586332b0a31e1a29f1278aa5b3a36c0..a6bb882e8652c8ea0496656ba39a310ba8cbe087 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,8 @@
 
 namespace Friendica\Model;
 
-use Friendica\App\BaseURL;
+use Friendica\Contact\Avatar;
+use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
@@ -34,13 +35,11 @@ use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Module\NoScrape;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\OStatus;
-use Friendica\Protocol\Salmon;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
@@ -56,36 +55,6 @@ class Contact
        const DEFAULT_AVATAR_THUMB = '/images/person-80.jpg';
        const DEFAULT_AVATAR_MICRO = '/images/person-48.jpg';
 
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_NORMAL
-        */
-       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;
        /**
         * @}
         */
@@ -150,7 +119,7 @@ class Contact
         * @return array
         * @throws \Exception
         */
-       public static function selectToArray(array $fields = [], array $condition = [], array $params = [])
+       public static function selectToArray(array $fields = [], array $condition = [], array $params = []): array
        {
                return DBA::selectToArray('contact', $fields, $condition, $params);
        }
@@ -159,7 +128,7 @@ class Contact
         * @param array $fields    Array of selected fields, empty for all
         * @param array $condition Array of fields for condition
         * @param array $params    Array of several parameters
-        * @return array
+        * @return array|bool
         * @throws \Exception
         */
        public static function selectFirst(array $fields = [], array $condition = [], array $params = [])
@@ -179,7 +148,7 @@ class Contact
         * @return int  id of the created contact
         * @throws \Exception
         */
-       public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT)
+       public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT): int
        {
                if (!empty($fields['baseurl']) && empty($fields['gsid'])) {
                        $fields['gsid'] = GServer::getID($fields['baseurl'], true);
@@ -218,6 +187,7 @@ class Contact
         *
         * @return boolean was the update successfull?
         * @throws \Exception
+        * @todo Let's get rid of boolean type of $old_fields
         */
        public static function update(array $fields, array $condition, $old_fields = [])
        {
@@ -235,11 +205,24 @@ class Contact
         * @return array|boolean Contact record if it exists, false otherwise
         * @throws \Exception
         */
-       public static function getById($id, $fields = [])
+       public static function getById(int $id, array $fields = [])
        {
                return DBA::selectFirst('contact', $fields, ['id' => $id]);
        }
 
+       /**
+        * Fetch the first contact with the provided uri-id.
+        *
+        * @param integer $uri_id uri-id of the contact
+        * @param array   $fields Array of selected fields, empty for all
+        * @return array|boolean Contact record if it exists, false otherwise
+        * @throws \Exception
+        */
+       public static function getByUriId(int $uri_id, array $fields = [])
+       {
+               return DBA::selectFirst('contact', $fields, ['uri-id' => $uri_id], ['order' => ['uid']]);
+       }
+
        /**
         * Fetches a contact by a given url
         *
@@ -249,7 +232,7 @@ class Contact
         * @param integer $uid    User ID of the contact
         * @return array contact array
         */
-       public static function getByURL(string $url, $update = null, array $fields = [], int $uid = 0)
+       public static function getByURL(string $url, $update = null, array $fields = [], int $uid = 0): array
        {
                if ($update || is_null($update)) {
                        $cid = self::getIdForURL($url, $uid, $update);
@@ -320,7 +303,7 @@ class Contact
         * @param array   $fields Field list
         * @return array contact array
         */
-       public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = [])
+       public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = []): array
        {
                if ($uid != 0) {
                        $contact = self::getByURL($url, $update, $fields, $uid);
@@ -351,7 +334,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function isFollower($cid, $uid)
+       public static function isFollower(int $cid, int $uid): bool
        {
                if (Contact\User::isBlocked($cid, $uid)) {
                        return false;
@@ -376,7 +359,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function isFollowerByURL($url, $uid)
+       public static function isFollowerByURL(string $url, int $uid): bool
        {
                $cid = self::getIdForURL($url, $uid);
 
@@ -388,16 +371,16 @@ class Contact
        }
 
        /**
-        * Tests if the given user follow the given contact
+        * Tests if the given user shares with the given contact
         *
         * @param int $cid Either public contact id or user's contact id
         * @param int $uid User ID
         *
-        * @return boolean is the contact url being followed?
+        * @return boolean is the contact sharing with given user?
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function isSharing($cid, $uid)
+       public static function isSharing(int $cid, int $uid): bool
        {
                if (Contact\User::isBlocked($cid, $uid)) {
                        return false;
@@ -422,7 +405,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function isSharingByURL($url, $uid)
+       public static function isSharingByURL(string $url, int $uid): bool
        {
                $cid = self::getIdForURL($url, $uid);
 
@@ -443,7 +426,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getBasepath($url, $dont_update = false)
+       public static function getBasepath(string $url, bool $dont_update = false): string
        {
                $contact = DBA::selectFirst('contact', ['id', 'baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
                if (!DBA::isResult($contact)) {
@@ -477,7 +460,7 @@ class Contact
         *
         * @return boolean Is it the same server?
         */
-       public static function isLocal($url)
+       public static function isLocal(string $url): bool
        {
                if (!parse_url($url, PHP_URL_SCHEME)) {
                        $addr_parts = explode('@', $url);
@@ -491,10 +474,9 @@ class Contact
         * Check if the given contact ID is on the same server
         *
         * @param string $url The contact link
-        *
         * @return boolean Is it the same server?
         */
-       public static function isLocalById(int $cid)
+       public static function isLocalById(int $cid): bool
        {
                $contact = DBA::selectFirst('contact', ['url', 'baseurl'], ['id' => $cid]);
                if (!DBA::isResult($contact)) {
@@ -518,7 +500,7 @@ class Contact
         * @return integer|boolean Public contact id for given user id
         * @throws \Exception
         */
-       public static function getPublicIdByUserId($uid)
+       public static function getPublicIdByUserId(int $uid)
        {
                $self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
                if (!DBA::isResult($self)) {
@@ -537,7 +519,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getPublicAndUserContactID($cid, $uid)
+       public static function getPublicAndUserContactID(int $cid, int $uid): array
        {
                // We have to use the legacy function as long as the post update hasn't finished
                if (DI::config()->get('system', 'post_update_version') < 1427) {
@@ -573,12 +555,11 @@ class Contact
         *
         * @param int $cid Either public contact id or user's contact id
         * @param int $uid User ID
-        *
         * @return array with public and user's contact id
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function legacyGetPublicAndUserContactID($cid, $uid)
+       private static function legacyGetPublicAndUserContactID(int $cid, int $uid): array
        {
                if (empty($uid) || empty($cid)) {
                        return [];
@@ -614,12 +595,11 @@ class Contact
         * @param int $cid A contact ID
         * @param int $uid The User ID
         * @param array $fields The selected fields for the contact
-        *
         * @return array The contact details
         *
         * @throws \Exception
         */
-       public static function getContactForUser($cid, $uid, array $fields = [])
+       public static function getContactForUser(int $cid, int $uid, array $fields = []): array
        {
                $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => $uid]);
 
@@ -637,7 +617,7 @@ class Contact
         * @return bool Operation success
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function createSelfFromUserId($uid)
+       public static function createSelfFromUserId(int $uid): bool
        {
                $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'],
                        ['uid' => $uid, 'account_expired' => false]);
@@ -653,9 +633,9 @@ class Contact
                        'nick'        => $user['nickname'],
                        'pubkey'      => $user['pubkey'],
                        'prvkey'      => $user['prvkey'],
-                       'photo'       => User::getAvatarUrlForId($user['uid']),
-                       'thumb'       => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_THUMB),
-                       'micro'       => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_MICRO),
+                       'photo'       => User::getAvatarUrl($user),
+                       'thumb'       => User::getAvatarUrl($user, Proxy::SIZE_THUMB),
+                       'micro'       => User::getAvatarUrl($user, Proxy::SIZE_MICRO),
                        'blocked'     => 0,
                        'pending'     => 0,
                        'url'         => DI::baseUrl() . '/profile/' . $user['nickname'],
@@ -694,22 +674,22 @@ class Contact
        /**
         * Updates the self-contact for the provided user id
         *
-        * @param int     $uid
-        * @param boolean $update_avatar Force the avatar update
-        * @return bool   "true" if updated
+        * @param int   $uid
+        * @param bool  $update_avatar Force the avatar update
+        * @return bool "true" if updated
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function updateSelfFromUserID($uid, $update_avatar = false)
+       public static function updateSelfFromUserID(int $uid, bool $update_avatar = false): bool
        {
-               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
+               $fields = ['id', 'uri-id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve',
                        'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
-                       'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
+                       'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
                if (!DBA::isResult($self)) {
                        return false;
                }
 
-               $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
+               $fields = ['uid', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
                $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
                if (!DBA::isResult($user)) {
                        return false;
@@ -733,6 +713,7 @@ class Contact
                // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
                $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname'];
                $fields['nurl'] = Strings::normaliseLink($fields['url']);
+               $fields['uri-id'] = ItemURI::getIdByURI($fields['url']);
                $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
                $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname'];
                $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname'];
@@ -768,10 +749,12 @@ class Contact
                        $fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO);
                }
 
-               $fields['avatar'] = User::getAvatarUrlForId($uid);
+               $fields['avatar'] = User::getAvatarUrl($user);
+               $fields['header'] = User::getBannerUrl($user);
                $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
                $fields['unsearchable'] = !$profile['net-publish'];
+               $fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
 
                $update = false;
 
@@ -788,15 +771,15 @@ class Contact
                        $fields['updated'] = DateTimeFormat::utcNow();
                        self::update($fields, ['id' => $self['id']]);
 
-                       // Update the public contact as well
-                       $fields['prvkey'] = null;
-                       $fields['self']   = false;
-                       self::update($fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+                       // Update the other contacts as well
+                       unset($fields['prvkey']);
+                       $fields['self'] = false;
+                       self::update($fields, ['uri-id' => $self['uri-id'], 'self' => false]);
 
                        // Update the profile
                        $fields = [
-                               'photo' => User::getAvatarUrlForId($uid),
-                               'thumb' => User::getAvatarUrlForId($uid, Proxy::SIZE_THUMB)
+                               'photo' => User::getAvatarUrl($user),
+                               'thumb' => User::getAvatarUrl($user, Proxy::SIZE_THUMB)
                        ];
 
                        DBA::update('profile', $fields, ['uid' => $uid]);
@@ -809,55 +792,69 @@ class Contact
         * Marks a contact for removal
         *
         * @param int $id contact id
+        * @return void
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function remove($id)
+       public static function remove(int $id)
        {
                // We want just to make sure that we don't delete our "self" contact
-               $contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
+               $contact = DBA::selectFirst('contact', ['uri-id', 'photo', 'thumb', 'micro', 'uid'], ['id' => $id, 'self' => false]);
                if (!DBA::isResult($contact)) {
                        return;
                }
 
+               self::clearFollowerFollowingEndpointCache($contact['uid']);
+
                // Archive the contact
                self::update(['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
 
+               if (!DBA::exists('contact', ['uri-id' => $contact['uri-id'], 'deleted' => false])) {
+                       Avatar::deleteCache($contact);
+               }
+
                // Delete it in the background
-               Worker::add(PRIORITY_MEDIUM, 'RemoveContact', $id);
+               Worker::add(PRIORITY_MEDIUM, 'Contact\Remove', $id);
        }
 
        /**
-        * Sends an unfriend message. Removes the contact for two-way unfriending or sharing only protocols (feed an mail)
+        * Unfollow the remote contact
         *
-        * @param array   $user    User unfriending
-        * @param array   $contact Contact unfriended
-        * @param boolean $two_way Revoke eventual inbound follow as well
-        * @return bool|null true if successful, false if not, null if no action was performed
+        * @param array $contact Target user-specific contact (uid != 0) array
+        * @return void
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function terminateFriendship(array $user, array $contact, bool $two_way = false): bool
+       public static function unfollow(array $contact): void
        {
-               $result = Protocol::terminateFriendship($user, $contact, $two_way);
+               if (empty($contact['network'])) {
+                       throw new \InvalidArgumentException('Empty network in contact array');
+               }
 
-               if ($two_way || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
-                       self::remove($contact['id']);
-               } else {
-                       self::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+               if (empty($contact['uid'])) {
+                       throw new \InvalidArgumentException('Unexpected public contact record');
                }
 
-               return $result;
+               if (in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
+                       $cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']);
+                       if (!empty($cdata['public'])) {
+                               Worker::add(PRIORITY_HIGH, 'Contact\Unfollow', $cdata['public'], $contact['uid']);
+                       }
+               }
+
+               self::removeSharer($contact);
        }
 
        /**
         * Revoke follow privileges of the remote user contact
         *
-        * @param array   $contact  Contact unfriended
-        * @return bool|null Whether the remote operation is successful or null if no remote operation was performed
+        * The local relationship is updated immediately, the eventual remote server is messaged in the background.
+        *
+        * @param array $contact User-specific contact array (uid != 0) to revoke the follow from
+        * @return void
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function revokeFollow(array $contact): bool
+       public static function revokeFollow(array $contact): void
        {
                if (empty($contact['network'])) {
                        throw new \InvalidArgumentException('Empty network in contact array');
@@ -867,17 +864,57 @@ class Contact
                        throw new \InvalidArgumentException('Unexpected public contact record');
                }
 
-               $result = Protocol::revokeFollow($contact);
+               if (in_array($contact['rel'], [self::FOLLOWER, self::FRIEND])) {
+                       $cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']);
+                       if (!empty($cdata['public'])) {
+                               Worker::add(PRIORITY_HIGH, 'Contact\RevokeFollow', $cdata['public'], $contact['uid']);
+                       }
+               }
 
-               // A null value here means the remote network doesn't support explicit follow revocation, we can still
-               // break the locally recorded relationship
-               if ($result !== false) {
-                       DBA::update('contact', ['rel' => $contact['rel'] == self::FRIEND ? self::SHARING : self::NOTHING], ['id' => $contact['id']]);
+               self::removeFollower($contact);
+       }
+
+       /**
+        * Completely severs a relationship with a contact
+        *
+        * @param array $contact User-specific contact (uid != 0) array
+        * @return void
+        * @throws HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function terminateFriendship(array $contact)
+       {
+               if (empty($contact['network'])) {
+                       throw new \InvalidArgumentException('Empty network in contact array');
                }
 
-               return $result;
+               if (empty($contact['uid'])) {
+                       throw new \InvalidArgumentException('Unexpected public contact record');
+               }
+
+               $cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']);
+
+               if (in_array($contact['rel'], [self::SHARING, self::FRIEND]) && !empty($cdata['public'])) {
+                       Worker::add(PRIORITY_HIGH, 'Contact\Unfollow', $cdata['public'], $contact['uid']);
+               }
+
+               if (in_array($contact['rel'], [self::FOLLOWER, self::FRIEND]) && !empty($cdata['public'])) {
+                       Worker::add(PRIORITY_HIGH, 'Contact\RevokeFollow', $cdata['public'], $contact['uid']);
+               }
+
+               self::remove($contact['id']);
        }
 
+       private static function clearFollowerFollowingEndpointCache(int $uid)
+       {
+               if (empty($uid)) {
+                       return;
+               }
+
+               DI::cache()->delete(ActivityPub\Transmitter::CACHEKEY_CONTACTS . 'followers:' . $uid);
+               DI::cache()->delete(ActivityPub\Transmitter::CACHEKEY_CONTACTS . 'following:' . $uid);
+               DI::cache()->delete(NoScrape::CACHEKEY . $uid);
+       }
 
        /**
         * Marks a contact for archival after a communication issue delay
@@ -889,7 +926,7 @@ class Contact
         * up or some other transient event and that there's a possibility we could recover from it.
         *
         * @param array $contact contact to mark for archival
-        * @return null
+        * @return void
         * @throws HTTPException\InternalServerErrorException
         */
        public static function markForArchival(array $contact)
@@ -942,7 +979,7 @@ class Contact
         * @see   Contact::markForArchival()
         *
         * @param array $contact contact to be unmarked for archival
-        * @return null
+        * @return void
         * @throws \Exception
         */
        public static function unmarkForArchival(array $contact)
@@ -989,12 +1026,11 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function photoMenu(array $contact, $uid = 0)
+       public static function photoMenu(array $contact, int $uid = 0): array
        {
                $pm_url = '';
                $status_link = '';
                $photos_link = '';
-               $contact_drop_link = '';
                $poke_link = '';
 
                if ($uid == 0) {
@@ -1046,10 +1082,6 @@ class Contact
 
                $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
 
-               if (!$contact['self']) {
-                       $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
-               }
-
                $follow_link = '';
                $unfollow_link = '';
                if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
@@ -1060,10 +1092,6 @@ class Contact
                        }
                }
 
-               if (!empty($follow_link) || !empty($unfollow_link)) {
-                       $contact_drop_link = '';
-               }
-
                /**
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
@@ -1083,7 +1111,6 @@ class Contact
                                'photos'  => [DI::l10n()->t('View Photos')   , $photos_link      , true],
                                'network' => [DI::l10n()->t('Network Posts') , $posts_link       , false],
                                'edit'    => [DI::l10n()->t('View Contact')  , $contact_url      , false],
-                               'drop'    => [DI::l10n()->t('Drop Contact')  , $contact_drop_link, false],
                                'pm'      => [DI::l10n()->t('Send PM')       , $pm_url           , false],
                                'poke'    => [DI::l10n()->t('Poke')          , $poke_link        , false],
                                'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link      , true],
@@ -1091,9 +1118,11 @@ class Contact
                        ];
 
                        if (!empty($contact['pending'])) {
-                               $intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]);
-                               if (DBA::isResult($intro)) {
-                                       $menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro['id'], true];
+                               try {
+                                       $intro = DI::intro()->selectForContact($contact['id']);
+                                       $menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro->id, true];
+                               } catch (IntroductionNotFoundException $exception) {
+                                       DI::logger()->error('Pending contact doesn\'t have an introduction.', ['exception' => $exception]);
                                }
                        }
                }
@@ -1140,11 +1169,11 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getIdForURL($url, $uid = 0, $update = null, $default = [])
+       public static function getIdForURL(string $url = null, int $uid = 0, $update = null, array $default = []): int
        {
                $contact_id = 0;
 
-               if ($url == '') {
+               if (empty($url)) {
                        Logger::notice('Empty url, quitting', ['url' => $url, 'user' => $uid, 'default' => $default]);
                        return 0;
                }
@@ -1152,7 +1181,7 @@ class Contact
                $contact = self::getByURL($url, false, ['id', 'network', 'uri-id'], $uid);
 
                if (!empty($contact)) {
-                       $contact_id = $contact["id"];
+                       $contact_id = $contact['id'];
 
                        if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) {
                                Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
@@ -1169,10 +1198,10 @@ class Contact
                $data = [];
 
                if (empty($default['network']) || $update) {
-                       $data = Probe::uri($url, "", $uid);
+                       $data = Probe::uri($url, '', $uid);
 
                        // Take the default values when probing failed
-                       if (!empty($default) && !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
+                       if (!empty($default) && !in_array($data['network'], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
                                $data = array_merge($data, $default);
                        }
                } elseif (!empty($default['network'])) {
@@ -1261,6 +1290,10 @@ class Contact
                        Logger::info('Contact will be updated', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
                }
 
+               if ($data['network'] == Protocol::DIASPORA) {
+                       FContact::updateFromProbeArray($data);
+               }
+
                self::updateFromProbeArray($contact_id, $data);
 
                // Don't return a number for a deleted account
@@ -1280,7 +1313,7 @@ class Contact
         * @return boolean Is the contact archived?
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function isArchived(int $cid)
+       public static function isArchived(int $cid): bool
        {
                if ($cid == 0) {
                        return false;
@@ -1320,11 +1353,10 @@ class Contact
         * Checks if the contact is blocked
         *
         * @param int $cid contact id
-        *
         * @return boolean Is the contact blocked?
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function isBlocked($cid)
+       public static function isBlocked(int $cid): bool
        {
                if ($cid == 0) {
                        return false;
@@ -1346,11 +1378,10 @@ class Contact
         * Checks if the contact is hidden
         *
         * @param int $cid contact id
-        *
         * @return boolean Is the contact hidden?
         * @throws \Exception
         */
-       public static function isHidden($cid)
+       public static function isHidden(int $cid): bool
        {
                if ($cid == 0) {
                        return false;
@@ -1370,12 +1401,13 @@ class Contact
         * @param bool   $thread_mode
         * @param int    $update      Update mode
         * @param int    $parent      Item parent ID for the update mode
+        * @param bool   $only_media  Only display media content
         * @return string posts in HTML
         * @throws \Exception
         */
-       public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0)
+       public static function getPostsFromUrl(string $contact_url, bool $thread_mode = false, int $update = 0, int $parent = 0, bool $only_media = false): string
        {
-               return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent);
+               return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent, $only_media);
        }
 
        /**
@@ -1384,14 +1416,13 @@ class Contact
         * @param int  $cid         Contact ID
         * @param bool $thread_mode
         * @param int  $update      Update mode
-        * @param int  $parent     Item parent ID for the update mode
+        * @param int  $parent      Item parent ID for the update mode
+        * @param bool $only_media  Only display media content
         * @return string posts in HTML
         * @throws \Exception
         */
-       public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0)
+       public static function getPostsFromId(int $cid, bool $thread_mode = false, int $update = 0, int $parent = 0, bool $only_media = false): string
        {
-               $a = DI::app();
-
                $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
                if (!DBA::isResult($contact)) {
                        return '';
@@ -1422,6 +1453,11 @@ class Contact
                        }
                }
 
+               if ($only_media) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+                               Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]);
+               }
+
                if (DI::mode()->isMobile()) {
                        $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
                                DI::config()->get('system', 'itemspage_network_mobile'));
@@ -1442,11 +1478,31 @@ class Contact
                }
 
                if ($thread_mode) {
-                       $items = Post::toArray(Post::selectForUser(local_user(), ['uri-id', 'gravity', 'parent-uri-id', 'thr-parent-id', 'author-id'], $condition, $params));
+                       $fields = ['uri-id', 'thr-parent-id', 'gravity', 'author-id', 'commented'];
+                       $items = Post::toArray(Post::selectForUser(local_user(), $fields, $condition, $params));
+
+                       if ($pager->getStart() == 0) {
+                               $cdata = self::getPublicAndUserContactID($cid, local_user());
+                               if (!empty($cdata['public'])) {
+                                       $pinned = Post\Collection::selectToArrayForContact($cdata['public'], Post\Collection::FEATURED, $fields);
+                                       $items = array_merge($items, $pinned);
+                               }
+                       }
 
-                       $o .= DI::conversation()->create($items, 'contacts', $update, false, 'commented', local_user());
+                       $o .= DI::conversation()->create($items, 'contacts', $update, false, 'pinned_commented', local_user());
                } else {
-                       $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
+                       $fields = array_merge(Item::DISPLAY_FIELDLIST, ['featured']);
+                       $items = Post::toArray(Post::selectForUser(local_user(), $fields, $condition, $params));
+
+                       if ($pager->getStart() == 0) {
+                               $cdata = self::getPublicAndUserContactID($cid, local_user());
+                               if (!empty($cdata['public'])) {
+                                       $condition = ["`uri-id` IN (SELECT `uri-id` FROM `collection-view` WHERE `cid` = ? AND `type` = ?)",
+                                               $cdata['public'], Post\Collection::FEATURED];
+                                       $pinned = Post::toArray(Post::selectForUser(local_user(), $fields, $condition, $params));
+                                       $items = array_merge($pinned, $items);
+                               }
+                       }
 
                        $o .= DI::conversation()->create($items, 'contact-posts', $update);
                }
@@ -1467,34 +1523,11 @@ class Contact
         *
         * The function can be called with either the user or the contact array
         *
-        * @param array $contact contact or user array
+        * @param int $type type of contact or account
         * @return string
         */
-       public static function getAccountType(array $contact)
-       {
-               // 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 User::PAGE_FLAGS_COMMUNITY and 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::TYPE_COMMUNITY;
-               } else {
-                       $type = self::TYPE_PERSON;
-               }
-
-               // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
-               if (isset($contact["contact-type"])) {
-                       $type = $contact["contact-type"];
-               }
-
-               if (isset($contact["account-type"])) {
-                       $type = $contact["account-type"];
-               }
-
+       public static function getAccountType(int $type): string
+       {
                switch ($type) {
                        case self::TYPE_ORGANISATION:
                                $account_type = DI::l10n()->t("Organisation");
@@ -1519,11 +1552,11 @@ class Contact
        /**
         * Blocks a contact
         *
-        * @param int $cid
-        * @return bool
-        * @throws \Exception
+        * @param int $cid Contact id to block
+        * @param string $reason Block reason
+        * @return bool Whether it was successful
         */
-       public static function block($cid, $reason = null)
+       public static function block(int $cid, string $reason = null): bool
        {
                $return = self::update(['blocked' => true, 'block_reason' => $reason], ['id' => $cid]);
 
@@ -1533,11 +1566,10 @@ class Contact
        /**
         * Unblocks a contact
         *
-        * @param int $cid
-        * @return bool
-        * @throws \Exception
+        * @param int $cid Contact id to unblock
+        * @return bool Whether it was successfull
         */
-       public static function unblock($cid)
+       public static function unblock(int $cid): bool
        {
                $return = self::update(['blocked' => false, 'block_reason' => null], ['id' => $cid]);
 
@@ -1547,22 +1579,34 @@ class Contact
        /**
         * Ensure that cached avatar exist
         *
-        * @param integer $cid
+        * @param integer $cid Contact id
         */
        public static function checkAvatarCache(int $cid)
        {
-               $contact = DBA::selectFirst('contact', ['url', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
+               $contact = DBA::selectFirst('contact', ['url', 'network', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
                if (!DBA::isResult($contact)) {
                        return;
                }
 
-               if (empty($contact['avatar']) || (!empty($contact['photo']) && !empty($contact['thumb']) && !empty($contact['micro']))) {
+               if (Network::isLocalLink($contact['url'])) {
                        return;
                }
 
-               Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
-
-               self::updateAvatar($cid, $contact['avatar'], true);
+               if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+                       if (!empty($contact['avatar']) && (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']))) {
+                               Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+                               self::updateAvatar($cid, $contact['avatar'], true);
+                               return;
+                       }
+               } elseif (Photo::isPhotoURI($contact['photo']) || Photo::isPhotoURI($contact['thumb']) || Photo::isPhotoURI($contact['micro'])) {
+                       Logger::info('Replacing legacy avatar cache', ['id' => $cid, 'contact' => $contact]);
+                       self::updateAvatar($cid, $contact['avatar'], true);
+                       return;
+               } elseif (DI::config()->get('system', 'avatar_cache') && (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']))) {
+                       Logger::info('Adding avatar cache file', ['id' => $cid, 'contact' => $contact]);
+                       self::updateAvatar($cid, $contact['avatar'], true);
+               return;
+               }
        }
 
        /**
@@ -1575,9 +1619,30 @@ class Contact
         * @param bool  $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       private static function getAvatarPath(array $contact, string $size, $no_update = false)
+       private static function getAvatarPath(array $contact, string $size, bool $no_update = false): string
        {
                $contact = self::checkAvatarCacheByArray($contact, $no_update);
+
+               if (DI::config()->get('system', 'avatar_cache')) {
+                       switch ($size) {
+                               case Proxy::SIZE_MICRO:
+                                       if (!empty($contact['micro']) && !Photo::isPhotoURI($contact['micro'])) {
+                                               return $contact['micro'];
+                                       }
+                                       break;
+                               case Proxy::SIZE_THUMB:
+                                       if (!empty($contact['thumb']) && !Photo::isPhotoURI($contact['thumb'])) {
+                                               return $contact['thumb'];
+                                       }
+                                       break;
+                               case Proxy::SIZE_SMALL:
+                                       if (!empty($contact['photo']) && !Photo::isPhotoURI($contact['photo'])) {
+                                               return $contact['photo'];
+                                       }
+                                       break;
+                       }
+               }
+
                return self::getAvatarUrlForId($contact['id'], $size, $contact['updated'] ?? '');
        }
 
@@ -1588,7 +1653,7 @@ class Contact
         * @param bool   $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       public static function getPhoto(array $contact, bool $no_update = false)
+       public static function getPhoto(array $contact, bool $no_update = false): string
        {
                return self::getAvatarPath($contact, Proxy::SIZE_SMALL, $no_update);
        }
@@ -1600,7 +1665,7 @@ class Contact
         * @param bool   $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       public static function getThumb(array $contact, bool $no_update = false)
+       public static function getThumb(array $contact, bool $no_update = false): string
        {
                return self::getAvatarPath($contact, Proxy::SIZE_THUMB, $no_update);
        }
@@ -1612,7 +1677,7 @@ class Contact
         * @param bool   $no_update Don't perfom an update if no cached avatar was found
         * @return string photo path
         */
-       public static function getMicro(array $contact, bool $no_update = false)
+       public static function getMicro(array $contact, bool $no_update = false): string
        {
                return self::getAvatarPath($contact, Proxy::SIZE_MICRO, $no_update);
        }
@@ -1624,7 +1689,7 @@ class Contact
         * @param bool  $no_update Don't perfom an update if no cached avatar was found
         * @return array contact array with avatar cache fields
         */
-       private static function checkAvatarCacheByArray(array $contact, bool $no_update = false)
+       private static function checkAvatarCacheByArray(array $contact, bool $no_update = false): array
        {
                $update = false;
                $contact_fields = [];
@@ -1642,7 +1707,9 @@ class Contact
                        return $contact;
                }
 
-               if (!empty($contact['id']) && !empty($contact['avatar'])) {
+               $local = !empty($contact['url']) && Network::isLocalLink($contact['url']);
+
+               if (!$local && !empty($contact['id']) && !empty($contact['avatar'])) {
                        self::updateAvatar($contact['id'], $contact['avatar'], true);
 
                        $new_contact = self::getById($contact['id'], $contact_fields);
@@ -1650,6 +1717,8 @@ class Contact
                                // We only update the cache fields
                                $contact = array_merge($contact, $new_contact);
                        }
+               } elseif ($local && !empty($contact['avatar'])) {
+                       return $contact;
                }
 
                /// add the default avatars if the fields aren't filled
@@ -1666,6 +1735,59 @@ class Contact
                return $contact;
        }
 
+       /**
+        * Fetch the default header for the given contact
+        *
+        * @param array $contact  contact array
+        * @return string avatar URL
+        */
+       public static function getDefaultHeader(array $contact): string
+       {
+               if (!empty($contact['header'])) {
+                       return $contact['header'];
+               }
+
+               if (!empty($contact['gsid'])) {
+                       // Use default banners for certain platforms
+                       $gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $contact['gsid']]);
+                       $platform = strtolower($gserver['platform'] ?? '');
+               } else {
+                       $platform = '';
+               }
+
+               switch ($platform) {
+                       case 'friendica':
+                       case 'friendika':
+                               /**
+                                * Picture credits
+                                * @author  Lostinlight <https://mastodon.xyz/@lightone>
+                                * @license CC0 https://creativecommons.org/share-your-work/public-domain/cc0/
+                                * @link    https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg
+                                */
+                               $header = DI::baseUrl() . '/images/friendica-banner.jpg';
+                               break;
+                       case 'diaspora':
+                               /**
+                                * Picture credits
+                                * @author  John Liu <https://www.flickr.com/photos/8047705@N02/>
+                                * @license CC BY 2.0 https://creativecommons.org/licenses/by/2.0/
+                                * @link    https://www.flickr.com/photos/8047705@N02/5572197407
+                                */
+                               $header = DI::baseUrl() . '/images/diaspora-banner.jpg';
+                               break;
+                       default:
+                               /**
+                                * Use a random picture.
+                                * The service provides random pictures from Unsplash.
+                                * @license https://unsplash.com/license
+                                */
+                               $header = 'https://picsum.photos/seed/' . hash('ripemd128', $contact['url']) . '/960/300';
+                               break;
+               }
+
+               return $header;
+       }
+
        /**
         * Fetch the default avatar for the given contact and size
         *
@@ -1673,7 +1795,7 @@ class Contact
         * @param string $size    Size of the avatar picture
         * @return string avatar URL
         */
-       public static function getDefaultAvatar(array $contact, string $size)
+       public static function getDefaultAvatar(array $contact, string $size): string
        {
                switch ($size) {
                        case Proxy::SIZE_MICRO:
@@ -1694,6 +1816,114 @@ class Contact
                }
 
                if (!DI::config()->get('system', 'remote_avatar_lookup')) {
+                       $platform = '';
+                       $type     = Contact::TYPE_PERSON;
+
+                       if (!empty($contact['id'])) {
+                               $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['id' => $contact['id']]);
+                               $platform = $account['platform'] ?? '';
+                               $type     = $account['contact-type'] ?? Contact::TYPE_PERSON;
+                       }
+
+                       if (empty($platform) && !empty($contact['uri-id'])) {
+                               $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['uri-id' => $contact['uri-id']]);
+                               $platform = $account['platform'] ?? '';
+                               $type     = $account['contact-type'] ?? Contact::TYPE_PERSON;
+                       }
+
+                       switch ($platform) {
+                               case 'corgidon':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/msdos621/corgidon/blob/main/public/avatars/original/missing.png
+                                        */
+                                       $default = '/images/default/corgidon.png';
+                                       break;
+
+                               case 'diaspora':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/diaspora/diaspora/
+                                        */
+                                       $default = '/images/default/diaspora.png';
+                                       break;
+
+                               case 'gotosocial':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/superseriousbusiness/gotosocial/blob/main/web/assets/default_avatars/GoToSocial_icon1.svg
+                                        */
+                                       $default = '/images/default/gotosocial.svg';
+                                       break;
+
+                               case 'hometown':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/hometown-fork/hometown/blob/hometown-dev/public/avatars/original/missing.png
+                                        */
+                                       $default = '/images/default/hometown.png';
+                                       break;
+
+                               case 'koyuspace':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/koyuspace/mastodon/blob/main/public/avatars/original/missing.png
+                                        */
+                                       $default = '/images/default/koyuspace.png';
+                                       break;
+
+                               case 'ecko':
+                               case 'qoto':
+                               case 'mastodon':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/mastodon/mastodon/tree/main/public/avatars/original/missing.png
+                                        */
+                                       $default = '/images/default/mastodon.png';
+                                       break;
+
+                               case 'peertube':
+                                       if ($type == Contact::TYPE_COMMUNITY) {
+                                               /**
+                                                * Picture credits
+                                                * @license GNU Affero General Public License v3.0
+                                                * @link    https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png
+                                                */
+                                               $default = '/images/default/peertube-channel.png';
+                                       } else {
+                                               /**
+                                                * Picture credits
+                                                * @license GNU Affero General Public License v3.0
+                                                * @link    https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-account.png
+                                                */
+                                               $default = '/images/default/peertube-account.png';
+                                       }
+                                       break;
+
+                               case 'pleroma':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://git.pleroma.social/pleroma/pleroma/-/blob/develop/priv/static/images/avi.png
+                                        */
+                                       $default = '/images/default/pleroma.png';
+                                       break;
+
+                               case 'plume':
+                                       /**
+                                        * Picture credits
+                                        * @license GNU Affero General Public License v3.0
+                                        * @link    https://github.com/Plume-org/Plume/blob/main/assets/images/default-avatar.png
+                                        */
+                                       $default = '/images/default/plume.png';
+                                       break;
+                       }
                        return DI::baseUrl() . $default;
                }
 
@@ -1723,19 +1953,22 @@ class Contact
         * Get avatar link for given contact id
         *
         * @param integer $cid     contact id
-        * @param string  $size    One of the ProxyUtils::SIZE_* constants
+        * @param string  $size    One of the Proxy::SIZE_* constants
         * @param string  $updated Contact update date
         * @return string avatar link
         */
-       public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = ''):string
+       public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = '', string $guid = ''): string
        {
                // We have to fetch the "updated" variable when it wasn't provided
                // The parameter can be provided to improve performance
                if (empty($updated)) {
-                       $contact = self::getById($cid, ['updated']);
-                       $updated = $contact['updated'] ?? '';
+                       $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]);
+                       $updated = $account['updated'] ?? '';
+                       $guid = $account['guid'] ?? '';
                }
 
+               $guid = urlencode($guid);
+
                $url = DI::baseUrl() . '/photo/contact/';
                switch ($size) {
                        case Proxy::SIZE_MICRO:
@@ -1754,7 +1987,7 @@ class Contact
                                $url .= Proxy::PIXEL_LARGE . '/';
                                break;
                }
-               return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : '');
+               return $url . ($guid ?: $cid) . ($updated ? '?ts=' . strtotime($updated) : '');
        }
 
        /**
@@ -1762,10 +1995,10 @@ class Contact
         *
         * @param string  $url  contact url
         * @param integer $uid  user id
-        * @param string  $size One of the ProxyUtils::SIZE_* constants
+        * @param string  $size One of the Proxy::SIZE_* constants
         * @return string avatar link
         */
-       public static function getAvatarUrlForUrl(string $url, int $uid, string $size = ''):string
+       public static function getAvatarUrlForUrl(string $url, int $uid, string $size = ''): string
        {
                $condition = ["`nurl` = ? AND ((`uid` = ? AND `network` IN (?, ?)) OR `uid` = ?)",
                        Strings::normaliseLink($url), $uid, Protocol::FEED, Protocol::MAIL, 0];
@@ -1777,19 +2010,22 @@ class Contact
         * Get header link for given contact id
         *
         * @param integer $cid     contact id
-        * @param string  $size    One of the ProxyUtils::SIZE_* constants
+        * @param string  $size    One of the Proxy::SIZE_* constants
         * @param string  $updated Contact update date
         * @return string header link
         */
-       public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = ''):string
+       public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = '', string $guid = ''): string
        {
                // We have to fetch the "updated" variable when it wasn't provided
                // The parameter can be provided to improve performance
-               if (empty($updated)) {
-                       $contact = self::getById($cid, ['updated']);
-                       $updated = $contact['updated'] ?? '';
+               if (empty($updated) || empty($guid)) {
+                       $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]);
+                       $updated = $account['updated'] ?? '';
+                       $guid = $account['guid'] ?? '';
                }
 
+               $guid = urlencode($guid);
+
                $url = DI::baseUrl() . '/photo/header/';
                switch ($size) {
                        case Proxy::SIZE_MICRO:
@@ -1809,7 +2045,7 @@ class Contact
                                break;
                }
 
-               return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : '');
+               return $url . ($guid ?: $cid) . ($updated ? '?ts=' . strtotime($updated) : '');
        }
 
        /**
@@ -1827,7 +2063,7 @@ class Contact
         */
        public static function updateAvatar(int $cid, string $avatar, bool $force = false, bool $create_cache = false)
        {
-               $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'xmpp', 'addr', 'nurl', 'url', 'network'],
+               $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'xmpp', 'addr', 'nurl', 'url', 'network', 'uri-id'],
                        ['id' => $cid, 'self' => false]);
                if (!DBA::isResult($contact)) {
                        return;
@@ -1860,54 +2096,69 @@ class Contact
                        $avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
                }
 
-               if ($default_avatar && Proxy::isLocalImage($avatar)) {
-                       $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
-                               'photo' => $avatar,
-                               'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
-                               'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
-                       Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
+               $cache_avatar = DI::config()->get('system', 'cache_contact_avatar');
+
+               // Local contact avatars don't need to be cached
+               if ($cache_avatar && Network::isLocalLink($contact['url'])) {
+                       $cache_avatar = !DBA::exists('contact', ['nurl' => $contact['nurl'], 'self' => true]);
                }
 
-               // Use the data from the self account
-               if (empty($fields)) {
-                       $local_uid = User::getIdForURL($contact['url']);
-                       if (!empty($local_uid)) {
-                               $fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
-                               Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+               if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
+                       Avatar::deleteCache($contact);
+
+                       if ($default_avatar && Proxy::isLocalImage($avatar)) {
+                               $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
+                                       'photo' => $avatar,
+                                       'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
+                                       'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
+                               Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
                        }
-               }
 
-               if (empty($fields)) {
-                       $update = ($contact['avatar'] != $avatar) || $force;
-
-                       if (!$update) {
-                               $data = [
-                                       $contact['photo'] ?? '',
-                                       $contact['thumb'] ?? '',
-                                       $contact['micro'] ?? '',
-                               ];
-
-                               foreach ($data as $image_uri) {
-                                       $image_rid = Photo::ridFromURI($image_uri);
-                                       if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
-                                               Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
-                                               $update = true;
-                                       }
+                       // Use the data from the self account
+                       if (empty($fields)) {
+                               $local_uid = User::getIdForURL($contact['url']);
+                               if (!empty($local_uid)) {
+                                       $fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
+                                       Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
                                }
                        }
 
-                       if ($update) {
-                               $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
-                               if ($photos) {
-                                       $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
-                                       $update = !empty($fields);
-                                       Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
-                               } else {
-                                       $update = false;
+                       if (empty($fields)) {
+                               $update = ($contact['avatar'] != $avatar) || $force;
+
+                               if (!$update) {
+                                       $data = [
+                                               $contact['photo'] ?? '',
+                                               $contact['thumb'] ?? '',
+                                               $contact['micro'] ?? '',
+                                       ];
+
+                                       foreach ($data as $image_uri) {
+                                               $image_rid = Photo::ridFromURI($image_uri);
+                                               if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+                                                       Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+                                                       $update = true;
+                                               }
+                                       }
+                               }
+
+                               if ($update) {
+                                       $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
+                                       if ($photos) {
+                                               $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
+                                               $update = !empty($fields);
+                                               Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+                                       } else {
+                                               $update = false;
+                                       }
                                }
+                       } else {
+                               $update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
                        }
                } else {
-                       $update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
+                       Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'photo-type' => Photo::CONTACT_AVATAR]);
+                       $fields = Avatar::fetchAvatarContact($contact, $avatar, $force);
+                       $update = ($avatar . $fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
                }
 
                if (!$update) {
@@ -1928,7 +2179,7 @@ class Contact
 
                        if (!empty($cids)) {
                                // Delete possibly existing cached user contact avatars
-                               Photo::delete(['uid' => $uids, 'contact-id' => $cids, 'album' => Photo::CONTACT_PHOTOS]);
+                               Photo::delete(['uid' => $uids, 'contact-id' => $cids, 'photo-type' => Photo::CONTACT_AVATAR]);
                        }
                }
 
@@ -2060,6 +2311,8 @@ class Contact
        }
 
        /**
+        * Updates contact record by provided id and optional network
+        *
         * @param integer $id      contact id
         * @param string  $network Optional network we are probing for
         * @return boolean
@@ -2074,17 +2327,24 @@ class Contact
                }
 
                $ret = Probe::uri($contact['url'], $network, $contact['uid']);
+
+               if ($ret['network'] == Protocol::DIASPORA) {
+                       FContact::updateFromProbeArray($ret);
+               }
+
                return self::updateFromProbeArray($id, $ret);
        }
 
        /**
+        * Updates contact record by provided id and probed data
+        *
         * @param integer $id      contact id
         * @param array   $ret     Probed data
         * @return boolean
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function updateFromProbeArray(int $id, array $ret)
+       private static function updateFromProbeArray(int $id, array $ret): bool
        {
                /*
                  Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
@@ -2180,12 +2440,19 @@ class Contact
                $new_pubkey = $ret['pubkey'] ?? '';
 
                if ($uid == 0) {
+                       if ($ret['network'] == Protocol::ACTIVITYPUB) {
+                               $apcontact = APContact::getByURL($ret['url'], false);
+                               if (!empty($apcontact['featured'])) {
+                                       Worker::add(PRIORITY_LOW, 'FetchFeaturedPosts', $ret['url']);
+                               }
+                       }
+
                        $ret['last-item'] = Probe::getLastUpdate($ret);
                        Logger::info('Fetched last item', ['id' => $id, 'probed_url' => $ret['url'], 'last-item' => $ret['last-item'], 'callstack' => System::callstack(20)]);
                }
 
                $update = false;
-               $guid = $ret['guid'] ?? '';
+               $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], parse_url($ret['url'], PHP_URL_HOST));
 
                // make sure to not overwrite existing values with blank entries except some technical fields
                $keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
@@ -2213,6 +2480,8 @@ class Contact
                        self::updateAvatar($id, $ret['photo'], $update);
                }
 
+               $uriid = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
+
                if (!$update) {
                        self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
 
@@ -2231,12 +2500,7 @@ class Contact
                        return true;
                }
 
-               if (empty($guid)) {
-                       $ret['uri-id'] = ItemURI::getIdByURI($ret['url']);
-               } else {
-                       $ret['uri-id'] = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
-               }
-
+               $ret['uri-id']  = $uriid;
                $ret['nurl']    = Strings::normaliseLink($ret['url']);
                $ret['updated'] = $updated;
                $ret['failed']  = false;
@@ -2291,12 +2555,14 @@ class Contact
        }
 
        /**
+        * Updates contact record by provided URL
+        *
         * @param integer $url contact url
         * @return integer Contact id
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function updateFromProbeByURL($url)
+       public static function updateFromProbeByURL(string $url): int
        {
                $id = self::getIdForURL($url);
 
@@ -2317,7 +2583,7 @@ class Contact
         * @param string $network Network of that contact
         * @return string with protocol
         */
-       public static function getProtocol($url, $network)
+       public static function getProtocol(string $url, string $network): string
        {
                if ($network != Protocol::DFRN) {
                        return $network;
@@ -2353,7 +2619,7 @@ class Contact
         * @throws HTTPException\NotFoundException
         * @throws \ImagickException
         */
-       public static function createFromProbeForUser(int $uid, $url, $network = '')
+       public static function createFromProbeForUser(int $uid, string $url, string $network = ''): array
        {
                $result = ['cid' => -1, 'success' => false, 'message' => ''];
 
@@ -2390,10 +2656,15 @@ class Contact
                } else {
                        $probed = true;
                        $ret = Probe::uri($url, $network, $uid);
+
+                       // Ensure that the public contact exists
+                       if ($ret['network'] != Protocol::PHANTOM) {
+                               self::getIdForURL($url);
+                       }
                }
 
                if (($network != '') && ($ret['network'] != $network)) {
-                       Logger::log('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
+                       Logger::notice('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
                        return $result;
                }
 
@@ -2460,7 +2731,7 @@ class Contact
 
                if (DBA::isResult($contact)) {
                        // update contact
-                       $new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
+                       $new_relation = (in_array($contact['rel'], [self::FOLLOWER, self::FRIEND]) ? self::FRIEND : self::SHARING);
 
                        $fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
                        self::update($fields, ['id' => $contact['id']]);
@@ -2506,7 +2777,7 @@ class Contact
                $contact_id = $contact['id'];
                $result['cid'] = $contact_id;
 
-               Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
+               Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
                // Update the avatar
                self::updateAvatar($contact_id, $ret['photo']);
@@ -2522,125 +2793,11 @@ class Contact
                        Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
                }
 
-               $owner = User::getOwnerDataById($uid);
+               $result['success'] = Protocol::follow($uid, $contact, $protocol);
 
-               if (DBA::isResult($owner)) {
-                       if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
-                               // create a follow slap
-                               $item = [];
-                               $item['verb'] = Activity::FOLLOW;
-                               $item['gravity'] = GRAVITY_ACTIVITY;
-                               $item['follow'] = $contact["url"];
-                               $item['body'] = '';
-                               $item['title'] = '';
-                               $item['guid'] = '';
-                               $item['uri-id'] = 0;
-
-                               $slap = OStatus::salmon($item, $owner);
-
-                               if (!empty($contact['notify'])) {
-                                       Salmon::slapper($owner, $contact['notify'], $slap);
-                               }
-                       } elseif ($protocol == Protocol::DIASPORA) {
-                               $ret = Diaspora::sendShare($owner, $contact);
-                               Logger::log('share returns: ' . $ret);
-                       } elseif ($protocol == Protocol::ACTIVITYPUB) {
-                               $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);
-                       }
-               }
-
-               $result['success'] = true;
                return $result;
        }
 
-       /**
-        * Updated contact's SSL policy
-        *
-        * @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)
-       {
-               $ssl_changed = false;
-               if ((intval($new_policy) == BaseURL::SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
-                       $ssl_changed = true;
-                       $contact['url']     =   str_replace('https:', 'http:', $contact['url']);
-                       $contact['request'] =   str_replace('https:', 'http:', $contact['request']);
-                       $contact['notify']  =   str_replace('https:', 'http:', $contact['notify']);
-                       $contact['poll']    =   str_replace('https:', 'http:', $contact['poll']);
-                       $contact['confirm'] =   str_replace('https:', 'http:', $contact['confirm']);
-                       $contact['poco']    =   str_replace('https:', 'http:', $contact['poco']);
-               }
-
-               if ((intval($new_policy) == BaseURL::SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
-                       $ssl_changed = true;
-                       $contact['url']     =   str_replace('http:', 'https:', $contact['url']);
-                       $contact['request'] =   str_replace('http:', 'https:', $contact['request']);
-                       $contact['notify']  =   str_replace('http:', 'https:', $contact['notify']);
-                       $contact['poll']    =   str_replace('http:', 'https:', $contact['poll']);
-                       $contact['confirm'] =   str_replace('http:', 'https:', $contact['confirm']);
-                       $contact['poco']    =   str_replace('http:', 'https:', $contact['poco']);
-               }
-
-               if ($ssl_changed) {
-                       $fields = ['url' => $contact['url'], 'request' => $contact['request'],
-                                       'notify' => $contact['notify'], 'poll' => $contact['poll'],
-                                       'confirm' => $contact['confirm'], 'poco' => $contact['poco']];
-                       self::update($fields, ['id' => $contact['id']]);
-               }
-
-               return $contact;
-       }
-
-       /**
-        * Follow a contact
-        *
-        * @param int $cid Public contact id
-        * @param int $uid  User ID
-        *
-        * @return bool "true" if following had been successful
-        */
-       public static function follow(int $cid, int $uid)
-       {
-               $contact = self::getById($cid, ['url']);
-
-               $result = self::createFromProbeForUser($uid, $contact['url']);
-
-               return $result['cid'];
-       }
-
-       /**
-        * Unfollow a contact
-        *
-        * @param int $cid Public contact id
-        * @param int $uid  User ID
-        *
-        * @return bool "true" if unfollowing had been successful
-        */
-       public static function unfollow(int $cid, int $uid)
-       {
-               $cdata = self::getPublicAndUserContactID($cid, $uid);
-               if (empty($cdata['user'])) {
-                       return false;
-               }
-
-               $contact = self::getById($cdata['user']);
-
-               self::removeSharer([], $contact);
-
-               return true;
-       }
-
        /**
         * @param array  $importer Owner (local user) data
         * @param array  $contact  Existing owner-specific contact data we want to expand the relationship with. Optional.
@@ -2651,14 +2808,14 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function addRelationship(array $importer, array $contact, array $datarray, $sharing = false, $note = '')
+       public static function addRelationship(array $importer, array $contact, array $datarray, bool $sharing = false, string $note = '')
        {
                // Should always be set
                if (empty($datarray['author-id'])) {
                        return false;
                }
 
-               $fields = ['url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked'];
+               $fields = ['id', 'url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked'];
                $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
                if (!DBA::isResult($pub_contact)) {
                        // Should never happen
@@ -2682,6 +2839,8 @@ class Contact
                        $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
                }
 
+               self::clearFollowerFollowingEndpointCache($importer['uid']);
+
                if (!empty($contact)) {
                        if (!empty($contact['pending'])) {
                                Logger::info('Pending contact request already exists.', ['url' => $url, 'uid' => $importer['uid']]);
@@ -2706,13 +2865,13 @@ class Contact
                        // Ensure to always have the correct network type, independent from the connection request method
                        self::updateFromProbe($contact['id']);
 
-                       Post\UserNotification::insertNotication($contact['id'], Verb::getID(Activity::FOLLOW), $importer['uid']);
+                       Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']);
 
                        return true;
                } else {
                        // send email notification to owner?
                        if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
-                               Logger::log('ignoring duplicated connection request from pending contact ' . $url);
+                               Logger::notice('ignoring duplicated connection request from pending contact ' . $url);
                                return null;
                        }
 
@@ -2737,7 +2896,7 @@ class Contact
 
                        self::updateAvatar($contact_id, $photo, true);
 
-                       Post\UserNotification::insertNotication($contact_id, Verb::getID(Activity::FOLLOW), $importer['uid']);
+                       Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']);
 
                        $contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
 
@@ -2746,20 +2905,19 @@ class Contact
                        $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
                        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();
-
                                if (is_array($contact_record)) {
-                                       DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
-                                                               'blocked' => false, 'knowyou' => false, 'note' => $note,
-                                                               'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
+                                       $intro = DI::introFactory()->createNew(
+                                               $importer['uid'],
+                                               $contact_record['id'],
+                                               $note
+                                       );
+                                       DI::intro()->save($intro);
                                }
 
-                               Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
-
-                               if (($user['notify-flags'] & Notification\Type::INTRO) &&
-                                       in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
+                               Group::addMember(User::getDefaultGroup($importer['uid']), $contact_record['id']);
 
-                                       notification([
+                               if (($user['notify-flags'] & Notification\Type::INTRO) && $user['page-flags'] == User::PAGE_FLAGS_NORMAL) {
+                                       DI::notify()->createFromArray([
                                                'type'  => Notification\Type::INTRO,
                                                'otype' => Notification\ObjectType::INTRO,
                                                'verb'  => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
@@ -2788,23 +2946,47 @@ class Contact
                return null;
        }
 
+       /**
+        * Update the local relationship when a local user loses a follower
+        *
+        * @param array $contact User-specific contact (uid != 0) array
+        * @return void
+        * @throws HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
        public static function removeFollower(array $contact)
        {
                if (in_array($contact['rel'] ?? [], [self::FRIEND, self::SHARING])) {
-                       DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
+                       self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
                } elseif (!empty($contact['id'])) {
                        self::remove($contact['id']);
                } else {
                        DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact, 'callstack' => System::callstack()]);
+                       return;
                }
+
+               self::clearFollowerFollowingEndpointCache($contact['uid']);
+
+               $cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']);
+
+               DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]);
        }
 
-       public static function removeSharer($importer, $contact)
+       /**
+        * Update the local relationship when a local user unfollow a contact.
+        * Removes the contact for sharing-only protocols (feed and mail).
+        *
+        * @param array $contact User-specific contact (uid != 0) array
+        * @throws HTTPException\InternalServerErrorException
+        */
+       public static function removeSharer(array $contact)
        {
-               if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) {
-                       self::update(['rel' => self::FOLLOWER], ['id' => $contact['id']]);
-               } else {
+               self::clearFollowerFollowingEndpointCache($contact['uid']);
+
+               if ($contact['rel'] == self::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
                        self::remove($contact['id']);
+               } else {
+                       self::update(['rel' => self::FOLLOWER], ['id' => $contact['id']]);
                }
        }
 
@@ -2831,7 +3013,7 @@ class Contact
                $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
 
                while ($contact = DBA::fetch($contacts)) {
-                       Logger::log('update_contact_birthday: ' . $contact['bd']);
+                       Logger::notice('update_contact_birthday: ' . $contact['bd']);
 
                        $nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);
 
@@ -2854,7 +3036,7 @@ class Contact
         * @return array
         * @throws \Exception
         */
-       public static function pruneUnavailable(array $contact_ids)
+       public static function pruneUnavailable(array $contact_ids): array
        {
                if (empty($contact_ids)) {
                        return [];
@@ -2882,7 +3064,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function magicLink($contact_url, $url = '')
+       public static function magicLink(string $contact_url, string $url = ''): string
        {
                if (!Session::isAuthenticated()) {
                        return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
@@ -2909,7 +3091,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function magicLinkById($cid, $url = '')
+       public static function magicLinkById(int $cid, string $url = ''): string
        {
                $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
 
@@ -2926,7 +3108,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function magicLinkByContact($contact, $url = '')
+       public static function magicLinkByContact(array $contact, string $url = ''): string
        {
                $destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
 
@@ -2967,9 +3149,9 @@ class Contact
         *
         * @return boolean "true" if it is a forum
         */
-       public static function isForum($contactid)
+       public static function isForum(int $contactid): bool
        {
-               $fields = ['forum', 'prv'];
+               $fields = ['contact-type'];
                $condition = ['id' => $contactid];
                $contact = DBA::selectFirst('contact', $fields, $condition);
                if (!DBA::isResult($contact)) {
@@ -2977,7 +3159,7 @@ class Contact
                }
 
                // Is it a forum?
-               return ($contact['forum'] || $contact['prv']);
+               return ($contact['contact-type'] == self::TYPE_COMMUNITY);
        }
 
        /**
@@ -2986,7 +3168,7 @@ class Contact
         * @param array $contact
         * @return bool
         */
-       public static function canReceivePrivateMessages(array $contact)
+       public static function canReceivePrivateMessages(array $contact): bool
        {
                $protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM;
                $self = $contact['self'] ?? false;
@@ -3004,44 +3186,40 @@ class Contact
         * @return array with search results
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function searchByName(string $search, string $mode = '', int $uid = 0)
+       public static function searchByName(string $search, string $mode = '', int $uid = 0): array
        {
                if (empty($search)) {
                        return [];
                }
 
                // check supported networks
+               $networks = [Protocol::DFRN, Protocol::ACTIVITYPUB];
                if (DI::config()->get('system', 'diaspora_enabled')) {
-                       $diaspora = Protocol::DIASPORA;
-               } else {
-                       $diaspora = Protocol::DFRN;
+                       $networks[] = Protocol::DIASPORA;
                }
 
                if (!DI::config()->get('system', 'ostatus_disabled')) {
-                       $ostatus = Protocol::OSTATUS;
-               } else {
-                       $ostatus = Protocol::DFRN;
+                       $networks[] = Protocol::OSTATUS;
+               }
+
+               $condition = ['network' => $networks, 'failed' => false, 'deleted' => false, 'uid' => $uid];
+
+               if ($uid == 0) {
+                       $condition['blocked'] = false;
                }
 
                // check if we search only communities or every contact
                if ($mode === 'community') {
-                       $extra_sql = sprintf(' AND `contact-type` = %d', self::TYPE_COMMUNITY);
-               } else {
-                       $extra_sql = '';
+                       $condition['contact-type'] = self::TYPE_COMMUNITY;
                }
 
                $search .= '%';
 
-               $results = DBA::p("SELECT * FROM `contact`
-                       WHERE (NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` where `publish` OR `net-publish`))
-                               AND `network` IN (?, ?, ?, ?) AND
-                               NOT `failed` AND `uid` = ? AND
-                               (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
-                               ORDER BY `nurl` DESC LIMIT 1000",
-                       Protocol::DFRN, Protocol::ACTIVITYPUB, $ostatus, $diaspora, $uid, $search, $search, $search
-               );
+               $condition = DBA::mergeConditions($condition,
+                       ["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` WHERE `publish` OR `net-publish`))
+                       AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
 
-               $contacts = DBA::toArray($results);
+               $contacts = self::selectToArray([], $condition);
                return $contacts;
        }
 
@@ -3051,7 +3229,7 @@ class Contact
         * @param array $urls
         * @return array result "count", "added" and "updated"
         */
-       public static function addByUrls(array $urls)
+       public static function addByUrls(array $urls): array
        {
                $added = 0;
                $updated = 0;
@@ -3084,7 +3262,7 @@ class Contact
         * @return array The profile array
         * @throws Exception
         */
-       public static function getRandomContact()
+       public static function getRandomContact(): array
        {
                $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], [
                        "`uid` = ? AND `network` = ? AND NOT `failed` AND `last-item` > ?",