mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

m.get('sender') -> m.isIncoming(), filter in getLoadedUnreadCount

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-05 13:52:27 -07:00
parent 5b46ef3562
commit e2ee63efaa
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/conversations.js
View file

@ -261,7 +261,6 @@
var message = new Whisper.Message({ var message = new Whisper.Message({
conversationId : this.id, conversationId : this.id,
type : 'verified-change', type : 'verified-change',
// why is sent_at set to this.get('timestamp?')
sent_at : this.get('timestamp'), sent_at : this.get('timestamp'),
received_at : timestamp, received_at : timestamp,
verifiedChanged : id, verifiedChanged : id,
@ -555,7 +554,7 @@
return Boolean(m.sender); return Boolean(m.sender);
}); });
unreadMessages = unreadMessages.filter(function(m) { unreadMessages = unreadMessages.filter(function(m) {
return Boolean(m.get('sender')); return Boolean(m.isIncoming());
}); });
var unreadCount = unreadMessages.length - read.length; var unreadCount = unreadMessages.length - read.length;

7
js/models/messages.js
View file

@ -546,11 +546,8 @@
getLoadedUnreadCount: function() { getLoadedUnreadCount: function() {
return this.models.reduce(function(total, model) { return this.models.reduce(function(total, model) {
var count = model.get('unread'); var unread = model.get('unread') && model.isIncoming();
if (count === undefined) { return total + (unread ? 1 : 0);
count = 0;
}
return total + count;
}, 0); }, 0);
}, },