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

Bugfix. Need to strip the resource to get the room jid

Browse Source
This commit is contained in:
JC Brand 2016-06-16 17:24:58 +02:00
parent e12c165454
commit ee6d7ebd7a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/converse-notification.js
View File

@ -57,14 +57,15 @@
var notify_all = converse.notify_all_room_messages, var notify_all = converse.notify_all_room_messages,
jid = $message.attr('from'), jid = $message.attr('from'),
resource = Strophe.getResourceFromJid(jid), resource = Strophe.getResourceFromJid(jid),
room_jid = Strophe.getBareJidFromJid(jid),
sender = resource && Strophe.unescapeNode(resource) || ''; sender = resource && Strophe.unescapeNode(resource) || '';
if (sender === '' || $message.find('delay').length > 0) { if (sender === '' || $message.find('delay').length > 0) {
return false; return false;
} }
var room = converse.chatboxes.get(Strophe.getBareJidFromJid(jid)); var room = converse.chatboxes.get(room_jid);
var body = $message.children('body').text(); var body = $message.children('body').text();
var mentioned = (new RegExp("\\b"+room.get('nick')+"\\b")).test(body); var mentioned = (new RegExp("\\b"+room.get('nick')+"\\b")).test(body);
notify_all = notify_all === true || (_.isArray(notify_all) && _.contains(notify_all, jid)); notify_all = notify_all === true || (_.isArray(notify_all) && _.contains(notify_all, room_jid));
if (sender === room.get('nick') || (!notify_all && !mentioned)) { if (sender === room.get('nick') || (!notify_all && !mentioned)) {
return false; return false;
} }