colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When finding all groups involving a number, load from DB not memory

Browse Source 
FREEBIE
This commit is contained in:
Scott Nonnenberg
2017-07-21 11:00:25 -07:00
parent 0adc398a6f
commit 3e0fa995dd
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/conversation_controller.js
View File

@@ -116,8 +116,11 @@
}); });
}, },
getAllGroupsInvolvingId: function(id) { getAllGroupsInvolvingId: function(id) {
return conversations.filter(function(conversation) { var groups = new Whisper.GroupCollection();
return !conversation.isPrivate() && conversation.hasMember(id); return groups.fetchGroups(id).then(function() {
return groups.map(function(group) {
return conversations.add(group);
});
}); });
}, },
updateInbox: function() { updateInbox: function() {

8
js/keychange_listener.js
View File

@@ -17,11 +17,9 @@
conversation.fetch().then(function() { conversation.fetch().then(function() {
conversation.addKeyChange(id); conversation.addKeyChange(id);
}); });
var groups = new Whisper.GroupCollection(); ConversationController.getAllGroupsInvolvingId(id).then(function(groups) {
return groups.fetchGroups(id).then(function() { _.forEach(groups, function(group) {
groups.each(function(conversation) { group.addKeyChange(id);
conversation = ConversationController.add(conversation);
conversation.addKeyChange(id);
}); });
}); });
}); });

3
js/models/conversations.js
View File

@@ -320,10 +320,11 @@
message.save().then(this.trigger.bind(this,'newmessage', message)); message.save().then(this.trigger.bind(this,'newmessage', message));
if (this.isPrivate()) { if (this.isPrivate()) {
var groups = ConversationController.getAllGroupsInvolvingId(id); ConversationController.getAllGroupsInvolvingId(id).then(function(groups) {
_.forEach(groups, function(group) { _.forEach(groups, function(group) {
group.addVerifiedChange(id, verified, options); group.addVerifiedChange(id, verified, options);
}); });
});
} }
}, },