X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=51abaa49ddca3ee3811db420069882ee18620168;hb=7aec520b32e7b36aeb00dfbb2fb3c10e3e72bf95;hp=f32b1e349d5966995aea3211f702b41e0595d8f0;hpb=8a3995a740a109b2bcac9b88fee6ecc55dd97c85;p=friendica.git

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index f32b1e349d..51abaa49dd 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -57,23 +57,29 @@ class ForumManager
 			$params = ['order' => ['name']];
 		}
 
-		$condition_str = "`network` IN (?, ?) AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
+		$condition = [
+			'contact-type' => Contact::TYPE_COMMUNITY,
+			'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB],
+			'uid' => $uid, 
+			'blocked' => false,
+			'pending' => false,
+			'archive' => false, 
+		];
 
-		if ($showprivate) {
-			$condition_str .= '(`forum` OR `prv`)';
-		} else {
-			$condition_str .= '`forum`';
+		$condition = DBA::mergeConditions($condition, ["`platform` != ?", 'peertube']);
+
+		if (!$showprivate) {
+			$condition = DBA::mergeConditions($condition, ['manually-approve' => false]);
 		}
 
 		if (!$showhidden) {
-			$condition_str .=  ' AND NOT `hidden`';
+			$condition = DBA::mergeConditions($condition, ['hidden' => false]);
 		}
 
 		$forumlist = [];
 
-		$fields = ['id', 'url', 'name', 'micro', 'thumb', 'avatar'];
-		$condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid];
-		$contacts = DBA::select('contact', $fields, $condition, $params);
+		$fields = ['id', 'url', 'name', 'micro', 'thumb', 'avatar', 'network', 'uid'];
+		$contacts = DBA::select('account-user-view', $fields, $condition, $params);
 		if (!$contacts) {
 			return($forumlist);
 		}
@@ -127,7 +133,7 @@ class ForumManager
 
 				$entry = [
 					'url' => $baseurl . '/' . $contact['id'],
-					'external_url' => Contact::magicLink($contact['url']),
+					'external_url' => Contact::magicLinkByContact($contact),
 					'name' => $contact['name'],
 					'cid' => $contact['id'],
 					'selected' 	=> $selected,
@@ -209,14 +215,15 @@ class ForumManager
 	public static function countUnseenItems()
 	{
 		$stmtContacts = DBA::p(
-			"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`
+			"SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `post-user-view`
+				INNER JOIN `contact` ON `post-user-view`.`contact-id` = `contact`.`id`
+				WHERE `post-user-view`.`uid` = ? AND `post-user-view`.`visible` AND NOT `post-user-view`.`deleted` AND `post-user-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`
+				AND `contact`.`uid` = ?
 				GROUP BY `contact`.`id`",
-			local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY
+			local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY, local_user()
 		);
 
 		return DBA::toArray($stmtContacts);