From c0ddcfb0cd68967f15cd765b6d794f89e39bbb95 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 26 Sep 2020 18:01:10 +0000 Subject: [PATCH 1/4] Hide own contacts --- include/conversation.php | 4 +++- src/Module/Conversation/Community.php | 27 ++++++++++++++++++++-- static/defaults.config.php | 6 ++--- view/templates/widget/community_sharer.tpl | 8 +++++++ 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 view/templates/widget/community_sharer.tpl diff --git a/include/conversation.php b/include/conversation.php index ed6710bdf7..c50ce6b7cc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -443,7 +443,9 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o if (!$update) { $live_update_div = '
' . "\r\n" . "\r\n"; + . '?f=' + . (!empty($_GET['no_sharer']) ? '&no_sharer=' . rawurlencode($_GET['no_sharer']) : '') + . "'; \r\n"; } } elseif ($mode === 'contacts') { $items = conversation_add_children($items, false, $order, $uid); diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 9a8869e4a1..75a8e158ac 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -124,6 +124,29 @@ class Community extends BaseModule '$community' => DI::l10n()->t('Communities'), ]); + if (local_user() && DI::config()->get('system', 'community_no_sharer')) { + $path = self::$content . ($parameters['accounttype'] ? '/' . $parameters['accounttype'] : ''); + $query_parameters = []; + + if (!empty($_GET['since_id'])) { + $query_parameters['since_id'] = $_GET['since_id']; + } + if (!empty($_GET['max_id'])) { + $query_parameters['max_id'] = $_GET['max_id']; + } + + $path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : ''); + $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true])); + DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [ + '$title' => DI::l10n()->t('Own Contacts'), + '$path_all' => $path_all, + '$path_no_sharer' => $path_no_sharer, + '$no_sharer' => !empty($_REQUEST['no_sharer']), + '$all' => DI::l10n()->t('Include'), + '$no_sharer_label' => DI::l10n()->t('Hide'), + ]); + } + if (Feature::isEnabled(local_user(), 'trending_tags')) { DI::page()['aside'] .= TrendingTags::getHTML(self::$content); } @@ -294,7 +317,7 @@ class Community extends BaseModule if (!is_null(self::$accounttype)) { $condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, self::$accounttype]; } else { - $condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC]; + $condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC]; } } elseif (self::$content == 'global') { if (!is_null(self::$accounttype)) { @@ -306,7 +329,7 @@ class Community extends BaseModule return []; } - if (local_user() && DI::config()->get('system', 'community_no_followers')) { + if (local_user() && !empty($_REQUEST['no_sharer'])) { $condition[0] .= " AND NOT EXISTS (SELECT `uri-id` FROM `thread` AS t1 WHERE `t1`.`uri-id` = `thread`.`uri-id` AND `t1`.`uid` = ?)"; $condition[] = local_user(); } diff --git a/static/defaults.config.php b/static/defaults.config.php index 00255ff14c..fbd3787b76 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -122,9 +122,9 @@ return [ // Deny public access to the local user directory. 'block_local_dir' => false, - // community_no_followers (Boolean) - // Don't display followers on the global community - 'community_no_followers' => false, + // community_no_sharer (Boolean) + // Don't display sharing accounts on the global community + 'community_no_sharer' => false, // cron_interval (Integer) // Minimal period in minutes between two calls of the "Cron" worker job. diff --git a/view/templates/widget/community_sharer.tpl b/view/templates/widget/community_sharer.tpl new file mode 100644 index 0000000000..db255ba5cb --- /dev/null +++ b/view/templates/widget/community_sharer.tpl @@ -0,0 +1,8 @@ + From 3553b564b423864cf9477b0870cf22482fb3b871 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 26 Sep 2020 18:34:55 +0000 Subject: [PATCH 2/4] Template now collapses --- view/templates/widget/community_sharer.tpl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/view/templates/widget/community_sharer.tpl b/view/templates/widget/community_sharer.tpl index db255ba5cb..591d2a62f9 100644 --- a/view/templates/widget/community_sharer.tpl +++ b/view/templates/widget/community_sharer.tpl @@ -1,8 +1,15 @@ -