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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/ItemObject.php
View File

@ -79,6 +79,7 @@ class Item extends BaseObject {
$indent = '';
$osparkle = '';
$total_children = $this->count_descendants();
$unseen_comments = (($item->real_uid) ? 0 : $this->count_unseen_descendants());
$conv = $this->get_conversation();
$observer = $conv->get_observer();
@ -233,6 +234,8 @@ class Item extends BaseObject {
$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
$list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : '');
$children = $this->get_children();
$tmp_item = array(
@ -290,8 +293,12 @@ class Item extends BaseObject {
'drop' => $drop,
'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
// end toolbar buttons
'unseen_comments' => $unseen_comments,
'comment_count' => $total_children,
'comment_count_txt' => $comment_count_txt,
'list_unseen_txt' => $list_unseen_txt,
'markseen' => t('Mark all seen'),
'like_count' => $like_count,
'like_list' => $like_list,
'like_list_part' => $like_list_part,
@ -545,6 +552,23 @@ class Item extends BaseObject {
return $total;
}
private function count_unseen_descendants() {
$children = $this->get_children();
$total = count($children);
if($total > 0) {
$total = 0;
foreach($children as $child) {
if((! visible_activity($child->data)) || array_key_exists('author_blocked',$child->data)) {
continue;
}
if($child->data['item_flags'] & ITEM_UNSEEN)
$total ++;
}
}
return $total;
}
/**
* Get the template for the comment box
*/

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

16
mod/ping.php
View File

@ -150,14 +150,14 @@ function ping_init(&$a) {
if(x($_REQUEST, 'markRead') && local_user()) {
switch($_REQUEST['markRead']) {
case 'network':
$r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d)>0 and uid = %d",
$r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d) > 0 and uid = %d",
intval(ITEM_UNSEEN),
intval(ITEM_UNSEEN),
intval(local_user())
);
break;
case 'home':
$r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d)>0 and (item_flags & %d) and uid = %d",
$r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d) > 0 and (item_flags & %d) > 0 and uid = %d",
intval(ITEM_UNSEEN),
intval(ITEM_UNSEEN),
intval(ITEM_WALL),
@ -165,14 +165,14 @@ function ping_init(&$a) {
);
break;
case 'messages':
$r = q("update mail set mail_flags = ( mail_flags | %d ) where channel_id = %d and not (mail_flags & %d)>0",
$r = q("update mail set mail_flags = ( mail_flags | %d ) where channel_id = %d and not (mail_flags & %d) > 0",
intval(MAIL_SEEN),
intval(local_user()),
intval(MAIL_SEEN)
);
break;
case 'all_events':
$r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d",
$r = q("update event set ignore = 1 where ignore = 0 and uid = %d",
intval(local_user())
);
break;
@ -186,6 +186,14 @@ function ping_init(&$a) {
}
}
if(x($_REQUEST, 'markItemRead') && local_user()) {
$r = q("update item set item_flags = ( item_flags & ~%d ) where parent = %d and uid = %d",
intval(ITEM_UNSEEN),
intval($_REQUEST['markItemRead']),
intval(local_user())
);
}
/**

2
version.inc
View File

@ -1 +1 @@
2014-11-16.861
2014-11-17.862

7
view/js/main.js
View File

@ -180,6 +180,13 @@
timer = setTimeout(NavUpdate,2000);
}
function markItemRead(itemId) {
$.get('ping?f=&markItemRead='+itemId);
$('.unseen-wall-indicator-'+itemId).hide();
}
var src = null;
var prev = null;
var livetime = null;

3
view/tpl/conv_list.tpl
View File

@ -164,7 +164,8 @@
{{/if}}
</div>
<div class="clear"></div>
<div class="wall-item-list-comments"><a href="{{$item.llink}}">{{$item.comment_count_txt}}</a></div>
<div class="wall-item-list-comments"><a href="{{$item.llink}}">{{$item.comment_count_txt}}{{if $item.unseen_comments}}
<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></a>{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">&nbsp;&nbsp;&nbsp;<button class="btn btn-default" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></span>{{/if}}</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>