New function for contact suggestions

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 74ac1f68a54da30068d3e1c3cefbe439d4e2b4b7..6fde8123a1b21c049d336851718e82506de655a2 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -554,7 +554,7 @@ class Contact
                        return true;
                }
 
-               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]);
                if (!DBA::isResult($user)) {
                        return false;
                }
@@ -565,6 +565,8 @@ class Contact
                        'self'        => 1,
                        'name'        => $user['username'],
                        'nick'        => $user['nickname'],
+                       'pubkey'      => $user['pubkey'],
+                       'prvkey'      => $user['prvkey'],
                        'photo'       => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
                        'thumb'       => DI::baseUrl() . '/photo/avatar/'  . $user['uid'] . '.jpg',
                        'micro'       => DI::baseUrl() . '/photo/micro/'   . $user['uid'] . '.jpg',
@@ -596,7 +598,7 @@ class Contact
         */
        public static function updateSelfFromUserID($uid, $update_avatar = false)
        {
-               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar',
+               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
                        'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
                        'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
@@ -604,7 +606,7 @@ class Contact
                        return;
                }
 
-               $fields = ['nickname', 'page-flags', 'account-type'];
+               $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
                $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
                if (!DBA::isResult($user)) {
                        return;
@@ -622,8 +624,8 @@ class Contact
                $fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
                        'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
                        'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
-                       'contact-type' => $user['account-type'],
-                       'xmpp' => $profile['xmpp']];
+                       'contact-type' => $user['account-type'], 'prvkey' => $user['prvkey'],
+                       'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp']];
 
                $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
                if (DBA::isResult($avatar)) {
@@ -1271,7 +1273,7 @@ class Contact
                }
 
                if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
-                       $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
+                       $sql = "`item`.`uid` IN (0, ?)";
                } else {
                        $sql = "`item`.`uid` = ?";
                }
@@ -1279,8 +1281,8 @@ class Contact
                $contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id');
 
                if ($thread_mode) {
-                       $condition = ["`$contact_field` = ? AND (`gravity` = ? OR (`gravity` = ? AND `vid` = ?)) AND " . $sql,
-                               $cid, GRAVITY_PARENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), local_user()];
+                       $condition = ["(`$contact_field` = ? OR (`causer-id` = ? AND `post-type` = ?)) AND `gravity` = ? AND " . $sql,
+                               $cid, $cid, Item::PT_ANNOUNCEMENT, GRAVITY_PARENT, local_user()];
                } else {
                        $condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
                                $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
@@ -1296,7 +1298,7 @@ class Contact
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
-               $params = ['order' => ['received' => true],
+               $params = ['order' => ['received' => true], 'group_by' => ['uri-id'],
                        'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
                if ($thread_mode) {
@@ -1850,11 +1852,9 @@ class Contact
                        $ret['forum'] = false;
                        $ret['prv'] = false;
                        $ret['contact-type'] = $ret['account-type'];
-                       if ($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
-                               if (isset($ret['manually-approve'])) {
-                                       $ret['forum'] = (bool)!$ret['manually-approve'];
-                                       $ret['prv'] = (bool)!$ret['forum'];
-                               }
+                       if (($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && isset($ret['manually-approve'])) {
+                               $ret['forum'] = (bool)!$ret['manually-approve'];
+                               $ret['prv'] = (bool)!$ret['forum'];
                        }
                }
 
@@ -1911,7 +1911,7 @@ class Contact
                        $ret['pubkey'] = $new_pubkey;
                }
 
-               if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
+               if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
                        $ret['uri-date'] = DateTimeFormat::utcNow();
                }
 
@@ -2121,10 +2121,8 @@ class Contact
                $hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
 
                $pending = false;
-               if ($protocol == Protocol::ACTIVITYPUB) {
-                       if (isset($ret['manually-approve'])) {
-                               $pending = (bool)$ret['manually-approve'];
-                       }
+               if (($protocol == Protocol::ACTIVITYPUB) && isset($ret['manually-approve'])) {
+                       $pending = (bool)$ret['manually-approve'];
                }
 
                if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {