]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Ensure that the public contact exixts before adding a user contact
[friendica.git] / src / Model / Contact.php
index 40f04213786033058066c01721cea807898c6bd2..7cb63d490a3e2482d7142e308b5cca248b711b19 100644 (file)
@@ -21,7 +21,7 @@
 
 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;
@@ -35,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;
@@ -211,6 +209,19 @@ class Contact
                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($uri_id, $fields = [])
+       {
+               return DBA::selectFirst('contact', $fields, ['uri-id' => $uri_id], ['order' => ['uid']]);
+       }
+
        /**
         * Fetches a contact by a given url
         *
@@ -672,9 +683,9 @@ class Contact
         */
        public static function updateSelfFromUserID($uid, $update_avatar = false)
        {
-               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
+               $fields = ['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;
@@ -740,9 +751,11 @@ class Contact
                }
 
                $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;
 
@@ -785,50 +798,61 @@ class Contact
        public static function remove($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, '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 (uid != 0) unfriended
-        * @param boolean $two_way Revoke eventual inbound follow as well
-        * @return bool|null true if successful, false if not, null if no remote action was performed
+        * @param array $contact Target user-specific contact (uid != 0) array
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function terminateFriendship(array $user, array $contact): ?bool
+       public static function unfollow(array $contact): void
        {
-               $result = Protocol::terminateFriendship($user, $contact);
+               if (empty($contact['network'])) {
+                       throw new \InvalidArgumentException('Empty network in contact array');
+               }
 
-               if ($contact['rel'] == Contact::SHARING || 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
         * @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');
@@ -838,21 +862,56 @@ class Contact
                        throw new \InvalidArgumentException('Unexpected public contact record');
                }
 
-               $result = Protocol::revokeFollow($contact);
-
-               // 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) {
-                       if ($contact['rel'] == self::FRIEND) {
-                               self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
-                       } else {
-                               self::remove($contact['id']);
+               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']);
                        }
                }
 
-               return $result;
+               self::removeFollower($contact);
        }
 
+       /**
+        * Completely severs a relationship with a contact
+        *
+        * @param array $contact User-specific contact (uid != 0) array
+        * @throws HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function terminateFriendship(array $contact)
+       {
+               if (empty($contact['network'])) {
+                       throw new \InvalidArgumentException('Empty network in contact array');
+               }
+
+               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
@@ -1228,6 +1287,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
@@ -1414,11 +1477,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);
                }
@@ -1439,34 +1522,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)
+       {
                switch ($type) {
                        case self::TYPE_ORGANISATION:
                                $account_type = DI::l10n()->t("Organisation");
@@ -1528,16 +1588,24 @@ class Contact
                        return;
                }
 
+               if (Network::isLocalLink($contact['url'])) {
+                       return;
+               }
+
                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 (!empty($contact['photo']) || !empty($contact['thumb']) || !empty($contact['micro'])) {
-                       Logger::info('Removing avatar cache', ['id' => $cid, 'contact' => $contact]);
+               } 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;
                }
        }
 
@@ -1554,6 +1622,27 @@ class Contact
        private static function getAvatarPath(array $contact, string $size, $no_update = false)
        {
                $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'] ?? '');
        }
 
@@ -1618,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);
@@ -1626,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
@@ -1642,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
         *
@@ -1707,7 +1853,7 @@ class Contact
        {
                // We have to fetch the "updated" variable when it wasn't provided
                // The parameter can be provided to improve performance
-               if (empty($updated) || empty($guid)) {
+               if (empty($updated)) {
                        $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]);
                        $updated = $account['updated'] ?? '';
                        $guid = $account['guid'] ?? '';
@@ -1809,7 +1955,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;
@@ -1842,7 +1988,16 @@ class Contact
                        $avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
                }
 
-               if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+               $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]);
+               }
+
+               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,
@@ -1894,9 +2049,8 @@ class Contact
                        }
                } else {
                        Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'photo-type' => Photo::CONTACT_AVATAR]);
-                       $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
-                               'photo' => '', 'thumb' => '', 'micro' => ''];
-                       $update = ($avatar != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
+                       $fields = Avatar::fetchAvatarContact($contact, $avatar);
+                       $update = ($avatar . $fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
                }
 
                if (!$update) {
@@ -2063,6 +2217,11 @@ class Contact
                }
 
                $ret = Probe::uri($contact['url'], $network, $contact['uid']);
+
+               if ($ret['network'] == Protocol::DIASPORA) {
+                       FContact::updateFromProbeArray($ret);
+               }
+
                return self::updateFromProbeArray($id, $ret);
        }
 
@@ -2169,6 +2328,13 @@ 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)]);
                }
@@ -2376,6 +2542,9 @@ class Contact
                } else {
                        $probed = true;
                        $ret = Probe::uri($url, $network, $uid);
+
+                       // Ensure that the public contact exists
+                       self::getIdForURL($url);
                }
 
                if (($network != '') && ($ret['network'] != $network)) {
@@ -2513,28 +2682,6 @@ class Contact
                return $result;
        }
 
-       /**
-        * 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.
@@ -2552,7 +2699,7 @@ class Contact
                        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
@@ -2576,6 +2723,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']]);
@@ -2600,7 +2749,7 @@ class Contact
                        // Ensure to always have the correct network type, independent from the connection request method
                        self::updateFromProbe($contact['id']);
 
-                       Post\UserNotification::insertNotification($contact['id'], Activity::FOLLOW, $importer['uid']);
+                       Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']);
 
                        return true;
                } else {
@@ -2631,7 +2780,7 @@ class Contact
 
                        self::updateAvatar($contact_id, $photo, true);
 
-                       Post\UserNotification::insertNotification($contact_id, 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]);
 
@@ -2651,9 +2800,7 @@ class Contact
 
                                Group::addMember(User::getDefaultGroup($importer['uid']), $contact_record['id']);
 
-                               if (($user['notify-flags'] & Notification\Type::INTRO) &&
-                                       in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
-
+                               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,
@@ -2683,23 +2830,46 @@ class Contact
                return null;
        }
 
+       /**
+        * Update the local relationship when a local user loses a follower
+        *
+        * @param array $contact User-specific contact (uid != 0) array
+        * @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']]);
                }
        }
 
@@ -2864,7 +3034,7 @@ class Contact
         */
        public static function isForum($contactid)
        {
-               $fields = ['forum', 'prv'];
+               $fields = ['contact-type'];
                $condition = ['id' => $contactid];
                $contact = DBA::selectFirst('contact', $fields, $condition);
                if (!DBA::isResult($contact)) {
@@ -2872,7 +3042,7 @@ class Contact
                }
 
                // Is it a forum?
-               return ($contact['forum'] || $contact['prv']);
+               return ($contact['contact-type'] == self::TYPE_COMMUNITY);
        }
 
        /**