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

Fixes #1184

This commit is contained in:
JC Brand 2018-09-10 16:21:30 +02:00
parent 955f1bc80d
commit 989ce0f54d
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -1,5 +1,10 @@
# 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)
## New Features

13
dist/converse.js vendored
View File

@ -71740,11 +71740,16 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
// 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, {
body: body,
lang: _converse.locale,
icon: _converse.notification_icon
'body': body,
'lang': _converse.locale,
'icon': _converse.notification_icon
});
setTimeout(n.close.bind(n), 5000);
};

13
src/converse-notification.js
View File

@ -169,12 +169,15 @@
// the message...
const body = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, message).length ?
__('OMEMO Message received') :
message.querySelector('body').textContent;
_.get(message.querySelector('body'), 'textContent');
if (!body) {
return;
}
const n = new Notification(title, {
body: body,
lang: _converse.locale,
icon: _converse.notification_icon
});
'body': body,
'lang': _converse.locale,
'icon': _converse.notification_icon
});
setTimeout(n.close.bind(n), 5000);
};