Merge pull request #9963 from mexon/mat/support-cid-scheme

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

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index ca8e8c89c2338f1bf39f2ed22c2d4405c6725752..c093cc9ca6a0d0891f3f250c6ff5ddb2238b0e2c 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;
@@ -215,7 +216,7 @@ 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
@@ -305,12 +306,21 @@ class Network extends BaseModule
                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::$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);
 
@@ -433,7 +443,7 @@ class Network extends BaseModule
                }
 
                if (DBA::isResult($items)) {
-                       $parents = array_column($items, 'parent');
+                       $parents = array_column($items, 'parent-uri-id');
                } else {
                        $parents = [];
                }
@@ -445,7 +455,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);
                }