From ab235e24ad8ebf365d4466cc6c34f9b571bae467 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 9 Sep 2023 13:48:41 +0000
Subject: [PATCH] Centralised function for the sort order

---
 src/Module/Conversation/Network.php | 21 ++++++++++++---------
 src/Module/Update/Network.php       | 12 +-----------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index b65910e01..e99c01505 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -238,15 +238,7 @@ class Network extends Timeline
 			$o .= Profile::getEventsReminderHTML();
 		}
 
-		if (self::$order === 'received') {
-			$ordering = '`received`';
-		} elseif (self::$order === 'created') {
-			$ordering = '`created`';
-		} else {
-			$ordering = '`commented`';
-		}
-
-		$o .= $this->conversation->render($items, Conversation::MODE_NETWORK, false, false, $ordering, $this->session->getLocalUserId());
+		$o .= $this->conversation->render($items, Conversation::MODE_NETWORK, false, false, $this->getOrder(), $this->session->getLocalUserId());
 
 		if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll')) {
 			$o .= HTML::scrollLoader();
@@ -265,6 +257,17 @@ class Network extends Timeline
 		return $o;
 	}
 
+	protected function getOrder(): string
+	{
+		if (self::$order === 'received') {
+			return '`received`';
+		} elseif (self::$order === 'created') {
+			return '`created`';
+		} else {
+			return '`commented`';
+		}
+	}
+
 	/**
 	 * Sets items as seen
 	 *
diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index adb73141d..59ab0e2eb 100644
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -43,17 +43,7 @@ class Network extends NetworkModule
 			System::htmlUpdateExit($o);
 		}
 
-		$items = $this->getItems();
-
-		if (self::$order === 'received') {
-			$ordering = '`received`';
-		} elseif (self::$order === 'created') {
-			$ordering = '`created`';
-		} else {
-			$ordering = '`commented`';
-		}
-
-		$o = $this->conversation->render($items, Conversation::MODE_NETWORK, $profile_uid, false, $ordering, $this->session->getLocalUserId());
+		$o = $this->conversation->render($this->getItems(), Conversation::MODE_NETWORK, $profile_uid, false, $this->getOrder(), $this->session->getLocalUserId());
 
 		System::htmlUpdateExit($o);
 	}