]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Merge pull request #4237 from zeroadam/Profile-#3878
[friendica.git] / src / Model / Contact.php
index b0f5ef9f244a3fde42ea33c4d565cc8b32eadd5c..96a2e32c6d24959c03e8dfb34b90fbf5fd57c002 100644 (file)
@@ -1,9 +1,7 @@
 <?php
-
 /**
  * @file src/Model/Contact.php
  */
-
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
@@ -14,6 +12,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Model\Photo;
+use Friendica\Model\Profile;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
@@ -89,7 +88,6 @@ class Contact extends BaseObject
                return $return;
        }
 
-
        /**
         * Creates the self-contact for the provided user id
         *
@@ -103,7 +101,7 @@ class Contact extends BaseObject
                        return true;
                }
 
-               $user = dba::select('user', ['uid', 'username', 'nickname'], ['uid' => $uid], ['limit' => 1]);
+               $user = dba::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
                if (!DBM::is_result($user)) {
                        return false;
                }
@@ -145,13 +143,12 @@ class Contact extends BaseObject
        public static function remove($id)
        {
                // We want just to make sure that we don't delete our "self" contact
-               $r = dba::select('contact', array('uid'), array('id' => $id, 'self' => false), array('limit' => 1));
-
-               if (!DBM::is_result($r) || !intval($r['uid'])) {
+               $contact = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
+               if (!DBM::is_result($contact) || !intval($contact['uid'])) {
                        return;
                }
 
-               $archive = PConfig::get($r['uid'], 'system', 'archive_removed_contacts');
+               $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
                if ($archive) {
                        dba::update('contact', array('archive' => true, 'network' => 'none', 'writable' => false), array('id' => $id));
                        return;
@@ -433,19 +430,27 @@ class Contact extends BaseObject
                // Fetch contact data from the contact table for the given user
                $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
                        `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
-               FROM `contact` WHERE `addr` = '%s' AND `uid` = %d", dbesc($addr), intval($uid));
-
+                       FROM `contact` WHERE `addr` = '%s' AND `uid` = %d",
+                       dbesc($addr),
+                       intval($uid)
+               );
                // Fetch the data from the contact table with "uid=0" (which is filled automatically)
-               if (!DBM::is_result($r))
+               if (!DBM::is_result($r)) {
                        $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
-                       `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
-                       FROM `contact` WHERE `addr` = '%s' AND `uid` = 0", dbesc($addr));
+                               `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
+                               FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
+                               dbesc($addr)
+                       );
+               }
 
                // Fetch the data from the gcontact table
-               if (!DBM::is_result($r))
+               if (!DBM::is_result($r)) {
                        $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
-                       `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
-                       FROM `gcontact` WHERE `addr` = '%s'", dbesc($addr));
+                               `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+                               FROM `gcontact` WHERE `addr` = '%s'",
+                               dbesc($addr)
+                       );
+               }
 
                if (!DBM::is_result($r)) {
                        $data = Probe::uri($addr);
@@ -484,17 +489,18 @@ class Contact extends BaseObject
 
                if ($contact['uid'] != $uid) {
                        if ($uid == 0) {
-                               $profile_link = zrl($contact['url']);
+                               $profile_link = Profile::zrl($contact['url']);
                                $menu = array('profile' => array(t('View Profile'), $profile_link, true));
 
                                return $menu;
                        }
 
-                       $r = dba::select('contact', array(), array('nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid), array('limit' => 1));
-                       if ($r) {
-                               return self::photoMenu($r, $uid);
+                       // Look for our own contact if the uid doesn't match and isn't public
+                       $contact_own = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
+                       if (DBM::is_result($contact_own)) {
+                               return self::photoMenu($contact_own, $uid);
                        } else {
-                               $profile_link = zrl($contact['url']);
+                               $profile_link = Profile::zrl($contact['url']);
                                $connlnk = 'follow/?url=' . $contact['url'];
                                $menu = array(
                                        'profile' => array(t('View Profile'), $profile_link, true),
@@ -540,19 +546,18 @@ class Contact extends BaseObject
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
                 */
