]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Merge pull request #5776 from annando/fix-contact
[friendica.git] / src / Model / Contact.php
index 90c30ef93f533e7aeacccb291759015d0c27e83c..1bbc0228a806a46dc7729ef1a852e7d12d53cb81 100644 (file)
@@ -9,12 +9,15 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
@@ -30,6 +33,55 @@ require_once 'include/text.php';
  */
 class Contact extends BaseObject
 {
+       /**
+        * @name page/profile types
+        *
+        * PAGE_NORMAL is a typical personal profile account
+        * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
+        * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
+        *      write access to wall and comments (no email and not included in page owner's ACL lists)
+        * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
+        *
+        * @{
+        */
+       const PAGE_NORMAL    = 0;
+       const PAGE_SOAPBOX   = 1;
+       const PAGE_COMMUNITY = 2;
+       const PAGE_FREELOVE  = 3;
+       const PAGE_BLOG      = 4;
+       const PAGE_PRVGROUP  = 5;
+       /**
+        * @}
+        */
+
+       /**
+        * @name account types
+        *
+        * ACCOUNT_TYPE_PERSON - the account belongs to a person
+        *      Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
+        *
+        * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+        *      Associated page type: PAGE_SOAPBOX
+        *
+        * ACCOUNT_TYPE_NEWS - the account is a news reflector
+        *      Associated page type: PAGE_SOAPBOX
+        *
+        * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+        *      Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+        *
+        * ACCOUNT_TYPE_RELAY - the account is a relay
+        *      This will only be assigned to contacts, not to user accounts
+        * @{
+        */
+       const ACCOUNT_TYPE_PERSON =       0;
+       const ACCOUNT_TYPE_ORGANISATION = 1;
+       const ACCOUNT_TYPE_NEWS =         2;
+       const ACCOUNT_TYPE_COMMUNITY =    3;
+       const ACCOUNT_TYPE_RELAY =        4;
+       /**
+        * @}
+        */
+
        /**
         * @name Contact_is
         *
@@ -43,6 +95,210 @@ class Contact extends BaseObject
         * @}
         */
 
+       /**
+        * @brief Returns the contact id for the user and the public contact id for a given contact id
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return array with public and user's contact id
+        */
+       private static function getPublicAndUserContacID($cid, $uid)
+       {
+               if (empty($uid) || empty($cid)) {
+                       return [];
+               }
+
+               $contact = DBA::selectFirst('contact', ['id', 'uid', 'url'], ['id' => $cid]);
+               if (!DBA::isResult($contact)) {
+                       return [];
+               }
+
+               // We quit when the user id don't match the user id of the provided contact
+               if (($contact['uid'] != $uid) && ($contact['uid'] != 0)) {
+                       return [];
+               }
+
+               if ($contact['uid'] != 0) {
+                       $pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+                       if (empty($pcid)) {
+                               return [];
+                       }
+                       $ucid = $contact['id'];
+               } else {
+                       $pcid = $contact['id'];
+                       $ucid = Contact::getIdForURL($contact['url'], $uid, true);
+               }
+
+               return ['public' => $pcid, 'user' => $ucid];
+       }
+
+       /**
+        * @brief Block contact id for user id
+        *
+        * @param int     $cid     Either public contact id or user's contact id
+        * @param int     $uid     User ID
+        * @param boolean $blocked Is the contact blocked or unblocked?
+        */
+       public static function setBlockedForUser($cid, $uid, $blocked)
+       {
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               if ($cdata['user'] != 0) {
+                       DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
+               }
+
+               DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+       }
+
+       /**
+        * @brief Returns "block" state for contact id and user id
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return boolean is the contact id blocked for the given user?
+        */
+       public static function isBlockedByUser($cid, $uid)
+       {
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               $public_blocked = false;
+
+               if (!empty($cdata['public'])) {
+                       $public_contact = DBA::selectFirst('user-contact', ['blocked'], ['cid' => $cdata['public'], 'uid' => $uid]);
+                       if (DBA::isResult($public_contact)) {
+                               $public_blocked = $public_contact['blocked'];
+                       }
+               }
+
+               $user_blocked = $public_blocked;
+
+               if (!empty($cdata['user'])) {
+                       $user_contact = DBA::selectFirst('contact', ['blocked'], ['id' => $cdata['user'], 'pending' => false]);
+                       if (DBA::isResult($user_contact)) {
+                               $user_blocked = $user_contact['blocked'];
+                       }
+               }
+
+               if ($user_blocked != $public_blocked) {
+                       DBA::update('user-contact', ['blocked' => $user_blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+               }
+
+               return $user_blocked;
+       }
+
+       /**
+        * @brief Ignore contact id for user id
+        *
+        * @param int     $cid     Either public contact id or user's contact id
+        * @param int     $uid     User ID
+        * @param boolean $ignored Is the contact ignored or unignored?
+        */
+       public static function setIgnoredForUser($cid, $uid, $ignored)
+       {
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               if ($cdata['user'] != 0) {
+                       DBA::update('contact', ['readonly' => $ignored], ['id' => $cdata['user'], 'pending' => false]);
+               }
+
+               DBA::update('user-contact', ['ignored' => $ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+       }
+
+       /**
+        * @brief Returns "ignore" state for contact id and user id
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return boolean is the contact id ignored for the given user?
+        */
+       public static function isIgnoredByUser($cid, $uid)
+       {
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               $public_ignored = false;
+
+               if (!empty($cdata['public'])) {
+                       $public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]);
+                       if (DBA::isResult($public_contact)) {
+                               $public_ignored = $public_contact['ignored'];
+                       }
+               }
+
+               $user_ignored = $public_ignored;
+
+               if (!empty($cdata['user'])) {
+                       $user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]);
+                       if (DBA::isResult($user_contact)) {
+                               $user_ignored = $user_contact['readonly'];
+                       }
+               }
+
+               if ($user_ignored != $public_ignored) {
+                       DBA::update('user-contact', ['ignored' => $user_ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+               }
+
+               return $user_ignored;
+       }
+
+       /**
+        * @brief Set "collapsed" for contact id and user id
+        *
+        * @param int     $cid       Either public contact id or user's contact id
+        * @param int     $uid       User ID
+        * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
+        */
+       public static function setCollapsedForUser($cid, $uid, $collapsed)
+       {
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               DBA::update('user-contact', ['collapsed' => $collapsed], ['cid' => $cdata['public'], 'uid' => $uid], true);
+       }
+
+       /**
+        * @brief Returns "collapsed" state for contact id and user id
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return boolean is the contact id blocked for the given user?
+        */
+       public static function isCollapsedByUser($cid, $uid)
+       {
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               $collapsed = false;
+
+               if (!empty($cdata['public'])) {
+                       $public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]);
+                       if (DBA::isResult($public_contact)) {
+                               $collapsed = $public_contact['collapsed'];
+                       }
+               }
+
+               return $collapsed;
+       }
+
        /**
         * @brief Returns a list of contacts belonging in a group
         *
@@ -52,6 +308,7 @@ class Contact extends BaseObject
        public static function getByGroupId($gid)
        {
                $return = [];
+
                if (intval($gid)) {
                        $stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.*
                                FROM `contact`
@@ -66,6 +323,7 @@ class Contact extends BaseObject
                                $gid,
                                local_user()
                        );
+
                        if (DBA::isResult($stmt)) {
                                $return = DBA::toArray($stmt);
                        }
@@ -94,7 +352,7 @@ class Contact extends BaseObject
                                AND `contact`.`notify` != ""',
                                $gid,
                                local_user(),
-                               NETWORK_OSTATUS
+                               Protocol::OSTATUS
                        );
                        $return = $contacts['count'];
                }
@@ -212,8 +470,8 @@ class Contact extends BaseObject
                        $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
                }
 
-               $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
-               $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+               $fields['forum'] = $user['page-flags'] == self::PAGE_COMMUNITY;
+               $fields['prv'] = $user['page-flags'] == self::PAGE_PRVGROUP;
 
                // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
                $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
@@ -261,38 +519,41 @@ class Contact extends BaseObject
                        return;
                }
 
-               $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
-               if ($archive) {
-                       DBA::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
-                       return;
-               }
+               // Archive the contact
+               DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
 
-               DBA::delete('contact', ['id' => $id]);
-
-               // Delete the rest in the background
+               // Delete it in the background
                Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
        }
 
        /**
         * @brief Sends an unfriend message. Does not remove the contact
         *
-        * @param array $user    User unfriending
-        * @param array $contact Contact unfriended
+        * @param array   $user     User unfriending
+        * @param array   $contact  Contact unfriended
+        * @param boolean $dissolve Remove the contact on the remote side
         * @return void
         */
-       public static function terminateFriendship(array $user, array $contact)
+       public static function terminateFriendship(array $user, array $contact, $dissolve = false)
        {
-               if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+               if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+                       DFRN::deliver($user, $contact, 'placeholder', true);
+               } elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
                        // create an unfollow slap
                        $item = [];
                        $item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
                        $item['follow'] = $contact["url"];
+                       $item['body'] = '';
+                       $item['title'] = '';
+                       $item['guid'] = '';
+                       $item['tag'] = '';
+                       $item['attach'] = '';
                        $slap = OStatus::salmon($item, $user);
 
                        if (!empty($contact['notify'])) {
                                Salmon::slapper($user, $contact['notify'], $slap);
                        }
-               } elseif ($contact['network'] == NETWORK_DIASPORA) {
+               } elseif ($contact['network'] == Protocol::DIASPORA) {
                        Diaspora::sendUnshare($user, $contact);
                }
        }
