Merge pull request #9280 from annando/account-selector

[friendica.git] / src / Module / Conversation / Community.php

diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index c86bf9176c116b272d940f6d729143c0af095f01..9a8869e4a113c52c0ec5074b38f6397c71854946 100644 (file)
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -113,6 +113,17 @@ class Community extends BaseModule
 
                $o .= $pager->renderMinimal(count($items));
 
+               DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [
+                       '$title'        => DI::l10n()->t('Accounts'),
+                       '$content'      => self::$content,
+                       '$accounttype'  => $parameters['accounttype'],
+                       '$all'          => DI::l10n()->t('All Accounts'),
+                       '$person'       => DI::l10n()->t('Personal Accounts'),
+                       '$organisation' => DI::l10n()->t('Organisation Accounts'),
+                       '$news'         => DI::l10n()->t('News Accounts'),
+                       '$community'    => DI::l10n()->t('Communities'),
+               ]);
+
                if (Feature::isEnabled(local_user(), 'trending_tags')) {
                        DI::page()['aside'] .= TrendingTags::getHTML(self::$content);
                }
@@ -295,6 +306,11 @@ class Community extends BaseModule
                        return [];
                }
 
+               if (local_user() && DI::config()->get('system', 'community_no_followers')) {
+                       $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();
+               }
+
                if (isset($max_id)) {
                        $condition[0] .= " AND `commented` < ?";
                        $condition[] = $max_id;