Simplify network update

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index ce2283bdef4a2ca1bad1c129d270411a0f16cf7e..b65910e01b0a2f0688f4098280b0dfe280a7f957 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -151,11 +151,7 @@ class Network extends Timeline
                        $this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString());
                        $this->page['aside'] .= Widget::fileAs('filed', '');
 
-                       // Fetch a page full of parent items for this page
-                       $params = ['limit' => $this->itemsPerPage];
-                       $table = 'network-thread-view';
-
-                       $items = $this->getItems($table, $params);
+                       $items = $this->getItems();
                }
 
                if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') {
@@ -383,9 +379,9 @@ class Network extends Timeline
                }
        }
 
-       protected function getItems(string $table, array $params, array $conditionFields = [])
+       protected function getItems()
        {
-               $conditionFields['uid'] = $this->session->getLocalUserId();
+               $conditionFields  = ['uid' => $this->session->getLocalUserId()];
                $conditionStrings = [];
 
                if (!is_null($this->accountType)) {
@@ -456,6 +452,8 @@ class Network extends Timeline
                        }
                }
 
+               $params = ['limit' => $this->itemsPerPage];
+
                if (isset($this->minId) && !isset($this->maxId)) {
                        // min_id quirk: querying in reverse order with min_id gets the most recent rows, regardless of how close
                        // they are to min_id. We change the query ordering to get the expected data, and we need to reverse the
@@ -465,7 +463,7 @@ class Network extends Timeline
                        $params['order'] = [self::$order => true];
                }
 
-               $items = DBA::selectToArray($table, [], DBA::mergeConditions($conditionFields, $conditionStrings), $params);
+               $items = DBA::selectToArray('network-thread-view', [], DBA::mergeConditions($conditionFields, $conditionStrings), $params);
 
                // min_id quirk, continued
                if (isset($this->minId) && !isset($this->maxId)) {

diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index d5d07589a88974da519cc01f2e4030b1de0048cf..adb73141d6a11e951c4cb9ba118f89d59b84f7df 100644 (file)
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -23,8 +23,6 @@ namespace Friendica\Module\Update;
 
 use Friendica\Content\Conversation;
 use Friendica\Core\System;
-use Friendica\Model\Item;
-use Friendica\Model\Post;
 use Friendica\Module\Conversation\Network as NetworkModule;
 
 class Network extends NetworkModule
@@ -45,30 +43,7 @@ class Network extends NetworkModule
                        System::htmlUpdateExit($o);
                }
 
-               if (!empty($request['item'])) {
-                       $item = Post::selectFirst(['parent'], ['id' => $request['item']]);
-                       $parent = $item['parent'] ?? 0;
-               } else {
-                       $parent = 0;
-               }
-
-               $conditionFields = [];
-               if (!empty($parent)) {
-                       // Load only a single thread
-                       $conditionFields['parent'] = $parent;
-               } elseif (self::$order === 'received') {
-                       // Only load new toplevel posts
-                       $conditionFields['unseen'] = true;
-                       $conditionFields['gravity'] = Item::GRAVITY_PARENT;
-               } else {
-                       // Load all unseen items
-                       $conditionFields['unseen'] = true;
-               }
-
-               $params = ['limit' => $this->itemsPerPage];
-               $table = 'network-thread-view';
-
-               $items = $this->getItems($table, $params, $conditionFields);
+               $items = $this->getItems();
 
                if (self::$order === 'received') {
                        $ordering = '`received`';