thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Omit left groups from search

Browse source 
Unless they contain messages.

// FREEBIE
This commit is contained in:
lilia 2016-02-18 17:27:57 -08:00
parent 010297f4c5
commit 7e8ce5eb54
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/models/conversations.js
View file

@ -123,6 +123,10 @@
message.send(sendFunc(this.get('id'), body, attachments, now));
},
isSearchable: function() {
return !this.get('left') || !!this.get('lastMessage');
},
endSession: function() {
if (this.isPrivate()) {
var now = Date.now();

7
js/models/messages.js
View file

@ -394,7 +394,10 @@
});
},
fetchConversation: function(conversationId) {
fetchConversation: function(conversationId, limit) {
if (typeof limit !== 'number') {
limit = 100;
}
return new Promise(function(resolve) {
var upper;
if (this.length === 0) {
@ -404,7 +407,7 @@
// not our first rodeo, fetch older messages.
upper = this.at(0).get('received_at');
}
var options = {remove: false, limit: 100};
var options = {remove: false, limit: limit};
options.index = {
// 'conversation' index on [conversationId, received_at]
name : 'conversation',

6
js/views/conversation_search_view.js
View file

@ -67,7 +67,11 @@
}
this.pending = this.pending.then(function() {
return this.typeahead.search(query).then(function() {
this.typeahead_view.collection.reset(this.typeahead.models);
this.typeahead_view.collection.reset(
this.typeahead.filter(function(m) {
return m.isSearchable();
})
);
}.bind(this));
}.bind(this));
this.trigger('show');