Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner

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

diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index a960bf5e0ecc4692785127b7ed371de430d8d9fc..877bed3e220df7255820f8e382873c700c448f6f 100644 (file)
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.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
  *
@@ -29,12 +29,12 @@ use Friendica\Content\Nav;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Content\Widget\TrendingTags;
-use Friendica\Core\ACL;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 
@@ -49,9 +49,9 @@ class Community extends BaseModule
        protected static $max_id;
        protected static $item_id;
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
-               self::parseRequest($parameters);
+               $this->parseRequest();
 
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
                        $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
@@ -94,8 +94,8 @@ class Community extends BaseModule
        
                        if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
                                $path = self::$content;
-                               if (!empty($parameters['accounttype'])) {
-                                       $path .= '/' . $parameters['accounttype'];
+                               if (!empty($this->parameters['accounttype'])) {
+                                       $path .= '/' . $this->parameters['accounttype'];
                                }
                                $query_parameters = [];
                
@@ -127,18 +127,7 @@ class Community extends BaseModule
 
                        // We need the editor here to be able to reshare an item.
                        if (Session::isAuthenticated()) {
-                               $x = [
-                                       'is_owner' => true,
-                                       'allow_location' => DI::app()->user['allow_location'],
-                                       'default_location' => DI::app()->user['default-location'],
-                                       'nickname' => DI::app()->user['nickname'],
-                                       'lockstate' => (is_array(DI::app()->user) && (strlen(DI::app()->user['allow_cid']) || strlen(DI::app()->user['allow_gid']) || strlen(DI::app()->user['deny_cid']) || strlen(DI::app()->user['deny_gid'])) ? 'lock' : 'unlock'),
-                                       'acl' => ACL::getFullSelectorHTML(DI::page(), DI::app()->user, true),
-                                       'bang' => '',
-                                       'visitor' => 'block',
-                                       'profile_uid' => local_user(),
-                               ];
-                               $o .= status_editor(DI::app(), $x, 0, true);
+                               $o .= DI::conversation()->statusEditor([], 0, true);
                        }
                }
 
@@ -149,7 +138,7 @@ class Community extends BaseModule
                        return $o;
                }
 
-               $o .= conversation(DI::app(), $items, 'community', false, false, 'commented', local_user());
+               $o .= DI::conversation()->create($items, 'community', false, false, 'commented', local_user());
 
                $pager = new BoundariesPager(
                        DI::l10n(),
@@ -177,11 +166,10 @@ class Community extends BaseModule
        /**
         * Computes module parameters from the request and local configuration
         *
-        * @param array $parameters
         * @throws HTTPException\BadRequestException
         * @throws HTTPException\ForbiddenException
         */
-       protected static function parseRequest(array $parameters)
+       protected function parseRequest()
        {
                if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
@@ -193,10 +181,10 @@ class Community extends BaseModule
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
                }
 
-               self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? '';
+               self::$accountTypeString = $_GET['accounttype'] ?? $this->parameters['accounttype'] ?? '';
                self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
 
-               self::$content = $parameters['content'] ?? '';
+               self::$content = $this->parameters['content'] ?? '';
                if (!self::$content) {
                        if (!empty(DI::config()->get('system', 'singleuser'))) {
                                // On single user systems only the global page does make sense
@@ -237,7 +225,7 @@ class Community extends BaseModule
                }
 
                if (!empty($_GET['item'])) {
-                       $item = Item::selectFirst(['parent'], ['id' => $_GET['item']]);
+                       $item = Post::selectFirst(['parent'], ['id' => $_GET['item']]);
                        self::$item_id = $item['parent'] ?? 0;
                } else {
                        self::$item_id = 0;
@@ -314,13 +302,13 @@ class Community extends BaseModule
        {
                if (self::$content == 'local') {
                        if (!is_null(self::$accountType)) {
-                               $condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, 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];
                        }
                } elseif (self::$content == 'global') {
                        if (!is_null(self::$accountType)) {
-                               $condition = ["`uid` = ? AND `private` = ? AND `owner`.`contact-type` = ?", 0, Item::PUBLIC, self::$accountType];
+                               $condition = ["`uid` = ? AND `private` = ? AND `owner-contact-type` = ?", 0, Item::PUBLIC, self::$accountType];
                        } else {
                                $condition = ["`uid` = ? AND `private` = ?", 0, Item::PUBLIC];
                        }
@@ -331,11 +319,11 @@ class Community extends BaseModule
                $params = ['order' => ['commented' => true], 'limit' => $itemspage];
 
                if (!empty($item_id)) {
-                       $condition[0] .= " AND `iid` = ?";
+                       $condition[0] .= " AND `id` = ?";
                        $condition[] = $item_id;
                } else {
                        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[0] .= " AND NOT EXISTS (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uri-id` = `post-thread-user-view`.`uri-id` AND `post-user`.`uid` = ?)";
                                $condition[] = local_user();
                        }
        
@@ -355,9 +343,12 @@ class Community extends BaseModule
                        }
                }
 
-               $r = Item::selectThreadForUser(0, ['uri', 'commented', 'author-link'], $condition, $params);
+               $r = Post::selectThreadForUser(0, ['uri-id', 'commented', 'author-link'], $condition, $params);
 
-               $items = DBA::toArray($r);
+               $items = Post::toArray($r);
+               if (empty($items)) {
+                       return [];
+               }
 
                // Previous page case: once we get the relevant items closest to min_id, we need to restore the expected display order
                if (empty($item_id) && isset($min_id) && !isset($max_id)) {