Code style

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

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index b19f409025d33f63db4ad070d262add7444ff981..3585d52ed2a0ae59b5a2a36ccbbaa5a5d1773326 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -17,10 +17,13 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Model\Verb;
 use Friendica\Module\Contact as ModuleContact;
 use Friendica\Module\Security\Login;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 
 class Network extends BaseModule
@@ -136,22 +139,13 @@ class Network extends BaseModule
                        }
 
                        $x = [
-                               'is_owner' => true,
-                               'allow_location' => $a->user['allow_location'],
-                               'default_location' => $a->user['default-location'],
-                               'nickname' => $a->user['nickname'],
-                               'lockstate' => (self::$groupId || self::$forumContactId || self::$network || (is_array($a->user) &&
-                                       (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
-                                               strlen($a->user['deny_cid']) || strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
-                               'default_perms' => ACL::getDefaultUserPermissions($a->user),
-                               'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true, $default_permissions),
+                               'lockstate' => self::$groupId || self::$forumContactId || self::$network || ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock',
+                               'acl' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), true, $default_permissions),
                                'bang' => ((self::$groupId || self::$forumContactId || self::$network) ? '!' : ''),
-                               'visitor' => 'block',
-                               'profile_uid' => local_user(),
                                'content' => $content,
                        ];
 
-                       $o .= status_editor($a, $x);
+                       $o .= DI::conversation()->statusEditor($x);
                }
 
                if (self::$groupId) {
@@ -184,7 +178,7 @@ class Network extends BaseModule
                        $ordering = '`commented`';
                }
 
-               $o .= conversation(DI::app(), $items, 'network', false, false, $ordering, local_user());
+               $o .= DI::conversation()->create($items, 'network', false, false, $ordering, local_user());
 
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
                        $o .= HTML::scrollLoader();
@@ -192,8 +186,8 @@ class Network extends BaseModule
                        $pager = new BoundariesPager(
                                DI::l10n(),
                                DI::args()->getQueryString(),
-                               $items[0][self::$order],
-                               $items[count($items) - 1][self::$order],
+                               $items[0][self::$order] ?? null,
+                               $items[count($items) - 1][self::$order] ?? null,
                                self::$itemsPerPage
                        );
 
@@ -215,9 +209,10 @@ class Network extends BaseModule
                        return;
                }
 
-               $unseen = Item::exists($condition);
+               $unseen = Post::exists($condition);
 
                if ($unseen) {
+                       /// @todo handle huge "unseen" updates in the background to avoid timeout errors
                        Item::update(['unseen' => false], $condition);
                }
        }
@@ -285,24 +280,40 @@ class Network extends BaseModule
 
                self::$selectedTab = Session::get('network-tab', DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', ''));
 
+               self::$order = 'commented';
+
                if (!empty($get['star'])) {
                        self::$selectedTab = 'star';
+                       self::$star = true;
+               } else {
+                       self::$star = self::$selectedTab == 'star';
                }
 
                if (!empty($get['mention'])) {
                        self::$selectedTab = 'mention';
+                       self::$mention = true;
+               } else {
+                       self::$mention = self::$selectedTab == 'mention';
                }
 
                if (!empty($get['order'])) {
                        self::$selectedTab = $get['order'];
+                       self::$order = $get['order'];
+                       self::$star = false;
+                       self::$mention = false;
+               } elseif (in_array(self::$selectedTab, ['received', 'star', 'mention'])) {
+                       self::$order = 'received';
                }
 
-               self::$star    = intval($get['star'] ?? 0);
-               self::$mention = intval($get['mention'] ?? 0);
-               self::$order   = $get['order'] ?? Session::get('network-order', 'commented');
-
                self::$selectedTab = self::$selectedTab ?? self::$order;
 
+               // Prohibit combined usage of "star" and "mention"
+               if (self::$selectedTab == 'star') {
+                       self::$mention = false;
+               } elseif (self::$selectedTab == 'mention') {
+                       self::$star = false;
+               }
+
                Session::set('network-tab', self::$selectedTab);
                DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab);
 
@@ -339,8 +350,6 @@ class Network extends BaseModule
                                self::$order = 'commented';
                                self::$max_id = $get['last_commented'] ?? self::$max_id;
                }
-
-               Session::set('network-order', self::$order);
        }
 
        protected static function getItems(string $table, array $params, array $conditionFields = [])
@@ -372,7 +381,9 @@ class Network extends BaseModule
                if (self::$groupId) {
                        $conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", self::$groupId]);
                } elseif (self::$forumContactId) {
-                       $conditionFields['contact-id'] = self::$forumContactId;
+                       $conditionStrings = DBA::mergeConditions($conditionStrings, 
+                               ["((`contact-id` = ?) OR EXISTS(SELECT `uri-id` FROM `post-user-view` WHERE `post-user-view`.`parent-uri-id` = `network-thread-view`.`uri-id` AND (`contact-id` = ? AND `gravity` = ? AND `vid` = ? AND `uid` = ?)))",
+                               self::$forumContactId, self::$forumContactId, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), local_user()]);
                }
 
                // Currently only the order modes "received" and "commented" are in use
@@ -427,7 +438,7 @@ class Network extends BaseModule
                }
 
                if (DBA::isResult($items)) {
-                       $parents = array_column($items, 'parent');
+                       $parents = array_column($items, 'parent-uri-id');
                } else {
                        $parents = [];
                }
@@ -439,7 +450,7 @@ class Network extends BaseModule
                        $condition = ['unseen' => true, 'uid' => local_user()];
                        self::setItemsSeenByCondition($condition);
                } elseif (!empty($parents)) {
-                       $condition = ['unseen' => true, 'uid' => local_user(), 'parent' => $parents];
+                       $condition = ['unseen' => true, 'uid' => local_user(), 'parent-uri-id' => $parents];
                        self::setItemsSeenByCondition($condition);
                }