-               $menu = array(
-                       'status' => array(t("View Status"), $status_link, true),
-                       'profile' => array(t("View Profile"), $profile_link, true),
-                       'photos' => array(t("View Photos"), $photos_link, true),
-                       'network' => array(t("Network Posts"), $posts_link, false),
-                       'edit' => array(t("View Contact"), $contact_url, false),
-                       'drop' => array(t("Drop Contact"), $contact_drop_link, false),
-                       'pm' => array(t("Send PM"), $pm_url, false),
-                       'poke' => array(t("Poke"), $poke_link, false),
-               );
-
-
-               $args = array('contact' => $contact, 'menu' => &$menu);
+               $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],
+               ];
+
+               $args = ['contact' => $contact, 'menu' => &$menu];
 
                call_hooks('contact_photo_menu', $args);
 
@@ -593,7 +598,9 @@ class Contact extends BaseObject
                                        SELECT DISTINCT(`contact-id`)
                                        FROM `group_member`
                                        WHERE `uid` = %d
-                               )", intval($uid), intval($uid)
+                               )",
+                               intval($uid),
+                               intval($uid)
                        );
 
                        return $r;
@@ -612,13 +619,18 @@ class Contact extends BaseObject
                                INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
                                WHERE `group`.`uid` = %d
                        )
-                       LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
+                       LIMIT %d, %d",
+                       intval($uid),
+                       intval($uid),
+                       intval($start),
+                       intval($count)
                );
