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

Bugfix. getAttribute returns null

Browse Source
This commit is contained in:
JC Brand 2017-02-25 09:33:34 +01:00
parent 2998ef818a
commit 2c8b31c19d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils.js
View File

@ -246,15 +246,16 @@
isHeadlineMessage: function (message) { isHeadlineMessage: function (message) {
var from_jid = message.getAttribute('from'); var from_jid = message.getAttribute('from');
if (message.getAttribute('type') === 'headline' || if (message.getAttribute('type') === 'headline') {
return true;
}
if (message.getAttribute('type') !== 'error' &&
!_.isNil(from_jid) &&
!_.includes(from_jid, '@')) {
// Some servers (I'm looking at you Prosody) don't set the message // Some servers (I'm looking at you Prosody) don't set the message
// type to "headline" when sending server messages. For now we // type to "headline" when sending server messages. For now we
// check if an @ signal is included, and if not, we assume it's // check if an @ signal is included, and if not, we assume it's
// a headline message. // a headline message.
( message.getAttribute('type') !== 'error' &&
!_.isUndefined(from_jid) &&
!_.includes(from_jid, '@')
)) {
return true; return true;
} }
return false; return false;