Fixes #260 Sent message carbons are not displayed.
This commit is contained in:
parent
ef8082a31d
commit
52c3df7cb4
14
converse.js
14
converse.js
|
@ -633,7 +633,11 @@
|
||||||
.c('enable', {xmlns: 'urn:xmpp:carbons:2'});
|
.c('enable', {xmlns: 'urn:xmpp:carbons:2'});
|
||||||
this.connection.send(carbons_iq);
|
this.connection.send(carbons_iq);
|
||||||
this.connection.addHandler(function (iq) {
|
this.connection.addHandler(function (iq) {
|
||||||
//TODO: check if carbons was enabled:
|
if ($(iq).find('error').length > 0) {
|
||||||
|
converse.log('ERROR: An error occured while trying to enable message carbons.');
|
||||||
|
} else {
|
||||||
|
converse.log('Message carbons appear to have been enabled.');
|
||||||
|
}
|
||||||
}, null, "iq", null, "enablecarbons");
|
}, null, "iq", null, "enablecarbons");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2899,7 +2903,7 @@
|
||||||
|
|
||||||
onMessage: function (message) {
|
onMessage: function (message) {
|
||||||
var $message = $(message);
|
var $message = $(message);
|
||||||
var contact_jid, $forwarded, $received,
|
var contact_jid, $forwarded, $received, $sent,
|
||||||
msgid = $message.attr('id'),
|
msgid = $message.attr('id'),
|
||||||
chatbox, resource, roster_item,
|
chatbox, resource, roster_item,
|
||||||
message_from = $message.attr('from');
|
message_from = $message.attr('from');
|
||||||
|
@ -2910,12 +2914,18 @@
|
||||||
}
|
}
|
||||||
$forwarded = $message.children('forwarded');
|
$forwarded = $message.children('forwarded');
|
||||||
$received = $message.children('received[xmlns="urn:xmpp:carbons:2"]');
|
$received = $message.children('received[xmlns="urn:xmpp:carbons:2"]');
|
||||||
|
$sent = $message.children('sent[xmlns="urn:xmpp:carbons:2"]');
|
||||||
|
|
||||||
if ($forwarded.length) {
|
if ($forwarded.length) {
|
||||||
$message = $forwarded.children('message');
|
$message = $forwarded.children('message');
|
||||||
} else if ($received.length) {
|
} else if ($received.length) {
|
||||||
$message = $received.children('forwarded').children('message');
|
$message = $received.children('forwarded').children('message');
|
||||||
message_from = $message.attr('from');
|
message_from = $message.attr('from');
|
||||||
|
} else if ($sent.length) {
|
||||||
|
$message = $sent.children('forwarded').children('message');
|
||||||
|
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'));
|
||||||
if (from == converse.bare_jid) {
|
if (from == converse.bare_jid) {
|
||||||
|
|
|
@ -17,6 +17,7 @@ Changelog
|
||||||
* #237 Unable to create room when ``hide_muc_server`` is ``true``. [jcbrand]
|
* #237 Unable to create room when ``hide_muc_server`` is ``true``. [jcbrand]
|
||||||
* #238 Rooms are not shown when ``hide_offline_users`` is ``true``. [jcbrand]
|
* #238 Rooms are not shown when ``hide_offline_users`` is ``true``. [jcbrand]
|
||||||
* #251 Non-minified builds for debugging. [jcbrand]
|
* #251 Non-minified builds for debugging. [jcbrand]
|
||||||
|
* #260 Sent message carbons are not displayed. [jcbrand]
|
||||||
* #262 Contact requests are not shown if page is reloaded. [jcbrand]
|
* #262 Contact requests are not shown if page is reloaded. [jcbrand]
|
||||||
* #264 Remove unnecessary commas for ie8 compatibility. [Deuteu]
|
* #264 Remove unnecessary commas for ie8 compatibility. [Deuteu]
|
||||||
* #267 Unread messages counter wrongly gets incremented by chat state notifications. [Deuteu]
|
* #267 Unread messages counter wrongly gets incremented by chat state notifications. [Deuteu]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user