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 c236778cb4f5ce3daf9d4207816c5056bb511cef..877bed3e220df7255820f8e382873c700c448f6f 100644 (file)
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,7 +29,6 @@ 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;
@@ -50,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');
@@ -95,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 = [];
                
@@ -128,7 +127,7 @@ class Community extends BaseModule
 
                        // We need the editor here to be able to reshare an item.
                        if (Session::isAuthenticated()) {
-                               $o .= status_editor(DI::app(), [], 0, true);
+                               $o .= DI::conversation()->statusEditor([], 0, true);
                        }
                }
 
@@ -139,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(),
@@ -167,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.'));
@@ -183,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