@@ -311,6 +572,16 @@ class Contact extends BaseObject
         */
        public static function markForArchival(array $contact)
        {
+               if (!isset($contact['url']) && !empty($contact['id'])) {
+                       $fields = ['id', 'url', 'archive', 'self', 'term-date'];
+                       $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+                       if (!DBA::isResult($contact)) {
+                               return;
+                       }
+               } elseif (!isset($contact['url'])) {
+                       logger('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+               }
+
                // Contact already archived or "self" contact? => nothing to do
                if ($contact['archive'] || $contact['self']) {
                        return;
@@ -318,10 +589,7 @@ class Contact extends BaseObject
 
                if ($contact['term-date'] <= NULL_DATE) {
                        DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-
-                       if ($contact['url'] != '') {
-                               DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
-                       }
+                       DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
                } else {
                        /* @todo
                         * We really should send a notification to the owner after 2-3 weeks
@@ -339,10 +607,7 @@ class Contact extends BaseObject
                                 * the whole process over again.
                                 */
                                DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
-
-                               if ($contact['url'] != '') {
-                                       DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
-                               }
+                               DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
                        }
                }
        }
@@ -365,16 +630,21 @@ class Contact extends BaseObject
                        return;
                }
 
+               if (!isset($contact['url']) && !empty($contact['id'])) {
+                       $fields = ['id', 'url', 'batch'];
+                       $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+                       if (!DBA::isResult($contact)) {
+                               return;
+                       }
+               }
+
                // It's a miracle. Our dead contact has inexplicably come back to life.
                $fields = ['term-date' => NULL_DATE, 'archive' => false];
                DBA::update('contact', $fields, ['id' => $contact['id']]);
-
-               if (!empty($contact['url'])) {
-                       DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
-               }
+               DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
 
                if (!empty($contact['batch'])) {
-                       $condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
+                       $condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
                        DBA::update('contact', $fields, $condition);
                }
        }