+               
                return $r;
        }
 
        /**
-        * @brief Fetch the contact id for a given url and user
+        * @brief Fetch the contact id for a given URL and user
         *
         * First lookup in the contact table to find a record matching either `url`, `nurl`,
         * `addr` or `alias`.
@@ -627,7 +639,7 @@ class Contact extends BaseObject
         * If there's one, we check that it isn't time to update the picture else we
         * directly return the found contact id.
         *
-        * Second, we probe the provided $url wether it's http://server.tld/profile or
+        * Second, we probe the provided $url whether it's http://server.tld/profile or
         * nick@server.tld. We quit if we can't get any info back.
         *
         * Third, we create the contact record if it doesn't exist
@@ -653,20 +665,19 @@ class Contact extends BaseObject
 
                /// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
                // We first try the nurl (http://server.tld/nick), most common case
-               $contact = dba::select('contact', array('id', 'avatar-date'), array('nurl' => normalise_link($url), 'uid' => $uid), array('limit' => 1));
+               $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
 
                // Then the addr (nick@server.tld)
                if (!DBM::is_result($contact)) {
-                       $contact = dba::select('contact', array('id', 'avatar-date'), array('addr' => $url, 'uid' => $uid), array('limit' => 1));
+                       $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
                }
 
                // Then the alias (which could be anything)
                if (!DBM::is_result($contact)) {
                        // The link could be provided as http although we stored it as https
                        $ssl_url = str_replace('http://', 'https://', $url);
-                       $r = dba::select('contact', array('id', 'avatar', 'avatar-date'), array('`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid), array('limit' => 1));
-                       $contact = dba::fetch($r);
-                       dba::close($r);
+                       $condition = ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid];
+                       $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
                }
 
                if (DBM::is_result($contact)) {
@@ -697,12 +708,12 @@ class Contact extends BaseObject
                        }
 
                        // Get data from the gcontact table
-                       $gcontacts = dba::select('gcontact', array('name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'), array('nurl' => normalise_link($url)), array('limit' => 1));
-                       if (!DBM::is_result($gcontacts)) {
+                       $gcontact = dba::selectFirst('gcontact', ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'], ['nurl' => normalise_link($url)]);
+                       if (!DBM::is_result($gcontact)) {
                                return 0;
                        }
 
-                       $data = array_merge($data, $gcontacts);
+                       $data = array_merge($data, $gcontact);
                }
 
                if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) {
@@ -711,22 +722,39 @@ class Contact extends BaseObject
 
                $url = $data["url"];
                if (!$contact_id) {
-                       dba::insert(
-                               'contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"],
-                               'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"],
-                               'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"],
-                               'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"],
-                               'keywords' => $data["keywords"], 'location' => $data["location"], 'about' => $data["about"],
-                               'network' => $data["network"], 'pubkey' => $data["pubkey"],
-                               'rel' => CONTACT_IS_SHARING, 'priority' => $data["priority"],
-                               'batch' => $data["batch"], 'request' => $data["request"],
-                               'confirm' => $data["confirm"], 'poco' => $data["poco"],
-                               'name-date' => datetime_convert(), 'uri-date' => datetime_convert(),
-                               'avatar-date' => datetime_convert(), 'writable' => 1, 'blocked' => 0,
-                               'readonly' => 0, 'pending' => 0)
+                       dba::insert('contact', [
+                               'uid'       => $uid,
+                               'created'   => datetime_convert(),
+                               'url'       => $data["url"],
+                               'nurl'      => normalise_link($data["url"]),
+                               'addr'      => $data["addr"],
+                               'alias'     => $data["alias"],
+                               'notify'    => $data["notify"],
+                               'poll'      => $data["poll"],
+                               'name'      => $data["name"],
+                               'nick'      => $data["nick"],
+                               'photo'     => $data["photo"],
+                               'keywords'  => $data["keywords"],
+                               'location'  => $data["location"],
+                               'about'     => $data["about"],
+                               'network'   => $data["network"],
+                               'pubkey'    => $data["pubkey"],
+                               'rel'       => CONTACT_IS_SHARING,
+                               'priority'  => $data["priority"],
+                               'batch'     => $data["batch"],
+                               'request'   => $data["request"],
+                               'confirm'   => $data["confirm"],
+                               'poco'      => $data["poco"],
+                               'name-date' => datetime_convert(),
+                               'uri-date'  => datetime_convert(),
+                               'avatar-date' => datetime_convert(),
+                               'writable'  => 1,
+                               'blocked'   => 0,
+                               'readonly'  => 0,
+                               'pending'   => 0]
                        );
 
-                       $s = dba::select('contact', array('id'), array('nurl' => normalise_link($data["url"]), 'uid' => $uid), array('order' => array('id'), 'limit' => 2));
+                       $s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
                        $contacts = dba::inArray($s);
                        if (!DBM::is_result($contacts)) {
                                return 0;
@@ -735,7 +763,7 @@ class Contact extends BaseObject
                        $contact_id = $contacts[0]["id"];
 
                        // Update the newly created contact from data in the gcontact table
-                       $gcontact = dba::select('gcontact', array('location', 'about', 'keywords', 'gender'), array('nurl' => normalise_link($data["url"])), array('limit' => 1));
+                       $gcontact = dba::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
                        if (DBM::is_result($gcontact)) {
                                // Only use the information when the probing hadn't fetched these values
                                if ($data['keywords'] != '') {
@@ -751,15 +779,15 @@ class Contact extends BaseObject
                        }
 
                        if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-                               dba::delete('contact', array("`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
-                                       normalise_link($data["url"]), $contact_id));
+                               dba::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
+                                       normalise_link($data["url"]), $contact_id]);
                        }
                }
 
                self::updateAvatar($data["photo"], $uid, $contact_id);
 
-               $fields = array('url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey');
-               $contact = dba::select('contact', $fields, array('id' => $contact_id), array('limit' => 1));
+               $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
+               $contact = dba::selectFirst('contact', $fields, ['id' => $contact_id]);
 
                // This condition should always be true
                if (!DBM::is_result($contact)) {
@@ -817,7 +845,7 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $blocked = dba::select('contact', array('blocked'), array('id' => $cid), array('limit' => 1));
+               $blocked = dba::selectFirst('contact', ['blocked'], ['id' => $cid]);
                if (!DBM::is_result($blocked)) {
                        return false;
                }
@@ -837,7 +865,7 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $hidden = dba::select('contact', array('hidden'), array('id' => $cid), array('limit' => 1));
+               $hidden = dba::selectFirst('contact', ['hidden'], ['id' => $cid]);
                if (!DBM::is_result($hidden)) {
                        return false;
                }
@@ -860,7 +888,9 @@ class Contact extends BaseObject
                // There are no posts with "uid = 0" with connector networks
                // This speeds up the query a lot
                $r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
-                       WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0", dbesc(normalise_link($contact_url)));
+                       WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
+                       dbesc(normalise_link($contact_url))
+               );
 
                if (!DBM::is_result($r)) {
                        return '';
@@ -882,7 +912,6 @@ class Contact extends BaseObject
                        intval($a->pager['start']), intval($a->pager['itemspage'])
                );
 
-
                $o = conversation($a, $r, 'contact-posts', false);
 
                $o .= alt_pager($a, count($r));
@@ -919,6 +948,7 @@ class Contact extends BaseObject
                if (isset($contact["contact-type"])) {
                        $type = $contact["contact-type"];
                }
+
                if (isset($contact["account-type"])) {
                        $type = $contact["account-type"];
                }
@@ -965,10 +995,10 @@ class Contact extends BaseObject
                $return = dba::update('contact', ['blocked' => false], ['id' => $uid]);
 
                return $return;
-  }
+       }
 
-  /**
-   * @brief Updates the avatar links in a contact only if needed
+       /**
+        * @brief Updates the avatar links in a contact only if needed
         *
         * @param string $avatar Link to avatar picture
         * @param int    $uid    User id of contact owner
@@ -979,15 +1009,14 @@ class Contact extends BaseObject
         */
        public static function updateAvatar($avatar, $uid, $cid, $force = false)
        {
-               // Limit = 1 returns the row so no need for dba:inArray()
-               $r = dba::select('contact', array('avatar', 'photo', 'thumb', 'micro', 'nurl'), array('id' => $cid), array('limit' => 1));
-               if (!DBM::is_result($r)) {
+               $contact = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
+               if (!DBM::is_result($contact)) {
                        return false;
                } else {
-                       $data = array($r["photo"], $r["thumb"], $r["micro"]);
+                       $data = array($contact["photo"], $contact["thumb"], $contact["micro"]);
                }
 
-               if (($r["avatar"] != $avatar) || $force) {
+               if (($contact["avatar"] != $avatar) || $force) {
                        $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
 
                        if ($photos) {
@@ -999,7 +1028,7 @@ class Contact extends BaseObject
 
                                // Update the public contact (contact id = 0)
                                if ($uid != 0) {
-                                       $pcontact = dba::select('contact', array('id'), array('nurl' => $r[0]['nurl']), array('limit' => 1));
+                                       $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl']]);
                                        if (DBM::is_result($pcontact)) {
                                                self::updateAvatar($avatar, 0, $pcontact['id'], $force);
                                        }
@@ -1019,19 +1048,20 @@ class Contact extends BaseObject
        public static function updateFromProbe($id)
        {
                /*
-               Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
-               This will reliably kill your communication with Friendica contacts.
-               */
+                 Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
+                 This will reliably kill your communication with Friendica contacts.
+                */
 
-               $r = dba::select('contact', ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'], ['id' => $id], ['limit' => 1]);
-               if (!DBM::is_result($r)) {
+               $fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
+               $contact = dba::selectFirst('contact', $fields, ['id' => $id]);
+               if (!DBM::is_result($contact)) {
                        return false;
                }
 
-               $ret = Probe::uri($r["url"]);
+               $ret = Probe::uri($contact["url"]);
 
                // If Probe::uri fails the network code will be different
-               if ($ret["network"] != $r["network"]) {
+               if ($ret["network"] != $contact["network"]) {
                        return false;
                }
 
@@ -1039,11 +1069,13 @@ class Contact extends BaseObject
 
                // make sure to not overwrite existing values with blank entries
                foreach ($ret as $key => $val) {
-                       if (isset($r[$key]) && ($r[$key] != "") && ($val == ""))
-                               $ret[$key] = $r[$key];
+                       if (isset($contact[$key]) && ($contact[$key] != "") && ($val == "")) {
+                               $ret[$key] = $contact[$key];
+                       }
 
-                       if (isset($r[$key]) && ($ret[$key] != $r[$key]))
+                       if (isset($contact[$key]) && ($ret[$key] != $contact[$key])) {
                                $update = true;
+                       }
                }
 
                if (!$update) {
@@ -1051,16 +1083,15 @@ class Contact extends BaseObject
                }
 
                dba::update(
-                       'contact',
-                       [
-                               'url' => $ret['url'],
-                               'nurl' => normalise_link($ret['url']),
-                               'addr' => $ret['addr'],
-                               'alias' => $ret['alias'],
-                               'batch' => $ret['batch'],
+                       'contact', [
+                               'url'    => $ret['url'],
+                               'nurl'   => normalise_link($ret['url']),
+                               'addr'   => $ret['addr'],
+                               'alias'  => $ret['alias'],
+                               'batch'  => $ret['batch'],
                                'notify' => $ret['notify'],
-                               'poll' => $ret['poll'],
-                               'poco' => $ret['poco']
+                               'poll'   => $ret['poll'],
+                               'poco'   => $ret['poco']
                        ],
                        ['id' => $id]
                );
@@ -1076,7 +1107,7 @@ class Contact extends BaseObject
         * Currently if the contact is DFRN, interactive needs to be true, to redirect to the
         * dfrn_request page.
         *
-        * Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc.
+        * Otherwise this can be used to bulk add StatusNet contacts, Twitter contacts, etc.
         *
         * Returns an array
         * $return['success'] boolean true if successful
@@ -1203,7 +1234,9 @@ class Contact extends BaseObject
 
                if (!DBM::is_result($r)) {
                        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
-                               intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
+                               intval($uid),
+                               dbesc(normalise_link($url)),
+                               dbesc($ret['network'])
                        );
                }
 
@@ -1217,44 +1250,39 @@ class Contact extends BaseObject
                        $new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
                        // create contact record
-                       dba::insert(
-                               'contact',
-                               [
-                                       'uid' => $uid,
-                                       'created' => datetime_convert(),
-                                       'url' => $ret['url'],
-                                       'nurl' => normalise_link($ret['url']),
-                                       'addr' => $ret['addr'],
-                                       'alias' => $ret['alias'],
-                                       'batch' => $ret['batch'],
-                                       `notify` => $ret['notify'],
-                                       `poll` => $ret['poll'],
-                                       `poco` => $ret['poco'],
-                                       `name` => $ret['name'],
-                                       `nick` => $ret['nick'],
-                                       `network` => $ret['network'],
-                                       `pubkey` => $ret['pubkey'],
-                                       `rel` => $new_relation,
-                                       `priority` => $ret['priority'],
-                                       `writable` => $writeable,
-                                       `hidden` => $hidden,
-                                       `blocked` => 0,
-                                       `readonly` => 0,
-                                       `pending` => 0,
-                                       `subhub` => $subhub
-                               ]
-                       );
-               }
-
-               $r = dba::select('contact', ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid], ['limit' => 1]);
-
-               if (!DBM::is_result($r)) {
+                       dba::insert('contact', [
+                               'uid'     => $uid,
+                               'created' => datetime_convert(),
+                               'url'     => $ret['url'],
+                               'nurl'    => normalise_link($ret['url']),
+                               'addr'    => $ret['addr'],
+                               'alias'   => $ret['alias'],
+                               'batch'   => $ret['batch'],
+                               'notify'  => $ret['notify'],
+                               'poll'    => $ret['poll'],
+                               'poco'    => $ret['poco'],
+                               'name'    => $ret['name'],
+                               'nick'    => $ret['nick'],
+                               'network' => $ret['network'],
+                               'pubkey'  => $ret['pubkey'],
+                               'rel'     => $new_relation,
+                               'priority'=> $ret['priority'],
+                               'writable'=> $writeable,
+                               'hidden'  => $hidden,
+                               'blocked' => 0,
+                               'readonly'=> 0,
+                               'pending' => 0,
+                               'subhub'  => $subhub
+                       ]);
+               }
+
+               $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;
                        return $result;
                }
 
-               $contact = $r;
-               $contact_id = $r['id'];
+               $contact_id = $contact['id'];
                $result['cid'] = $contact_id;
 
                Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
@@ -1267,8 +1295,8 @@ class Contact extends BaseObject
                Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
 
                $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-                               WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-                               intval($uid)
+                       WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
+                       intval($uid)
                );
 
                if (DBM::is_result($r)) {