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

Always update lastMessage on incoming messages

Browse source 
Fixes #742

// FREEBIE
This commit is contained in:
lilia 2016-04-14 17:32:30 -07:00
parent ba22151a31
commit 172d843368
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/models/messages.js
View file

@ -347,15 +347,12 @@
var conversation_timestamp = conversation.get('timestamp'); var conversation_timestamp = conversation.get('timestamp');
if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) { if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {
conversation.set({ conversation.set({
timestamp: message.get('sent_at'), timestamp: message.get('sent_at')
lastMessage: message.getNotificationText()
});
}
else if (!conversation.get('lastMessage')) {
conversation.set({
lastMessage: message.getNotificationText()
}); });
} }
conversation.set({
lastMessage: message.getNotificationText()
});
message.save().then(function() { message.save().then(function() {
conversation.save().then(function() { conversation.save().then(function() {