@@ -451,7 +721,7 @@ class Contact extends BaseObject
                        // If there is more than one entry we filter out the connector networks
                        if (count($r) > 1) {
                                foreach ($r as $id => $result) {
-                                       if ($result["network"] == NETWORK_STATUSNET) {
+                                       if ($result["network"] == Protocol::STATUSNET) {
                                                unset($r[$id]);
                                        }
                                }
@@ -505,13 +775,13 @@ class Contact extends BaseObject
                }
 
                if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
-                       && in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
+                       && in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
                ) {
                        Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
                }
 
                // Show contact details of Diaspora contacts only if connected
-               if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == NETWORK_DIASPORA)) {
+               if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == Protocol::DIASPORA)) {
                        $profile["location"] = "";
                        $profile["about"] = "";
                        $profile["gender"] = "";
@@ -617,20 +887,11 @@ class Contact extends BaseObject
                        $contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
                        if (DBA::isResult($contact_own)) {
                                return self::photoMenu($contact_own, $uid);
-                       } else {
-                               $profile_link = self::magicLink($contact['url']);
-                               $connlnk = 'follow/?url=' . $contact['url'];
-                               $menu = [
-                                       'profile' => [L10n::t('View Profile'), $profile_link, true],
-                                       'follow' => [L10n::t('Connect/Follow'), $connlnk, true]
-                               ];
-
-                               return $menu;
                        }
                }
 
                $sparkle = false;
-               if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) {
+               if (($contact['network'] === Protocol::DFRN) && !$contact['self']) {
                        $sparkle = true;
                        $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
                } else {
@@ -647,17 +908,17 @@ class Contact extends BaseObject
                        $profile_link = $profile_link . '?url=profile';
                }
 
-               if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) {
+               if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
                        $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
                }
 
