m.get('sender') -> m.isIncoming(), filter in getLoadedUnreadCount
FREEBIE
This commit is contained in:
@@ -261,7 +261,6 @@
|
||||
var message = new Whisper.Message({
|
||||
conversationId : this.id,
|
||||
type : 'verified-change',
|
||||
// why is sent_at set to this.get('timestamp?')
|
||||
sent_at : this.get('timestamp'),
|
||||
received_at : timestamp,
|
||||
verifiedChanged : id,
|
||||
@@ -555,7 +554,7 @@
|
||||
return Boolean(m.sender);
|
||||
});
|
||||
unreadMessages = unreadMessages.filter(function(m) {
|
||||
return Boolean(m.get('sender'));
|
||||
return Boolean(m.isIncoming());
|
||||
});
|
||||
|
||||
var unreadCount = unreadMessages.length - read.length;
|
||||
|
@@ -546,11 +546,8 @@
|
||||
|
||||
getLoadedUnreadCount: function() {
|
||||
return this.models.reduce(function(total, model) {
|
||||
var count = model.get('unread');
|
||||
if (count === undefined) {
|
||||
count = 0;
|
||||
}
|
||||
return total + count;
|
||||
var unread = model.get('unread') && model.isIncoming();
|
||||
return total + (unread ? 1 : 0);
|
||||
}, 0);
|
||||
},
|
||||
|
||||
|
Reference in New Issue
Block a user