Merge pull request #12638 from annando/collapse

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 23a2e9c493e70e27ebbe6d3733ecf59093bb9016..21b1793af5b6fd1650ce3be90003e01d957edbb3 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -247,6 +247,11 @@ class Contact extends BaseModule
                                // This makes the query look for contact.uid = 0
                                array_unshift($sql_values, 0);
                                break;
+                       case 'collapsed':
+                               $sql_extra = " AND `id` IN (SELECT `cid` FROM `user-contact` WHERE `user-contact`.`uid` = ? AND `user-contact`.`collapsed`)";
+                               // This makes the query look for contact.uid = 0
+                               array_unshift($sql_values, 0);
+                               break;
                        case 'archived':
                                $sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
                                break;
@@ -362,6 +367,14 @@ class Contact extends BaseModule
                                'id'    => 'showignored-tab',
                                'accesskey' => 'i',
                        ],
+                       [
+                               'label' => DI::l10n()->t('Collapsed'),
+                               'url'   => 'contact/collapsed',
+                               'sel'   => $type == 'collapsed' ? 'active' : '',
+                               'title' => DI::l10n()->t('Only show collapsed contacts'),
+                               'id'    => 'showcollapsed-tab',
+                               'accesskey' => 'c',
+                       ],
                        [
                                'label' => DI::l10n()->t('Archived'),
                                'url'   => 'contact/archived',
@@ -399,11 +412,12 @@ class Contact extends BaseModule
                }
 
                switch ($type) {
-                       case 'pending':  $header .= ' - ' . DI::l10n()->t('Pending'); break;
-                       case 'blocked':  $header .= ' - ' . DI::l10n()->t('Blocked'); break;
-                       case 'hidden':   $header .= ' - ' . DI::l10n()->t('Hidden'); break;
-                       case 'ignored':  $header .= ' - ' . DI::l10n()->t('Ignored'); break;
-                       case 'archived': $header .= ' - ' . DI::l10n()->t('Archived'); break;
+                       case 'pending':   $header .= ' - ' . DI::l10n()->t('Pending'); break;
+                       case 'blocked':   $header .= ' - ' . DI::l10n()->t('Blocked'); break;
+                       case 'hidden':    $header .= ' - ' . DI::l10n()->t('Hidden'); break;
+                       case 'ignored':   $header .= ' - ' . DI::l10n()->t('Ignored'); break;
+                       case 'collapsed': $header .= ' - ' . DI::l10n()->t('Collapsed'); break;
+                       case 'archived':  $header .= ' - ' . DI::l10n()->t('Archived'); break;
                }
 
                $header .= $nets ? ' - ' . ContactSelector::networkToName($nets) : '';