-               if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) {
+               if (($contact['network'] == Protocol::DFRN) && !$contact['self']) {
                        $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
                }
 
                $contact_url = System::baseUrl() . '/contacts/' . $contact['id'];
 
-               $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts';
+               $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/conversations';
 
                if (!$contact['self']) {
                        $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
@@ -667,16 +928,26 @@ class Contact extends BaseObject
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
                 */
-               $menu = [
-                       '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],
-               ];
+               if (empty($contact['uid'])) {
+                       $connlnk = 'follow/?url=' . $contact['url'];
+                       $menu = [
+                               'profile' => [L10n::t('View Profile'),   $profile_link, true],
+                               'network' => [L10n::t('Network Posts'),  $posts_link,   false],
+                               'edit'    => [L10n::t('View Contact'),   $contact_url,  false],
+                               'follow'  => [L10n::t('Connect/Follow'), $connlnk,      true],
+                       ];
+               } else {
+                       $menu = [
+                               '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];
 
@@ -792,10 +1063,32 @@ class Contact extends BaseObject
                        return 0;
                }
 
-               $data = Probe::uri($url, "", $uid);
+               // When we don't want to update, we look if some of our users already know this contact
+               if ($no_update) {
+                       $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+                               'photo', 'keywords', 'location', 'about', 'network',
+                               'priority', 'batch', 'request', 'confirm', 'poco'];
+                       $data = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+
+                       if (DBA::isResult($data)) {
+                               // For security reasons we don't fetch key data from our users
+                               $data["pubkey"] = '';
+                       }
+               } else {
+                       $data = [];
+               }
+
+               if (empty($data)) {
+                       $data = Probe::uri($url, "", $uid);
+
+                       // Ensure that there is a gserver entry
+                       if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
+                               PortableContact::checkServer($data['baseurl']);
+                       }
+               }
 
                // Last try in gcontact for unsupported networks
-               if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) {
+               if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
                        if ($uid != 0) {
                                return 0;
                        }
@@ -1017,7 +1310,7 @@ class Contact extends BaseObject
         *
         * @return string posts in HTML
         */
-       public static function getPostsFromUrl($contact_url)
+       public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
        {
                $a = self::getApp();
 
@@ -1034,7 +1327,7 @@ class Contact extends BaseObject
                        return '';
                }
 
-               if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+               if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
                        $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
                } else {
                        $sql = "`item`.`uid` = ?";
@@ -1042,19 +1335,36 @@ class Contact extends BaseObject
 
                $author_id = intval($r[0]["author-id"]);
 
-               $contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+               $contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+
+               if ($thread_mode) {
+                       $condition = ["`$contact` = ? AND `gravity` = ? AND " . $sql,
+                               $author_id, GRAVITY_PARENT, local_user()];
+               } else {
+                       $condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
+                               $author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+               }
 
-               $condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
-                       $author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
                $params = ['order' => ['created' => true],
                        'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-               $r = Item::selectForUser(local_user(), [], $condition, $params);
 
-               $items = Item::inArray($r);
+               if ($thread_mode) {
+                       $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+                       $items = Item::inArray($r);
 
-               $o = conversation($a, $items, 'contact-posts', false);
+                       $o = conversation($a, $items, 'contacts', $update);
+               } else {
+                       $r = Item::selectForUser(local_user(), [], $condition, $params);
+
+                       $items = Item::inArray($r);
 
-               $o .= alt_pager($a, count($items));
+                       $o = conversation($a, $items, 'contact-posts', false);
+               }
+
+               if (!$update) {
+                       $o .= alt_pager($a, count($items));
+               }
 
                return $o;
        }
@@ -1071,17 +1381,17 @@ class Contact extends BaseObject
        {
                // There are several fields that indicate that the contact or user is a forum
                // "page-flags" is a field in the user table,
-               // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
-               // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
-               if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
-                       || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+               // "forum" and "prv" are used in the contact table. They stand for self::PAGE_COMMUNITY and self::PAGE_PRVGROUP.
+               // "community" is used in the gcontact table and is true if the contact is self::PAGE_COMMUNITY or self::PAGE_PRVGROUP.
+               if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_COMMUNITY))
+                       || (isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_PRVGROUP))
                        || (isset($contact['forum']) && intval($contact['forum']))
                        || (isset($contact['prv']) && intval($contact['prv']))
                        || (isset($contact['community']) && intval($contact['community']))
                ) {
-                       $type = ACCOUNT_TYPE_COMMUNITY;
+                       $type = self::ACCOUNT_TYPE_COMMUNITY;
                } else {
-                       $type = ACCOUNT_TYPE_PERSON;
+                       $type = self::ACCOUNT_TYPE_PERSON;
                }
 
                // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
