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

Don't send OMEMO message when we don't have any devices for contact

Browse Source
This commit is contained in:
JC Brand 2019-03-30 16:30:48 +01:00
parent 1a2e7b235a
commit 1b08df89bb
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/converse.js vendored
View File

@ -56393,6 +56393,10 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
_converse.api.alert.show(Strophe.LogLevel.ERROR, __('Error'), err_msgs); _converse.api.alert.show(Strophe.LogLevel.ERROR, __('Error'), err_msgs);
_converse.log(e, Strophe.LogLevel.ERROR);
} else if (e.user_facing) {
_converse.api.alert.show(Strophe.LogLevel.ERROR, __('Error'), [e.message]);
_converse.log(e, Strophe.LogLevel.ERROR); _converse.log(e, Strophe.LogLevel.ERROR);
} else { } else {
throw e; throw e;
@ -56628,8 +56632,15 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
const collections = await Promise.all(chatbox.occupants.map(o => getDevicesForContact(o.get('jid')))); const collections = await Promise.all(chatbox.occupants.map(o => getDevicesForContact(o.get('jid'))));
devices = collections.reduce((a, b) => _.concat(a, b.models), []); devices = collections.reduce((a, b) => _.concat(a, b.models), []);
} else if (chatbox.get('type') === _converse.PRIVATE_CHAT_TYPE) { } else if (chatbox.get('type') === _converse.PRIVATE_CHAT_TYPE) {
const their_devices = await getDevicesForContact(chatbox.get('jid')), const their_devices = await getDevicesForContact(chatbox.get('jid'));
own_devices = _converse.devicelists.get(_converse.bare_jid).devices;
if (their_devices.length === 0) {
const err = new Error(__("Sorry, we aren't able to fetch any devices to send an OMEMO encrypted message to."));
err.user_facing = true;
throw err;
}
const own_devices = _converse.devicelists.get(_converse.bare_jid).devices;
devices = _.concat(own_devices.models, their_devices.models); devices = _.concat(own_devices.models, their_devices.models);
} }

12
src/converse-omemo.js
View File

@ -338,6 +338,9 @@ converse.plugins.add('converse-omemo', {
} }
_converse.api.alert.show(Strophe.LogLevel.ERROR, __('Error'), err_msgs); _converse.api.alert.show(Strophe.LogLevel.ERROR, __('Error'), err_msgs);
_converse.log(e, Strophe.LogLevel.ERROR); _converse.log(e, Strophe.LogLevel.ERROR);
} else if (e.user_facing) {
_converse.api.alert.show(Strophe.LogLevel.ERROR, __('Error'), [e.message]);
_converse.log(e, Strophe.LogLevel.ERROR);
} else { } else {
throw e; throw e;
} }
@ -553,8 +556,13 @@ converse.plugins.add('converse-omemo', {
const collections = await Promise.all(chatbox.occupants.map(o => getDevicesForContact(o.get('jid')))); const collections = await Promise.all(chatbox.occupants.map(o => getDevicesForContact(o.get('jid'))));
devices = collections.reduce((a, b) => _.concat(a, b.models), []); devices = collections.reduce((a, b) => _.concat(a, b.models), []);
} else if (chatbox.get('type') === _converse.PRIVATE_CHAT_TYPE) { } else if (chatbox.get('type') === _converse.PRIVATE_CHAT_TYPE) {
const their_devices = await getDevicesForContact(chatbox.get('jid')), const their_devices = await getDevicesForContact(chatbox.get('jid'));
own_devices = _converse.devicelists.get(_converse.bare_jid).devices; if (their_devices.length === 0) {
const err = new Error(__("Sorry, we aren't able to fetch any devices to send an OMEMO encrypted message to."));
err.user_facing = true;
throw err;
}
const own_devices = _converse.devicelists.get(_converse.bare_jid).devices;
devices = _.concat(own_devices.models, their_devices.models); devices = _.concat(own_devices.models, their_devices.models);
} }
await Promise.all(devices.map(d => d.getBundle())); await Promise.all(devices.map(d => d.getBundle()));