]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Merge pull request #4376 from MrPetovan/task/3878-move-include-like-to-src
[friendica.git] / src / Model / Contact.php
index 96a2e32c6d24959c03e8dfb34b90fbf5fd57c002..3ec9f5ab48929b88cb77c5bcdf2dbf1274873cb9 100644 (file)
@@ -5,7 +5,9 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -18,6 +20,7 @@ use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
+use Friendica\Util\Network;
 use dba;
 
 require_once 'boot.php';
@@ -150,11 +153,11 @@ class Contact extends BaseObject
 
                $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
                if ($archive) {
-                       dba::update('contact', array('archive' => true, 'network' => 'none', 'writable' => false), array('id' => $id));
+                       dba::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
                        return;
                }
 
-               dba::delete('contact', array('id' => $id));
+               dba::delete('contact', ['id' => $id]);
 
                // Delete the rest in the background
                Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
@@ -171,7 +174,7 @@ class Contact extends BaseObject
        {
                if ($contact['network'] === NETWORK_OSTATUS) {
                        // create an unfollow slap
-                       $item = array();
+                       $item = [];
                        $item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
                        $item['follow'] = $contact["url"];
                        $slap = OStatus::salmon($item, $user);
@@ -206,10 +209,10 @@ class Contact extends BaseObject
                }
 
                if ($contact['term-date'] <= NULL_DATE) {
-                       dba::update('contact', array('term-date' => datetime_convert()), array('id' => $contact['id']));
+                       dba::update('contact', ['term-date' => datetime_convert()], ['id' => $contact['id']]);
 
                        if ($contact['url'] != '') {
-                               dba::update('contact', array('term-date' => datetime_convert()), array('`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE));
+                               dba::update('contact', ['term-date' => datetime_convert()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
                        }
                } else {
                        /* @todo
@@ -225,10 +228,10 @@ class Contact extends BaseObject
                                 * delete, though if the owner tries to unarchive them we'll start
                                 * the whole process over again.
                                 */
-                               dba::update('contact', array('archive' => 1), array('id' => $contact['id']));
+                               dba::update('contact', ['archive' => 1], ['id' => $contact['id']]);
 
                                if ($contact['url'] != '') {
-                                       dba::update('contact', array('archive' => 1), array('nurl' => normalise_link($contact['url']), 'self' => false));
+                                       dba::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
                                }
                        }
                }
@@ -244,7 +247,7 @@ class Contact extends BaseObject
         */
        public static function unmarkForArchival(array $contact)
        {
-               $condition = array('`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE);
+               $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
                $exists = dba::exists('contact', $condition);
 
                // We don't need to update, we never marked this contact for archival
@@ -253,11 +256,11 @@ class Contact extends BaseObject
                }
 
                // It's a miracle. Our dead contact has inexplicably come back to life.
-               $fields = array('term-date' => NULL_DATE, 'archive' => false);
-               dba::update('contact', $fields, array('id' => $contact['id']));
+               $fields = ['term-date' => NULL_DATE, 'archive' => false];
+               dba::update('contact', $fields, ['id' => $contact['id']]);
 
                if ($contact['url'] != '') {
-                       dba::update('contact', $fields, array('nurl' => normalise_link($contact['url'])));
+                       dba::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
                }
        }
 
@@ -275,7 +278,7 @@ class Contact extends BaseObject
         */
        public static function getDetailsByURL($url, $uid = -1, array $default = [])
        {
-               static $cache = array();
+               static $cache = [];
 
                if ($url == '') {
                        return $default;
@@ -387,7 +390,7 @@ class Contact extends BaseObject
                }
 
                if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0)
-                       && in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))
+                       && in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
                ) {
                        Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
                }
@@ -417,10 +420,10 @@ class Contact extends BaseObject
         */
        public static function getDetailsByAddr($addr, $uid = -1)
        {
-               static $cache = array();
+               static $cache = [];
 
                if ($addr == '') {
-                       return array();
+                       return [];
                }
 
                if ($uid == -1) {
@@ -490,7 +493,7 @@ class Contact extends BaseObject
                if ($contact['uid'] != $uid) {
                        if ($uid == 0) {
                                $profile_link = Profile::zrl($contact['url']);
-                               $menu = array('profile' => array(t('View Profile'), $profile_link, true));
+                               $menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
 
                                return $menu;
                        }
@@ -502,10 +505,10 @@ class Contact extends BaseObject
                        } else {
                                $profile_link = Profile::zrl($contact['url']);
                                $connlnk = 'follow/?url=' . $contact['url'];
-                               $menu = array(
-                                       'profile' => array(t('View Profile'), $profile_link, true),
-                                       'follow' => array(t('Connect/Follow'), $connlnk, true)
-                               );
+                               $menu = [
+                                       'profile' => [L10n::t('View Profile'), $profile_link, true],
+                                       'follow' => [L10n::t('Connect/Follow'), $connlnk, true]
+                               ];
 
                                return $menu;
                        }
@@ -529,7 +532,7 @@ class Contact extends BaseObject
                        $profile_link = $profile_link . '?url=profile';
                }
 
-               if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+               if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
                        $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
                }
 
@@ -547,21 +550,21 @@ class Contact extends BaseObject
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
                 */
                $menu = [
-                       'status'  => [t("View Status")  , $status_link      , true],
-                       'profile' => [t("View Profile") , $profile_link     , true],
-                       'photos'  => [t("View Photos")  , $photos_link      , true],
-                       'network' => [t("Network Posts"), $posts_link       , false],
-                       'edit'    => [t("View Contact") , $contact_url      , false],
-                       'drop'    => [t("Drop Contact") , $contact_drop_link, false],
-                       'pm'      => [t("Send PM")      , $pm_url           , false],
-                       'poke'    => [t("Poke")         , $poke_link        , false],
+                       'status'  => [L10n::t("View Status")  , $status_link      , true],
+                       'profile' => [L10n::t("View Profile") , $profile_link     , true],
+                       'photos'  => [L10n::t("View Photos")  , $photos_link      , true],
+                       'network' => [L10n::t("Network Posts"), $posts_link       , false],
+                       'edit'    => [L10n::t("View Contact") , $contact_url      , false],
+                       'drop'    => [L10n::t("Drop Contact") , $contact_drop_link, false],
+                       'pm'      => [L10n::t("Send PM")      , $pm_url           , false],
+                       'poke'    => [L10n::t("Poke")         , $poke_link        , false],
                ];
 
                $args = ['contact' => $contact, 'menu' => &$menu];
 
-               call_hooks('contact_photo_menu', $args);
+               Addon::callHooks('contact_photo_menu', $args);
 
-               $menucondensed = array();
+               $menucondensed = [];
 
                foreach ($menu as $menuname => $menuitem) {
                        if ($menuitem[1] != '') {
@@ -625,7 +628,7 @@ class Contact extends BaseObject
                        intval($start),
                        intval($count)
                );
-               
+
                return $r;
        }
 
@@ -702,7 +705,7 @@ class Contact extends BaseObject
                $data = Probe::uri($url, "", $uid);
 
                // Last try in gcontact for unsupported networks
-               if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL))) {
+               if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL])) {
                        if ($uid != 0) {
                                return 0;
                        }
@@ -775,7 +778,7 @@ class Contact extends BaseObject
                                if ($data['about'] != '') {
                                        unset($gcontact['about']);
                                }
-                               dba::update('contact', $gcontact, array('id' => $contact_id));
+                               dba::update('contact', $gcontact, ['id' => $contact_id]);
                        }
 
                        if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