@@ -1094,15 +1404,18 @@ class Contact extends BaseObject
                }
 
                switch ($type) {
-                       case ACCOUNT_TYPE_ORGANISATION:
+                       case self::ACCOUNT_TYPE_ORGANISATION:
                                $account_type = L10n::t("Organisation");
                                break;
-                       case ACCOUNT_TYPE_NEWS:
+
+                       case self::ACCOUNT_TYPE_NEWS:
                                $account_type = L10n::t('News');
                                break;
-                       case ACCOUNT_TYPE_COMMUNITY:
+
+                       case self::ACCOUNT_TYPE_COMMUNITY:
                                $account_type = L10n::t("Forum");
                                break;
+
                        default:
                                $account_type = "";
                                break;
@@ -1308,22 +1621,14 @@ class Contact extends BaseObject
                // the poll url is more reliable than the profile url, as we may have
                // indirect links or webfinger links
 
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1",
-                       intval($uid),
-                       DBA::escape($ret['poll']),
-                       DBA::escape(normalise_link($ret['poll'])),
-                       DBA::escape($ret['network'])
-               );
-
-               if (!DBA::isResult($r)) {
-                       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1",
-                               intval($uid),
-                               DBA::escape(normalise_link($url)),
-                               DBA::escape($ret['network'])
-                       );
+               $condition = ['uid' => $uid, 'poll' => [$ret['poll'], normalise_link($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+               $contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
+               if (!DBA::isResult($contact)) {
+                       $condition = ['uid' => $uid, 'nurl' => normalise_link($url), 'network' => $ret['network'], 'pending' => false];
+                       $contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
                }
 
-               if (($ret['network'] === NETWORK_DFRN) && !DBA::isResult($r)) {
+               if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) {
                        if ($interactive) {
                                if (strlen($a->urlpath)) {
                                        $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
@@ -1335,14 +1640,14 @@ class Contact extends BaseObject
 
                                // NOTREACHED
                        }
-               } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) {
+               } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
                        $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
                        $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        return $result;
                }
 
                // This extra param just confuses things, remove it
-               if ($ret['network'] === NETWORK_DIASPORA) {
+               if ($ret['network'] === Protocol::DIASPORA) {
                        $ret['url'] = str_replace('?absolute=true', '', $ret['url']);
                }
 
@@ -1366,7 +1671,7 @@ class Contact extends BaseObject
                        return $result;
                }
 
-               if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
+               if ($ret['network'] === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
                        $result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
                        $ret['notify'] = '';
                }
@@ -1375,24 +1680,24 @@ class Contact extends BaseObject
                        $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);
+               $writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
 
-               $subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false);
+               $subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false);
 
-               $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+               $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
 
-               if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) {
+               if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) {
                        $writeable = 1;
                }
 
