Remove DI dependency from Module\Contact\Profile

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

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 72e541be4b90bf261b05b8351e12ba0f5c5a162c..ed53f7d2339d8f21dbf321efc387b2f07519022b 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -24,7 +24,7 @@ namespace Friendica\Module\Conversation;
 use Friendica\BaseModule;
 use Friendica\Content\BoundariesPager;
 use Friendica\Content\Conversation;
-use Friendica\Content\ForumManager;
+use Friendica\Content\GroupManager;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
@@ -52,7 +52,7 @@ class Network extends BaseModule
        /** @var int */
        private static $circleId;
        /** @var int */
-       private static $forumContactId;
+       private static $groupContactId;
        /** @var string */
        private static $selectedTab;
        /** @var mixed */
@@ -90,9 +90,9 @@ class Network extends BaseModule
 
                DI::page()['aside'] .= Widget::accountTypes($module, self::$accountTypeString);
                DI::page()['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', self::$circleId);
-               DI::page()['aside'] .= ForumManager::widget($module . '/forum', DI::userSession()->getLocalUserId(), self::$forumContactId);
+               DI::page()['aside'] .= GroupManager::widget($module . '/group', DI::userSession()->getLocalUserId(), self::$groupContactId);
                DI::page()['aside'] .= Widget::postedByYear($module . '/archive', DI::userSession()->getLocalUserId(), false);
-               DI::page()['aside'] .= Widget::networks($module, !self::$forumContactId ? self::$network : '');
+               DI::page()['aside'] .= Widget::networks($module, !self::$groupContactId ? self::$network : '');
                DI::page()['aside'] .= Widget\SavedSearches::getHTML(DI::args()->getQueryString());
                DI::page()['aside'] .= Widget::fileAs('filed', '');
 
@@ -119,9 +119,9 @@ class Network extends BaseModule
 
                        $content = '';
 
-                       if (self::$forumContactId) {
-                               // If self::$forumContactId belongs to a community forum or a private group, add a mention to the status editor
-                               $condition = ["`id` = ? AND `contact-type` = ?", self::$forumContactId, Contact::TYPE_COMMUNITY];
+                       if (self::$groupContactId) {
+                               // If self::$groupContactId belongs to a community group or a private group, add a mention to the status editor
+                               $condition = ["`id` = ? AND `contact-type` = ?", self::$groupContactId, Contact::TYPE_COMMUNITY];
                                $contact = DBA::selectFirst('contact', ['addr'], $condition);
                                if (!empty($contact['addr'])) {
                                        $content = '!' . $contact['addr'];
@@ -136,8 +136,8 @@ class Network extends BaseModule
                        }
 
                        $allowedCids = [];
-                       if (self::$forumContactId) {
-                               $allowedCids[] = (int) self::$forumContactId;
+                       if (self::$groupContactId) {
+                               $allowedCids[] = (int) self::$groupContactId;
                        } elseif (self::$network) {
                                $condition = [
                                        'uid'     => DI::userSession()->getLocalUserId(),
@@ -160,9 +160,9 @@ class Network extends BaseModule
                        }
 
                        $x = [
-                               'lockstate' => self::$circleId || self::$forumContactId || self::$network || ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock',
+                               'lockstate' => self::$circleId || self::$groupContactId || self::$network || ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock',
                                'acl' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), true, $default_permissions),
-                               'bang' => ((self::$circleId || self::$forumContactId || self::$network) ? '!' : ''),
+                               'bang' => ((self::$circleId || self::$groupContactId || self::$network) ? '!' : ''),
                                'content' => $content,
                        ];
 
@@ -178,8 +178,8 @@ class Network extends BaseModule
                        $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
                                '$title' => DI::l10n()->t('Circle: %s', $circle['name'])
                        ]) . $o;
-               } elseif (self::$forumContactId) {
-                       $contact = Contact::getById(self::$forumContactId);
+               } elseif (self::$groupContactId) {
+                       $contact = Contact::getById(self::$groupContactId);
                        if (DBA::isResult($contact)) {
                                $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('contact/list.tpl'), [
                                        'contacts' => [ModuleContact::getContactTemplateVars($contact)],
@@ -201,7 +201,7 @@ class Network extends BaseModule
                        $ordering = '`commented`';
                }
 
-               $o .= DI::conversation()->create($items, Conversation::MODE_NETWORK, false, false, $ordering, DI::userSession()->getLocalUserId());
+               $o .= DI::conversation()->render($items, Conversation::MODE_NETWORK, false, false, $ordering, DI::userSession()->getLocalUserId());
 
                if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'infinite_scroll')) {
                        $o .= HTML::scrollLoader();
@@ -305,9 +305,9 @@ class Network extends BaseModule
 
        protected function parseRequest(array $get)
        {
-               self::$circleId = $this->parameters['circle_id'] ?? 0;
+               self::$circleId = (int)($this->parameters['circle_id'] ?? 0);
 
-               self::$forumContactId = $this->parameters['contact_id'] ?? 0;
+               self::$groupContactId = (int)($this->parameters['contact_id'] ?? 0);
 
                self::$selectedTab = self::getTimelineOrderBySession(DI::userSession(), DI::pConfig());
 
@@ -413,10 +413,10 @@ class Network extends BaseModule
 
                if (self::$circleId) {
                        $conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", self::$circleId]);
-               } elseif (self::$forumContactId) {
+               } elseif (self::$groupContactId) {
                        $conditionStrings = DBA::mergeConditions($conditionStrings,
                                ["((`contact-id` = ?) OR `uri-id` IN (SELECT `parent-uri-id` FROM `post-user-view` WHERE (`contact-id` = ? AND `gravity` = ? AND `vid` = ? AND `uid` = ?)))",
-                               self::$forumContactId, self::$forumContactId, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), DI::userSession()->getLocalUserId()]);
+                               self::$groupContactId, self::$groupContactId, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), DI::userSession()->getLocalUserId()]);
                }
 
                // Currently only the order modes "received" and "commented" are in use
@@ -471,7 +471,7 @@ class Network extends BaseModule
                }
 
                if (DBA::isResult($items)) {
-                       $parents = array_column($items, 'parent-uri-id');
+                       $parents = array_column($items, 'uri-id');
                } else {
                        $parents = [];
                }
@@ -479,7 +479,7 @@ class Network extends BaseModule
                // We aren't going to try and figure out at the item, circle, and page
                // level which items you've seen and which you haven't. If you're looking
                // at the top level network page just mark everything seen.
-               if (!self::$circleId && !self::$forumContactId && !self::$star && !self::$mention) {
+               if (!self::$circleId && !self::$groupContactId && !self::$star && !self::$mention) {
                        $condition = ['unseen' => true, 'uid' => DI::userSession()->getLocalUserId()];
                        self::setItemsSeenByCondition($condition);
                } elseif (!empty($parents)) {