@@ -794,12 +797,12 @@ class Contact extends BaseObject
                        return $contact_id;
                }
 
-               $updated = array('addr' => $data['addr'],
+               $updated = ['addr' => $data['addr'],
                        'alias' => $data['alias'],
                        'url' => $data['url'],
                        'nurl' => normalise_link($data['url']),
                        'name' => $data['name'],
-                       'nick' => $data['nick']);
+                       'nick' => $data['nick']];
 
                // Only fill the pubkey if it was empty before. We have to prevent identity theft.
                if (!empty($contact['pubkey'])) {
@@ -827,7 +830,7 @@ class Contact extends BaseObject
 
                $updated['avatar-date'] = datetime_convert();
 
-               dba::update('contact', $updated, array('id' => $contact_id), $contact);
+               dba::update('contact', $updated, ['id' => $contact_id], $contact);
 
                return $contact_id;
        }
@@ -896,7 +899,7 @@ class Contact extends BaseObject
                        return '';
                }
 
-               if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+               if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
                        $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND NOT `item`.`global`))";
                } else {
                        $sql = "`item`.`uid` = %d";
@@ -955,13 +958,13 @@ class Contact extends BaseObject
 
                switch ($type) {
                        case ACCOUNT_TYPE_ORGANISATION:
-                               $account_type = t("Organisation");
+                               $account_type = L10n::t("Organisation");
                                break;
                        case ACCOUNT_TYPE_NEWS:
-                               $account_type = t('News');
+                               $account_type = L10n::t('News');
                                break;
                        case ACCOUNT_TYPE_COMMUNITY:
-                               $account_type = t("Forum");
+                               $account_type = L10n::t("Forum");
                                break;
                        default:
                                $account_type = "";
@@ -1013,7 +1016,7 @@ class Contact extends BaseObject
                if (!DBM::is_result($contact)) {
                        return false;
                } else {
-                       $data = array($contact["photo"], $contact["thumb"], $contact["micro"]);
+                       $data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
                }
 
                if (($contact["avatar"] != $avatar) || $force) {
@@ -1022,8 +1025,8 @@ class Contact extends BaseObject
                        if ($photos) {
                                dba::update(
                                        'contact',
-                                       array('avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()),
-                                       array('id' => $cid)
+                                       ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()],
+                                       ['id' => $cid]
                                );
 
                                // Update the public contact (contact id = 0)
@@ -1122,31 +1125,36 @@ class Contact extends BaseObject
         */
        public static function createFromProbe($uid, $url, $interactive = false, $network = '')
        {
-               $result = array('cid' => -1, 'success' => false, 'message' => '');
+               $result = ['cid' => -1, 'success' => false, 'message' => ''];
 
                $a = get_app();
 
                // remove ajax junk, e.g. Twitter
                $url = str_replace('/#!/', '/', $url);
 
-               if (!allowed_url($url)) {
-                       $result['message'] = t('Disallowed profile URL.');
+               if (!Network::isUrlAllowed($url)) {
+                       $result['message'] = L10n::t('Disallowed profile URL.');
                        return $result;
                }
 
-               if (blocked_url($url)) {
-                       $result['message'] = t('Blocked domain');
+               if (Network::isUrlBlocked($url)) {
+                       $result['message'] = L10n::t('Blocked domain');
                        return $result;
                }
 
                if (!$url) {
-                       $result['message'] = t('Connect URL missing.');
+                       $result['message'] = L10n::t('Connect URL missing.');
                        return $result;
                }
 
-               $arr = array('url' => $url, 'contact' => array());
+               $arr = ['url' => $url, 'contact' => []];
+
+               Addon::callHooks('follow', $arr);
 
-               call_hooks('follow', $arr);
+               if (empty($arr)) {
+                       $result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
+                       return $result;
+               }
 
                if (x($arr['contact'], 'name')) {
                        $ret = $arr['contact'];
@@ -1172,8 +1180,8 @@ class Contact extends BaseObject
                                // NOTREACHED
                        }
                } elseif (Config::get('system', 'dfrn_only')) {
-                       $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
-                       $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
+                       $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
+                       $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        return $result;
                }
 
@@ -1185,30 +1193,30 @@ class Contact extends BaseObject
                // do we have enough information?
 
                if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
-                       $result['message'] .= t('The profile address specified does not provide adequate information.') . EOL;
+                       $result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
                        if (!x($ret, 'poll')) {
-                               $result['message'] .= t('No compatible communication protocols or feeds were discovered.') . EOL;
+                               $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        }
                        if (!x($ret, 'name')) {
-                               $result['message'] .= t('An author or name was not found.') . EOL;
+                               $result['message'] .= L10n::t('An author or name was not found.') . EOL;
                        }
                        if (!x($ret, 'url')) {
-                               $result['message'] .= t('No browser URL could be matched to this address.') . EOL;
+                               $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
                        }
                        if (strpos($url, '@') !== false) {
-                               $result['message'] .= t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
-                               $result['message'] .= t('Use mailto: in front of address to force email check.') . EOL;
+                               $result['message'] .= L10n::t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
+                               $result['message'] .= L10n::t('Use mailto: in front of address to force email check.') . EOL;
                        }
                        return $result;
                }
 
                if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
-                       $result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
+                       $result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
                        $ret['notify'] = '';
                }
 
                if (!$ret['notify']) {
-                       $result['message'] .= t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
+                       $result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
                }
 
                $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
@@ -1217,7 +1225,7 @@ class Contact extends BaseObject
 
                $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
 
-               if (in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA))) {
+               if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) {
                        $writeable = 1;
                }
 
@@ -1244,10 +1252,10 @@ class Contact extends BaseObject
                        // update contact
                        $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
-                       $fields = array('rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false);
-                       dba::update('contact', $fields, array('id' => $r[0]['id']));
+                       $fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
+                       dba::update('contact', $fields, ['id' => $r[0]['id']]);
                } else {
-                       $new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+                       $new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
                        // create contact record
                        dba::insert('contact', [
@@ -1278,7 +1286,7 @@ class Contact extends BaseObject
 
                $contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
                if (!DBM::is_result($contact)) {
-                       $result['message'] .= t('Unable to retrieve contact information.') . EOL;
+                       $result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
                        return $result;
                }
 
@@ -1302,7 +1310,7 @@ class Contact extends BaseObject
                if (DBM::is_result($r)) {
                        if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
                                // create a follow slap
-                               $item = array();
+                               $item = [];
                                $item['verb'] = ACTIVITY_FOLLOW;
                                $item['follow'] = $contact["url"];
                                $slap = OStatus::salmon($item, $r[0]);
@@ -1318,4 +1326,146 @@ class Contact extends BaseObject
                $result['success'] = true;
                return $result;
        }
+
+       public static function updateSslPolicy($contact, $new_policy)
+       {
+               $ssl_changed = false;
+               if ((intval($new_policy) == 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) == 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']];
+                       dba::update('contact', $fields, ['id' => $contact['id']]);
+               }
+
+               return $contact;
+       }
+
+       public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
+               $url = notags(trim($datarray['author-link']));
+               $name = notags(trim($datarray['author-name']));
+               $photo = notags(trim($datarray['author-avatar']));
+
+               if (is_object($item)) {
+                       $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
+                       if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
+                               $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
+                       }
+               } else {
+                       $nick = $item;
+               }
+
+               if (is_array($contact)) {
+                       if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+                               || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
+                               dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+                                               ['id' => $contact['id'], 'uid' => $importer['uid']]);
+                       }
+                       // send email notification to owner?
+               } else {
+                       // create contact record
+                       q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
+                               `blocked`, `readonly`, `pending`, `writable`)
+                               VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
+                               intval($importer['uid']),
+                               dbesc(datetime_convert()),
+                               dbesc($url),
+                               dbesc(normalise_link($url)),
+                               dbesc($name),
+                               dbesc($nick),
+                               dbesc($photo),
+                               dbesc(NETWORK_OSTATUS),
+                               intval(CONTACT_IS_FOLLOWER)
+                       );
+
+                       $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
+                                       intval($importer['uid']),
+                                       dbesc($url)
+                       );
+                       if (DBM::is_result($r)) {
+                               $contact_record = $r[0];
+                               Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
+                       }
+
+                       /// @TODO Encapsulate this into a function/method
+                       $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+                               intval($importer['uid'])
+                       );
+                       if (DBM::is_result($r) && !in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+                               // create notification
+                               $hash = random_string();
+
+                               if (is_array($contact_record)) {
+                                       dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
+                                                               'blocked' => false, 'knowyou' => false,
+                                                               'hash' => $hash, 'datetime' => datetime_convert()]);
+                               }
+
+                               Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
+
+                               if (($r[0]['notify-flags'] & NOTIFY_INTRO) &&
+                                       in_array($r[0]['page-flags'], [PAGE_NORMAL])) {
+
+                                       notification([
+                                               'type'         => NOTIFY_INTRO,
+                                               'notify_flags' => $r[0]['notify-flags'],
+                                               'language'     => $r[0]['language'],
+                                               'to_name'      => $r[0]['username'],
+                                               'to_email'     => $r[0]['email'],
+                                               'uid'          => $r[0]['uid'],
+                                               'link'             => System::baseUrl() . '/notifications/intro',
+                                               'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
+                                               'source_link'  => $contact_record['url'],
+                                               'source_photo' => $contact_record['photo'],
+                                               'verb'         => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
+                                               'otype'        => 'intro'
+                                       ]);
+
+                               }
+                       } elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+                               q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
+                                               intval($importer['uid']),
+                                               dbesc($url)
+                               );
+                       }
+
+               }
+       }
+
+       public static function removeFollower($importer, $contact, array $datarray = [], $item = "") {
+
+               if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
+                       dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
+               } else {
+                       Contact::remove($contact['id']);
+               }
+       }
+
+       public static function removeSharer($importer, $contact, array $datarray = [], $item = "") {
+
+               if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
+                       dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
+               } else {
+                       Contact::remove($contact['id']);
+               }
+       }
 }