-               if (DBA::isResult($r)) {
+               if (DBA::isResult($contact)) {
                        // update contact
-                       $new_relation = (($r[0]['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
+                       $new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
 
                        $fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
-                       DBA::update('contact', $fields, ['id' => $r[0]['id']]);
+                       DBA::update('contact', $fields, ['id' => $contact['id']]);
                } else {
-                       $new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? self::FRIEND : self::SHARING);
+                       $new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
 
                        // create contact record
                        DBA::insert('contact', [
@@ -1439,22 +1744,26 @@ 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)
-               );
+               $owner = User::getOwnerDataById($uid);
 
-               if (DBA::isResult($r)) {
-                       if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+               if (DBA::isResult($owner)) {
+                       if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
                                // create a follow slap
                                $item = [];
                                $item['verb'] = ACTIVITY_FOLLOW;
                                $item['follow'] = $contact["url"];
-                               $slap = OStatus::salmon($item, $r[0]);
+                               $item['body'] = '';
+                               $item['title'] = '';
+                               $item['guid'] = '';
+                               $item['tag'] = '';
+                               $item['attach'] = '';
+
+                               $slap = OStatus::salmon($item, $owner);
+
                                if (!empty($contact['notify'])) {
-                                       Salmon::slapper($r[0], $contact['notify'], $slap);
+                                       Salmon::slapper($owner, $contact['notify'], $slap);
                                }
-                       } elseif ($contact['network'] == NETWORK_DIASPORA) {
+                       } elseif ($contact['network'] == Protocol::DIASPORA) {
                                $ret = Diaspora::sendShare($a->user, $contact);
                                logger('share returns: ' . $ret);
                        }
@@ -1464,7 +1773,15 @@ class Contact extends BaseObject
                return $result;
        }
 
-       public static function updateSslPolicy($contact, $new_policy)
+       /**
+        * @brief Updated contact's SSL policy
+        *
+        * @param array  $contact Contact array
+        * @param string $new_policy New policy, valid: self,full
+        *
+        * @return array Contact array with updated values
+        */
+       public static function updateSslPolicy(array $contact, $new_policy)
        {
                $ssl_changed = false;
                if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
@@ -1498,20 +1815,24 @@ class Contact extends BaseObject
        }
 
        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']));
-               $nick = '';
-
-               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;
+               // Should always be set
+               if (empty($datarray['author-id'])) {
+                       return;
+               }
+
+               $fields = ['url', 'name', 'nick', 'photo', 'network'];
+               $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
+               if (!DBA::isResult($pub_contact)) {
+                       // Should never happen
+                       return;
                }
 
+               $url = $pub_contact['url'];
+               $name = $pub_contact['name'];
+               $photo = $pub_contact['photo'];
+               $nick = $pub_contact['nick'];
+               $network = $pub_contact['network'];
+
                if (is_array($contact)) {
                        if (($contact['rel'] == self::SHARING)
                                || ($sharing && $contact['rel'] == self::FOLLOWER)) {
@@ -1536,13 +1857,13 @@ class Contact extends BaseObject
                                DBA::escape($name),
                                DBA::escape($nick),
                                DBA::escape($photo),
-                               DBA::escape(NETWORK_OSTATUS),
+                               DBA::escape($network),
                                intval(self::FOLLOWER)
                        );
 
                        $contact_record = [
                                'id' => DBA::lastInsertId(),
-                               'network' => NETWORK_OSTATUS,
+                               'network' => $network,
                                'name' => $name,
                                'url' => $url,
                                'photo' => $photo
@@ -1553,7 +1874,7 @@ class Contact extends BaseObject
                        /// @TODO Encapsulate this into a function/method
                        $fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];
                        $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
-                       if (DBA::isResult($user) && !in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+                       if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
                                // create notification
                                $hash = random_string();
 
@@ -1566,7 +1887,7 @@ class Contact extends BaseObject
                                Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
                                if (($user['notify-flags'] & NOTIFY_INTRO) &&
-                                       in_array($user['page-flags'], [PAGE_NORMAL])) {
+                                       in_array($user['page-flags'], [self::PAGE_NORMAL])) {
 
                                        notification([
                                                'type'         => NOTIFY_INTRO,
@@ -1575,7 +1896,7 @@ class Contact extends BaseObject
                                                'to_name'      => $user['username'],
                                                'to_email'     => $user['email'],
                                                'uid'          => $user['uid'],
-                                               'link'             => System::baseUrl() . '/notifications/intro',
+                                               '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'],
@@ -1584,11 +1905,9 @@ class Contact extends BaseObject
                                        ]);
 
                                }
-                       } elseif (DBA::isResult($user) && in_array($user['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']),
-                                               DBA::escape($url)
-                               );
+                       } elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
+                               $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
+                               DBA::update('contact', ['pending' => false], $condition);
                        }
                }
        }
@@ -1637,10 +1956,9 @@ class Contact extends BaseObject
                                 */
 
                                // Check for duplicates
-                               $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
-                                       intval($rr['uid']), intval($rr['id']), DBA::escape(DateTimeFormat::utc($nextbd)), DBA::escape('birthday'));
-
-                               if (DBA::isResult($s)) {
+                               $condition = ['uid' => $rr['uid'], 'cid' => $rr['id'],
+                                       'start' => DateTimeFormat::utc($nextbd), 'type' => 'birthday'];
+                               if (DBA::exists('event', $condition)) {
                                        continue;
                                }
 
@@ -1654,7 +1972,6 @@ class Contact extends BaseObject
                                        intval(0)
                                );
 
-
                                // update bdyear
                                q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
                                        DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])
@@ -1731,7 +2048,7 @@ class Contact extends BaseObject
         */
        public static function magicLinkbyContact($contact, $url = '')
        {
-               if ($contact['network'] != NETWORK_DFRN) {
+               if ($contact['network'] != Protocol::DFRN) {
                        return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
                }
 
@@ -1751,5 +2068,5 @@ class Contact extends BaseObject
                }
 
                return $redirect;
-        }
+       }
 }