Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fixes #1089. When filtering by online, show all non-offline users

Browse Source
This commit is contained in:
JC Brand 2019-10-17 13:28:18 +02:00
parent f7a57f272e
commit ea54644a45
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -3,8 +3,9 @@
## 6.0.0 (Unreleased)
- #129: Add support for XEP-0156: Disovering Alternative XMPP Connection Methods. Only XML is supported for now.
- #1691 Fix `collection.chatbox is undefined` errors
- #1733 New message notifications for a minimized chat stack on top of each other
- #1089: When filtering the roster for `online` users, show all non-offline users.
- #1691: Fix `collection.chatbox is undefined` errors
- #1733: New message notifications for a minimized chat stack on top of each other
- Prevent editing of sent file uploads.
- Initial support for sending custom emojis. Currently only between Converse
instances. Still working out a wire protocol for compatibility with other clients.

34
src/converse-rosterview.js
View File

@ -593,13 +593,14 @@ converse.plugins.add('converse-rosterview', {
return u.slideIn(this.contacts_el);
},
/* Given a list of contacts, make sure they're filtered out
* (aka hidden) and that all other contacts are visible.
* If all contacts are hidden, then also hide the group title.
* @private
* @method _converse.RosterGroupView#filterOutContacts
* @param { Array } contacts
*/
filterOutContacts (contacts=[]) {
/* Given a list of contacts, make sure they're filtered out
* (aka hidden) and that all other contacts are visible.
*
* If all contacts are hidden, then also hide the group
* title.
*/
let shown = 0;
this.model.contacts.forEach(contact => {
const contact_view = this.get(contact.get('id'));
@ -617,10 +618,15 @@ converse.plugins.add('converse-rosterview', {
}
},
/**
* Given the filter query "q" and the filter type "type",
* return a list of contacts that need to be filtered out.
* @private
* @method _converse.RosterGroupView#getFilterMatches
* @param { String } q - The filter query
* @param { String } type - The filter type
*/
getFilterMatches (q, type) {
/* Given the filter query "q" and the filter type "type",
* return a list of contacts that need to be filtered out.
*/
if (q.length === 0) {
return [];
}
@ -631,15 +637,13 @@ converse.plugins.add('converse-rosterview', {
// When filtering by chat state, we still want to
// show requesting contacts, even though they don't
// have the state in question.
matches = this.model.contacts.filter(
(contact) => !_.includes(contact.presence.get('show'), q) && !contact.get('requesting')
);
matches = this.model.contacts.filter(c => !_.includes(c.presence.get('show'), q) && !c.get('requesting'));
} else if (q === 'unread_messages') {
matches = this.model.contacts.filter({'num_unread': 0});
} else if (q === 'online') {
matches = this.model.contacts.filter(c => ["offline", "unavailable"].includes(c.presence.get('show')));
} else {
matches = this.model.contacts.filter(
(contact) => !_.includes(contact.presence.get('show'), q)
);
matches = this.model.contacts.filter(c => !_.includes(c.presence.get('show'), q));
}
} else {
matches = this.model.contacts.filter((contact) => {

2
webpack.html
View File

@ -29,7 +29,7 @@
muc_domain: 'conference.chat.example.org',
muc_respect_autojoin: true,
password: 'secret',
view_mode: 'overlayed',
view_mode: 'fullscreen',
websocket_url: 'ws://chat.example.org:5380/xmpp-websocket',
whitelisted_plugins: ['converse-debug'],
});