harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
friendica
2014-11-17 15:18:06 -08:00
parent b11ed7f88e
commit c0ad4763b3
6 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mod/network.php
View File

@@ -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);