Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device

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

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 8fe3dca92f0624fb3fde1fec03480961503a4e4e..f3a60b48f8417432c1a26250b13054a9288f981e 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -17,6 +17,7 @@ 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\Module\Contact as ModuleContact;
@@ -192,8 +193,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 +216,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);
                }
        }
@@ -289,10 +291,16 @@ class Network extends BaseModule
 
                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'])) {
@@ -302,9 +310,6 @@ class Network extends BaseModule
                        self::$order = 'received';
                }
 
-               self::$star    = intval($get['star'] ?? 0);
-               self::$mention = intval($get['mention'] ?? 0);
-
                self::$selectedTab = self::$selectedTab ?? self::$order;
 
                Session::set('network-tab', self::$selectedTab);