Merge pull request #9806 from Extarys/actionfade

[friendica.git] / src / Content / ForumManager.php

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 980e82522c38f154cc5ac424d8b73666026005f3..f32b1e349d5966995aea3211f702b41e0595d8f0 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -99,13 +99,14 @@ class ForumManager
         * Sidebar widget to show subcribed friendica forums. If activated
         * in the settings, it appears at the notwork page sidebar
         *
-        * @param int $uid The ID of the User
-        * @param int $cid The contact id which is used to mark a forum as "selected"
+        * @param string $baseurl Base module path
+        * @param int    $uid     The ID of the User
+        * @param int    $cid     The contact id which is used to mark a forum as "selected"
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function widget($uid, $cid = 0)
+       public static function widget(string $baseurl, int $uid, int $cid = 0)
        {
                $o = '';
 
@@ -125,7 +126,7 @@ class ForumManager
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = [
-                                       'url' => 'network?contactid=' . $contact['id'],
+                                       'url' => $baseurl . '/' . $contact['id'],
                                        'external_url' => Contact::magicLink($contact['url']),
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],
@@ -146,6 +147,7 @@ class ForumManager
                                        '$link_desc'    => DI::l10n()->t('External link to forum'),
                                        '$total'        => $total,
                                        '$visible_forums' => $visible_forums,
+                                       '$showless'     => DI::l10n()->t('show less'),
                                        '$showmore'     => DI::l10n()->t('show more')]
                        );
                }
@@ -207,14 +209,14 @@ class ForumManager
        public static function countUnseenItems()
        {
                $stmtContacts = DBA::p(
-                       "SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
-                               INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
-                               WHERE `item`.`uid` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
-                               AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
+                       "SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `post-view`
+                               INNER JOIN `contact` ON `post-view`.`contact-id` = `contact`.`id`
+                               WHERE `post-view`.`uid` = ? AND `post-view`.`visible` AND NOT `post-view`.`deleted` AND `post-view`.`unseen`
+                               AND `contact`.`network` IN (?, ?) AND `contact`.`contact-type` = ?
                                AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
                                AND NOT `contact`.`pending` AND NOT `contact`.`archive`
-                               GROUP BY `contact`.`id` ",
-                       local_user()
+                               GROUP BY `contact`.`id`",
+                       local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY
                );
 
                return DBA::toArray($stmtContacts);