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

Bugfix. Previous commit didn't take closed chat boxes into consideration

Browse Source
This commit is contained in:
JC Brand 2014-11-08 16:58:42 +01:00
parent dc31057cb9
commit e1efb6042e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
converse.js
View File

@ -2844,6 +2844,7 @@
var $message = $(message); var $message = $(message);
var buddy_jid, $forwarded, $received, var buddy_jid, $forwarded, $received,
msgid = $message.attr('id'), msgid = $message.attr('id'),
chatbox, resource, roster_item,
message_from = $message.attr('from'); message_from = $message.attr('from');
if (message_from === converse.connection.jid) { if (message_from === converse.connection.jid) {
// FIXME: Forwarded messages should be sent to specific resources, // FIXME: Forwarded messages should be sent to specific resources,
@ -2859,8 +2860,7 @@
message_from = $message.attr('from'); message_from = $message.attr('from');
} }
var from = Strophe.getBareJidFromJid(message_from), var from = Strophe.getBareJidFromJid(message_from),
to = Strophe.getBareJidFromJid($message.attr('to')), to = Strophe.getBareJidFromJid($message.attr('to'));
resource, chatbox, roster_item;
if (from == converse.bare_jid) { if (from == converse.bare_jid) {
// I am the sender, so this must be a forwarded message... // I am the sender, so this must be a forwarded message...
buddy_jid = to; buddy_jid = to;
@ -2869,10 +2869,6 @@
buddy_jid = from; buddy_jid = from;
resource = Strophe.getResourceFromJid(message_from); resource = Strophe.getResourceFromJid(message_from);
} }
chatbox = this.get(buddy_jid);
if (msgid && chatbox.messages.findWhere({msgid: msgid})) {
return true; // We already have this message stored.
}
roster_item = converse.roster.get(buddy_jid); roster_item = converse.roster.get(buddy_jid);
if (roster_item === undefined) { if (roster_item === undefined) {
@ -2881,6 +2877,7 @@
return true; return true;
} }
chatbox = this.get(buddy_jid);
if (!chatbox) { if (!chatbox) {
var fullname = roster_item.get('fullname'); var fullname = roster_item.get('fullname');
fullname = _.isEmpty(fullname)? buddy_jid: fullname; fullname = _.isEmpty(fullname)? buddy_jid: fullname;
@ -2893,6 +2890,16 @@
'url': roster_item.get('url') 'url': roster_item.get('url')
}); });
} }
if (msgid && chatbox.messages.findWhere({msgid: msgid})) {
// FIXME: There's still a bug here..
// If a duplicate message is received just after the chat
// box was closed, then it'll open again (due to it being
// created here above), with now new messages.
// The solution is mostly likely to not let chat boxes show
// automatically when they are created, but to require
// "show" to be called explicitly.
return true; // We already have this message stored.
}
if (!this.isOnlyChatStateNotification($message) && from !== converse.bare_jid) { if (!this.isOnlyChatStateNotification($message) && from !== converse.bare_jid) {
playNotification(); playNotification();
} }