add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode.

1 files changed, 23 insertions, 6 deletions

diff --git a/mod/network.php b/mod/network.php
index d6c19eca7..c79ff8d6a 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -317,6 +317,11 @@ function network_content(&$a, $update = 0, $load = false) {
 		$uids = " and item.uid = " . local_user() . " ";
 	}
 
+	if(get_pconfig(local_user(),'system','network_list_mode'))
+		$page_mode = 'list';
+	else
+		$page_mode = 'client';
+
 	$simple_update = (($update) ? " and ( item.item_flags & " . intval(ITEM_UNSEEN) . " ) > 0 " : '');
 
 	// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
@@ -414,9 +419,25 @@ function network_content(&$a, $update = 0, $load = false) {
 			$items = array();
 		}
 
-		if($parents_str)
-			$update_unseen = ' AND parent IN ( ' . dbesc($parents_str) . ' )';
+		if($page_mode === 'list') {
+
+			/**
+			 * in "list mode", only mark the parent item and any like activities as "seen". 
+			 * We won't distinguish between comment likes and post likes. The important thing
+			 * is that the number of unseen comments will be accurate. The SQL to separate the
+			 * comment likes could also get somewhat hairy. 
+			 */
 
+			if($parents_str) {
+				$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
+				$update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
+			}
+		}
+		else {
+			if($parents_str) {
+				$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
+			}
+		}
 	}
 
 	if(($update_unseen) && (! $firehose))
@@ -429,10 +450,6 @@ function network_content(&$a, $update = 0, $load = false) {
 
 	$mode = (($nouveau) ? 'network-new' : 'network');
 
-	if(get_pconfig(local_user(),'system','network_list_mode'))
-		$page_mode = 'list';
-	else
-		$page_mode = 'client';
 
 	$o .= conversation($a,$items,$mode,$update,$page_mode);