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

Conversation.updateLastMessage: fix indent, use of null message

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-06-15 16:11:31 -07:00
parent 36c28296e9
commit aebf4b32d6
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/models/conversations.js
View file

@ -409,16 +409,16 @@
var collection = new Whisper.MessageCollection(); var collection = new Whisper.MessageCollection();
return collection.fetchConversation(this.id, 1).then(function() { return collection.fetchConversation(this.id, 1).then(function() {
var lastMessage = collection.at(0); var lastMessage = collection.at(0);
if (lastMessage.get('type') === 'verified-change') {
return;
}
if (lastMessage) { if (lastMessage) {
this.set({ if (lastMessage.get('type') === 'verified-change') {
lastMessage : lastMessage.getNotificationText(), return;
timestamp : lastMessage.get('sent_at') }
}); this.set({
lastMessage : lastMessage.getNotificationText(),
timestamp : lastMessage.get('sent_at')
});
} else { } else {
this.set({ lastMessage: '', timestamp: null }); this.set({ lastMessage: '', timestamp: null });
} }
if (this.hasChanged('lastMessage') || this.hasChanged('timestamp')) { if (this.hasChanged('lastMessage') || this.hasChanged('timestamp')) {
this.save(); this.save();