From 7f4e6c2b64be07ce7587dc906e1d65494121a534 Mon Sep 17 00:00:00 2001
From: nobody <nobody@zotlabs.com>
Date: Thu, 20 May 2021 19:31:31 -0700
Subject: [PATCH] undo experimental order change (undesirable interaction with
 loadtime variable)

---
 Zotlabs/Module/Channel.php | 10 +++++-----
 Zotlabs/Module/Stream.php  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 9f067c124..7b9fc4a9c 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -181,7 +181,7 @@ class Channel extends Controller {
 		$noscript_content = get_config('system', 'noscript_content', '1');
 
 		if($load)
-			$_SESSION['loadtime_channel'] = datetime_convert();
+			$_SESSION['loadtime'] = datetime_convert();
 
 		$category = $datequery = $datequery2 = '';
 
@@ -342,8 +342,8 @@ class Channel extends Controller {
 			'title' => 'oembed'
 		]);
 
-		if ($update && isset($_SESSION['loadtime_channel'])) {
-			$simple_update = " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_channel']) . "' ";
+		if ($update && isset($_SESSION['loadtime'])) {
+			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
 		}
 		if ($load) {
 			$simple_update = '';
@@ -361,7 +361,7 @@ class Channel extends Controller {
 					dbesc($mid . '%'),
 					intval(App::$profile['profile_uid'])
 				);
-				$_SESSION['loadtime_channel'] = datetime_convert();
+				$_SESSION['loadtime'] = datetime_convert();
 			}
 			else {
 				$r = q("SELECT parent AS item_id from item
@@ -373,7 +373,7 @@ class Channel extends Controller {
 					ORDER BY created DESC",
 					intval(App::$profile['profile_uid'])
 				);
-				$_SESSION['loadtime_channel'] = datetime_convert();
+				$_SESSION['loadtime'] = datetime_convert();
 			}
 
 		}
diff --git a/Zotlabs/Module/Stream.php b/Zotlabs/Module/Stream.php
index 05e4410ed..ee38813cb 100644
--- a/Zotlabs/Module/Stream.php
+++ b/Zotlabs/Module/Stream.php
@@ -557,7 +557,7 @@ class Stream extends Controller {
 			if($order === 'post')
 				$ordering = "created";
 			else
-				$ordering = "changed";
+				$ordering = "commented";
 
 			if ($load) {
 				// Fetch a page full of parent items for this page