Commit 989ce0f5 authored by JC Brand's avatar JC Brand

Fixes #1184

parent 955f1bc8
# Changelog # Changelog
## 4.0.1 (Unreleased)
- #1182 MUC occupants without nick or JID created
- #1184 Notification error when message has no body
## 4.0.0 (2018-09-07) ## 4.0.0 (2018-09-07)
## New Features ## New Features
......
...@@ -71740,11 +71740,16 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -71740,11 +71740,16 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
// the message... // the message...
const body = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, message).length ? __('OMEMO Message received') : message.querySelector('body').textContent; const body = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, message).length ? __('OMEMO Message received') : _.get(message.querySelector('body'), 'textContent');
if (!body) {
return;
}
const n = new Notification(title, { const n = new Notification(title, {
body: body, 'body': body,
lang: _converse.locale, 'lang': _converse.locale,
icon: _converse.notification_icon 'icon': _converse.notification_icon
}); });
setTimeout(n.close.bind(n), 5000); setTimeout(n.close.bind(n), 5000);
}; };
...@@ -169,12 +169,15 @@ ...@@ -169,12 +169,15 @@
// the message... // the message...
const body = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, message).length ? const body = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, message).length ?
__('OMEMO Message received') : __('OMEMO Message received') :
message.querySelector('body').textContent; _.get(message.querySelector('body'), 'textContent');
if (!body) {
return;
}
const n = new Notification(title, { const n = new Notification(title, {
body: body, 'body': body,
lang: _converse.locale, 'lang': _converse.locale,
icon: _converse.notification_icon 'icon': _converse.notification_icon
}); });
setTimeout(n.close.bind(n), 5000); setTimeout(n.close.bind(n), 5000);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment