]> git.mxchange.org Git - friendica.git/commitdiff
Add new contact/{id}/contacts[/{type}] route and module
authorHypolite Petovan <hypolite@mrpetovan.com>
Fri, 7 Aug 2020 02:49:21 +0000 (22:49 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Fri, 7 Aug 2020 02:59:09 +0000 (22:59 -0400)
- Rework contact pages tabs
- Add constants for active contact page tab

src/Module/Contact.php
src/Module/Contact/Advanced.php
src/Module/Contact/Contacts.php [new file with mode: 0644]
static/routes.config.php

index 3085bbd0b86fbaabc52e3d1b151929b6ecd9aa73..26a6520af7692716576d0a707f3f39248f7d7313 100644 (file)
@@ -47,6 +47,12 @@ use Friendica\Util\Strings;
  */
 class Contact extends BaseModule
 {
+       const TAB_CONVERSATIONS = 1;
+       const TAB_POSTS = 2;
+       const TAB_PROFILE = 3;
+       const TAB_CONTACTS = 4;
+       const TAB_ADVANCED = 5;
+
        private static function batchActions()
        {
                if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
@@ -531,7 +537,7 @@ class Contact extends BaseModule
                        $nettype = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
 
                        // tabs
-                       $tab_str = self::getTabsHTML($contact, 3);
+                       $tab_str = self::getTabsHTML($contact, self::TAB_PROFILE);
 
                        $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? DI::l10n()->t('Communications lost with this contact!') : '');
 
@@ -576,7 +582,7 @@ class Contact extends BaseModule
                                '$lbl_info2'      => DI::l10n()->t('Their personal note'),
                                '$reason'         => trim(Strings::escapeTags($contact['reason'])),
                                '$infedit'        => DI::l10n()->t('Edit contact notes'),
-                               '$common_link'    => 'common/loc/' . local_user() . '/' . $contact['id'],
+                               '$common_link'    => 'contact/' . $contact['id'] . '/contacts/common',
                                '$relation_text'  => $relation_text,
                                '$visit'          => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
                                '$blockunblock'   => DI::l10n()->t('Block/Unblock contact'),
@@ -876,57 +882,41 @@ class Contact extends BaseModule
                $tabs = [
                        [
                                'label' => DI::l10n()->t('Status'),
-                               'url'   => "contact/" . $pcid . "/conversations",
-                               'sel'   => (($active_tab == 1) ? 'active' : ''),
+                               'url'   => 'contact/' . $pcid . '/conversations',
+                               'sel'   => (($active_tab == self::TAB_CONVERSATIONS) ? 'active' : ''),
                                'title' => DI::l10n()->t('Conversations started by this contact'),
                                'id'    => 'status-tab',
                                'accesskey' => 'm',
                        ],
                        [
                                'label' => DI::l10n()->t('Posts and Comments'),
-                               'url'   => "contact/" . $pcid . "/posts",
-                               'sel'   => (($active_tab == 2) ? 'active' : ''),
+                               'url'   => 'contact/' . $pcid . '/posts',
+                               'sel'   => (($active_tab == self::TAB_POSTS) ? 'active' : ''),
                                'title' => DI::l10n()->t('Status Messages and Posts'),
                                'id'    => 'posts-tab',
                                'accesskey' => 'p',
                        ],
                        [
                                'label' => DI::l10n()->t('Profile'),
-                               'url'   => "contact/" . $cid,
-                               'sel'   => (($active_tab == 3) ? 'active' : ''),
+                               'url'   => 'contact/' . $cid,
+                               'sel'   => (($active_tab == self::TAB_PROFILE) ? 'active' : ''),
                                'title' => DI::l10n()->t('Profile Details'),
                                'id'    => 'profile-tab',
                                'accesskey' => 'o',
-                       ]
+                       ],
+                       ['label' => DI::l10n()->t('Contacts'),
+                               'url'   => 'contact/' . $pcid . '/contacts',
+                               'sel'   => (($active_tab == self::TAB_CONTACTS) ? 'active' : ''),
+                               'title' => DI::l10n()->t('View all known contacts'),
+                               'id'    => 'contacts-tab',
+                               'accesskey' => 't'
+                       ],
                ];
 
-               // Show this tab only if there is visible friend list
-               $x = Model\Contact\Relation::countFollows($pcid);
-               if ($x) {
-                       $tabs[] = ['label' => DI::l10n()->t('Contacts'),
-                               'url'   => "allfriends/" . $pcid,
-                               'sel'   => (($active_tab == 4) ? 'active' : ''),
-                               'title' => DI::l10n()->t('View all contacts'),
-                               'id'    => 'allfriends-tab',
-                               'accesskey' => 't'];
-               }
-
-               // Show this tab only if there is visible common friend list
-               $common = Model\GContact::countCommonFriends(local_user(), $cid);
-               if ($common) {
-                       $tabs[] = ['label' => DI::l10n()->t('Common Friends'),
-                               'url'   => "common/loc/" . local_user() . "/" . $cid,
-                               'sel'   => (($active_tab == 5) ? 'active' : ''),
-                               'title' => DI::l10n()->t('View all common friends'),
-                               'id'    => 'common-loc-tab',
-                               'accesskey' => 'd'
-                       ];
-               }
-
                if ($cid != $pcid) {
                        $tabs[] = ['label' => DI::l10n()->t('Advanced'),
                                'url'   => 'contact/' . $cid . '/advanced/',
-                               'sel'   => (($active_tab == 6) ? 'active' : ''),
+                               'sel'   => (($active_tab == self::TAB_ADVANCED) ? 'active' : ''),
                                'title' => DI::l10n()->t('Advanced Contact Settings'),
                                'id'    => 'advanced-tab',
                                'accesskey' => 'r'
@@ -964,7 +954,7 @@ class Contact extends BaseModule
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
                if (!$update) {
-                       $o .= self::getTabsHTML($contact, 1);
+                       $o .= self::getTabsHTML($contact, self::TAB_CONVERSATIONS);
                }
 
                if (DBA::isResult($contact)) {
@@ -988,7 +978,7 @@ class Contact extends BaseModule
        {
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
-               $o = self::getTabsHTML($contact, 2);
+               $o = self::getTabsHTML($contact, self::TAB_POSTS);
 
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
index 2ba7fb185a7b128fca4120d7bb2dda114e194893..a7ee29036c2602c1c311f49a8240eb0310a7c2ee 100644 (file)
@@ -125,7 +125,7 @@ class Advanced extends BaseModule
                        $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')];
                }
 
-               $tab_str = Contact::getTabsHTML($contact, 6);
+               $tab_str = Contact::getTabsHTML($contact, Contact::TAB_ADVANCED);
 
                $tpl = Renderer::getMarkupTemplate('contact/advanced.tpl');
                return Renderer::replaceMacros($tpl, [
diff --git a/src/Module/Contact/Contacts.php b/src/Module/Contact/Contacts.php
new file mode 100644 (file)
index 0000000..31e81cb
--- /dev/null
@@ -0,0 +1,123 @@
+<?php
+
+namespace Friendica\Module\Contact;
+
+use Friendica\BaseModule;
+use Friendica\Content\Pager;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
+use Friendica\DI;
+use Friendica\Model;
+use Friendica\Module;
+use Friendica\Network\HTTPException;
+
+class Contacts extends BaseModule
+{
+       public static function content(array $parameters = [])
+       {
+               $app = DI::app();
+
+               if (!local_user()) {
+                       throw new HTTPException\ForbiddenException();
+               }
+
+               $cid = $parameters['id'];
+               $type = $parameters['type'] ?? 'all';
+
+               if (!$cid) {
+                       throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid contact.'));
+               }
+
+               $contact = Model\Contact::getById($cid, []);
+               if (empty($contact)) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('Contact not found.'));
+               }
+
+               $localContactId = Model\Contact::getPublicIdByUserId(local_user());
+
+               Model\Profile::load($app, '', $contact);
+
+               $condition = [
+                       'blocked' => false,
+                       'self' => false,
+                       'hidden' => false,
+               ];
+
+               $noresult_label = DI::l10n()->t('No known contacts.');
+
+               switch ($type) {
+                       case 'followers':
+                               $total = Model\Contact\Relation::countFollowers($cid, $condition);
+                               break;
+                       case 'following':
+                               $total = Model\Contact\Relation::countFollows($cid, $condition);
+                               break;
+                       case 'mutuals':
+                               $total = Model\Contact\Relation::countMutuals($cid, $condition);
+                               break;
+                       case 'common':
+                               $condition = [
+                                       'NOT `self` AND NOT `blocked` AND NOT `hidden` AND `id` != ?',
+                                       $localContactId,
+                               ];
+                               $total = Model\Contact\Relation::countCommon($localContactId, $cid, $condition);
+                               $noresult_label = DI::l10n()->t('No common contacts.');
+                               break;
+                       default:
+                               $total = Model\Contact\Relation::countAll($cid, $condition);
+               }
+
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
+               $desc = '';
+
+               switch ($type) {
+                       case 'followers':
+                               $friends = Model\Contact\Relation::listFollowers($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
+                               $title = DI::l10n()->tt('Follower (%s)', 'Followers (%s)', $total);
+                               break;
+                       case 'following':
+                               $friends = Model\Contact\Relation::listFollows($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
+                               $title = DI::l10n()->tt('Following (%s)', 'Following (%s)', $total);
+                               break;
+                       case 'mutuals':
+                               $friends = Model\Contact\Relation::listMutuals($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
+                               $title = DI::l10n()->tt('Mutual friend (%s)', 'Mutual friends (%s)', $total);
+                               $desc = DI::l10n()->t(
+                                       'These contacts both follow and are followed by <strong>%s</strong>.',
+                                       htmlentities($contact['name'], ENT_COMPAT, 'UTF-8')
+                               );
+                               break;
+                       case 'common':
+                               $friends = Model\Contact\Relation::listCommon($localContactId, $cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
+                               $title = DI::l10n()->tt('Common contact (%s)', 'Common contacts (%s)', $total);
+                               $desc = DI::l10n()->t(
+                                       'Both <strong>%s</strong> and yourself have publicly interacted with these contacts (follow, comment or likes on public posts).',
+                                       htmlentities($contact['name'], ENT_COMPAT, 'UTF-8')
+                               );
+                               break;
+                       default:
+                               $friends = Model\Contact\Relation::listAll($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
+                               $title = DI::l10n()->tt('Contact (%s)', 'Contacts (%s)', $total);
+               }
+
+               $o = Module\Contact::getTabsHTML($contact, Module\Contact::TAB_CONTACTS);
+
+               $tabs = self::getContactFilterTabs('contact/' . $cid, $type, true);
+
+               $contacts = array_map([Module\Contact::class, 'getContactTemplateVars'], $friends);
+
+               $tpl = Renderer::getMarkupTemplate('profile/contacts.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$title'    => $title,
+                       '$desc'     => $desc,
+                       '$tabs'     => $tabs,
+
+                       '$noresult_label'  => $noresult_label,
+
+                       '$contacts' => $contacts,
+                       '$paginate' => $pager->renderFull($total),
+               ]);
+
+               return $o;
+       }
+}
index 15eec298e932f77d9147393168ade6f985418a85..e81a988c40dea8aecc96f24dfd5fb13beedc86b4 100644 (file)
@@ -115,25 +115,26 @@ return [
        '/compose[/{type}]'    => [Module\Item\Compose::class, [R::GET, R::POST]],
 
        '/contact'   => [
-               '[/]'                     => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}[/]'            => [Module\Contact::class,           [R::GET, R::POST]],
-               '/{id:\d+}/archive'       => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/advanced'      => [Module\Contact\Advanced::class,  [R::GET, R::POST]],
-               '/{id:\d+}/block'         => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/conversations' => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/drop'          => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/ignore'        => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/poke'          => [Module\Contact\Poke::class,      [R::GET, R::POST]],
-               '/{id:\d+}/posts'         => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/update'        => [Module\Contact::class,           [R::GET]],
-               '/{id:\d+}/updateprofile' => [Module\Contact::class,           [R::GET]],
-               '/archived'               => [Module\Contact::class,           [R::GET]],
-               '/batch'                  => [Module\Contact::class,           [R::GET, R::POST]],
-               '/pending'                => [Module\Contact::class,           [R::GET]],
-               '/blocked'                => [Module\Contact::class,           [R::GET]],
-               '/hidden'                 => [Module\Contact::class,           [R::GET]],
-               '/ignored'                => [Module\Contact::class,           [R::GET]],
-               '/hovercard'              => [Module\Contact\Hovercard::class, [R::GET]],
+               '[/]'                         => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}[/]'                => [Module\Contact::class,           [R::GET, R::POST]],
+               '/{id:\d+}/archive'           => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/advanced'          => [Module\Contact\Advanced::class,  [R::GET, R::POST]],
+               '/{id:\d+}/block'             => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/conversations'     => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/contacts[/{type}]' => [Module\Contact\Contacts::class,  [R::GET]],
+               '/{id:\d+}/drop'              => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/ignore'            => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/poke'              => [Module\Contact\Poke::class,      [R::GET, R::POST]],
+               '/{id:\d+}/posts'             => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/update'            => [Module\Contact::class,           [R::GET]],
+               '/{id:\d+}/updateprofile'     => [Module\Contact::class,           [R::GET]],
+               '/archived'                   => [Module\Contact::class,           [R::GET]],
+               '/batch'                      => [Module\Contact::class,           [R::GET, R::POST]],
+               '/pending'                    => [Module\Contact::class,           [R::GET]],
+               '/blocked'                    => [Module\Contact::class,           [R::GET]],
+               '/hidden'                     => [Module\Contact::class,           [R::GET]],
+               '/ignored'                    => [Module\Contact::class,           [R::GET]],
+               '/hovercard'                  => [Module\Contact\Hovercard::class, [R::GET]],
        ],
 
        '/credits'               => [Module\Credits::class,        [R::GET]],