From 591ba9c68e82491468f7e97c966b2e5e3c0eefd6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Sep 2019 19:18:56 +0000 Subject: [PATCH 1/3] Display pending contacts in the contact list --- src/App/Router.php | 1 + src/Module/Contact.php | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/App/Router.php b/src/App/Router.php index 50b208792..b3df8a14d 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -108,6 +108,7 @@ class Router $collector->addRoute(['GET'], '/{id:\d+}/updateprofile', Module\Contact::class); $collector->addRoute(['GET'], '/archived', Module\Contact::class); $collector->addRoute(['GET', 'POST'], '/batch', Module\Contact::class); + $collector->addRoute(['GET'], '/pending', Module\Contact::class); $collector->addRoute(['GET'], '/blocked', Module\Contact::class); $collector->addRoute(['GET'], '/hidden', Module\Contact::class); $collector->addRoute(['GET'], '/ignored', Module\Contact::class); diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 198496a0e..7f31527a2 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -641,8 +641,11 @@ class Contact extends BaseModule case 'archived': $sql_extra = " AND `archive` AND NOT `blocked`"; break; + case 'pending': + $sql_extra = " AND `pending` AND NOT `archive`"; + break; default: - $sql_extra = " AND NOT `archive` AND NOT `blocked`"; + $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`"; } $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM); @@ -660,6 +663,14 @@ class Contact extends BaseModule 'id' => 'showall-tab', 'accesskey' => 'l', ], + [ + 'label' => L10n::t('Pending'), + 'url' => 'contact/pending', + 'sel' => $type == 'pending' ? 'active' : '', + 'title' => L10n::t('Only show pending contacts'), + 'id' => 'showpending-tab', + 'accesskey' => 'p', + ], [ 'label' => L10n::t('Blocked'), 'url' => 'contact/blocked', @@ -730,7 +741,7 @@ class Contact extends BaseModule $sql_extra2 = ((($sort_type > 0) && ($sort_type <= Model\Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : ''); $r = q("SELECT COUNT(*) AS `total` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ", + WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 ", intval($_SESSION['uid']) ); if (DBA::isResult($r)) { @@ -742,7 +753,7 @@ class Contact extends BaseModule $contacts = []; - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ", intval($_SESSION['uid']), $pager->getStart(), $pager->getItemsPerPage() @@ -763,6 +774,7 @@ class Contact extends BaseModule } switch ($type) { + case 'pending': $header .= ' - ' . L10n::t('Pending'); break; case 'blocked': $header .= ' - ' . L10n::t('Blocked'); break; case 'hidden': $header .= ' - ' . L10n::t('Hidden'); break; case 'ignored': $header .= ' - ' . L10n::t('Ignored'); break; @@ -976,6 +988,22 @@ class Contact extends BaseModule $sparkle = ''; } + if ($rr['pending']) { + if (in_array($rr['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) { + $alt_text = L10n::t('Pending outgoing contact request'); + } else { + $alt_text = L10n::t('Pending incoming contact request'); + $intro = DBA::selectFirst('intro', ['blocked', 'ignore'], ['contact-id' => $rr['id']]); + if (DBA::isResult($intro)) { + if ($intro['blocked']) { + $alt_text = L10n::t('Blocked incoming contact request'); + } elseif ($intro['ignore']) { + $alt_text = L10n::t('Ignored incoming contact request'); + } + } + } + } + if ($rr['self']) { $dir_icon = 'images/larrow.gif'; $alt_text = L10n::t('This is you'); From 2dbd843ed2fba46505d130e2460d88310a5ececd Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 9 Sep 2019 05:29:33 +0000 Subject: [PATCH 2/3] Don't display ignored pending contacts, link to contact request page --- mod/notifications.php | 7 ++++++- src/Core/NotificationsManager.php | 15 +++++++++++---- src/Model/Contact.php | 13 ++++++++++--- src/Module/Contact.php | 11 ++--------- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index 8bc9a76c3..ed83de8ab 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -98,9 +98,14 @@ function notifications_content(App $a) if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { Nav::setSelected('introductions'); + $id = 0; + if (!empty($a->argv[2]) && intval($a->argv[2]) != 0) { + $id = (int)$a->argv[2]; + } + $all = (($a->argc > 2) && ($a->argv[2] == 'all')); - $notifs = $nm->introNotifs($all, $startrec, $perpage); + $notifs = $nm->introNotifs($all, $startrec, $perpage, $id); // Get the network notifications } elseif (($a->argc > 1) && ($a->argv[1] == 'network')) { diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 8ac5d93c7..a6a5c24e0 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -549,6 +549,7 @@ class NotificationsManager extends BaseObject * which aren't marked as ignored * @param int $start Start the query at this point * @param int $limit Maximum number of query results + * @param int $id When set, only the introduction with this id is displayed * * @return array with * string 'ident' => Notification identifier @@ -556,14 +557,20 @@ class NotificationsManager extends BaseObject * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public function introNotifs($all = false, $start = 0, $limit = 80) + public function introNotifs($all = false, $start = 0, $limit = 80, $id = 0) { $ident = 'introductions'; $notifs = []; $sql_extra = ""; - if (!$all) { - $sql_extra = " AND NOT `ignore` "; + if (empty($id)) { + if (!$all) { + $sql_extra = " AND NOT `ignore` "; + } + + $sql_extra .= " AND NOT `intro`.`blocked` "; + } else { + $sql_extra = sprintf(" AND `intro`.`id` = %d ", intval($id)); } /// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact @@ -578,7 +585,7 @@ class NotificationsManager extends BaseObject LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = ? $sql_extra AND `intro`.`blocked` = 0 + WHERE `intro`.`uid` = ? $sql_extra LIMIT ?, ?", $_SESSION['uid'], $start, diff --git a/src/Model/Contact.php b/src/Model/Contact.php index ffdee6aa0..ea9d10ed1 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1175,7 +1175,7 @@ class Contact extends BaseObject } $sparkle = false; - if (($contact['network'] === Protocol::DFRN) && !$contact['self']) { + if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && !$contact['pending']) { $sparkle = true; $profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url']; } else { @@ -1192,11 +1192,11 @@ class Contact extends BaseObject $profile_link = $profile_link . '?tab=profile'; } - if (self::canReceivePrivateMessages($contact)) { + if (self::canReceivePrivateMessages($contact) && !$contact['pending']) { $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; } - if (($contact['network'] == Protocol::DFRN) && !$contact['self']) { + if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && !$contact['pending']) { $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; } @@ -1231,6 +1231,13 @@ class Contact extends BaseObject 'pm' => [L10n::t('Send PM'), $pm_url, false], 'poke' => [L10n::t('Poke'), $poke_link, false], ]; + + if ($contact['pending']) { + $intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]); + if (DBA::isResult($intro)) { + $menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true]; + } + } } $args = ['contact' => $contact, 'menu' => &$menu]; diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 7f31527a2..331da1281 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -642,7 +642,8 @@ class Contact extends BaseModule $sql_extra = " AND `archive` AND NOT `blocked`"; break; case 'pending': - $sql_extra = " AND `pending` AND NOT `archive`"; + $sql_extra = " AND `pending` AND NOT `archive` + AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND `ignore`)"; break; default: $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`"; @@ -993,14 +994,6 @@ class Contact extends BaseModule $alt_text = L10n::t('Pending outgoing contact request'); } else { $alt_text = L10n::t('Pending incoming contact request'); - $intro = DBA::selectFirst('intro', ['blocked', 'ignore'], ['contact-id' => $rr['id']]); - if (DBA::isResult($intro)) { - if ($intro['blocked']) { - $alt_text = L10n::t('Blocked incoming contact request'); - } elseif ($intro['ignore']) { - $alt_text = L10n::t('Ignored incoming contact request'); - } - } } } From a70a0306d7773fb783240158ae1644824c308afd Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 9 Sep 2019 08:58:56 +0000 Subject: [PATCH 3/3] Only show incoming pending contact requests with intro --- src/Module/Contact.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 331da1281..0b27f0e4a 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -642,8 +642,8 @@ class Contact extends BaseModule $sql_extra = " AND `archive` AND NOT `blocked`"; break; case 'pending': - $sql_extra = " AND `pending` AND NOT `archive` - AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND `ignore`)"; + $sql_extra = sprintf(" AND `pending` AND NOT `archive` AND ((`rel` = %d) + OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))", Model\Contact::SHARING); break; default: $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";