parent
e29849fe5e
commit
bce8dc9113
|
@ -7,6 +7,7 @@
|
||||||
- #1712: `TypeError: plugin._features is not a function`
|
- #1712: `TypeError: plugin._features is not a function`
|
||||||
- Bugfix: process stanzas from mam one-by-one in order to correctly process message
|
- Bugfix: process stanzas from mam one-by-one in order to correctly process message
|
||||||
receipts
|
receipts
|
||||||
|
- #1714 Bugfix: Don't notify the user in case we're receiving a message delivery receipt only
|
||||||
|
|
||||||
## 5.0.3 (2019-09-13)
|
## 5.0.3 (2019-09-13)
|
||||||
|
|
||||||
|
|
|
@ -87,6 +87,7 @@ converse.plugins.add('converse-notification', {
|
||||||
}
|
}
|
||||||
const is_me = Strophe.getBareJidFromJid(message.getAttribute('from')) === _converse.bare_jid;
|
const is_me = Strophe.getBareJidFromJid(message.getAttribute('from')) === _converse.bare_jid;
|
||||||
return !u.isOnlyChatStateNotification(message) &&
|
return !u.isOnlyChatStateNotification(message) &&
|
||||||
|
!u.isOnlyMessageDeliveryReceipt(message) &&
|
||||||
!is_me &&
|
!is_me &&
|
||||||
(_converse.show_desktop_notifications === 'all' || _converse.isMessageToHiddenChat(message));
|
(_converse.show_desktop_notifications === 'all' || _converse.isMessageToHiddenChat(message));
|
||||||
};
|
};
|
||||||
|
|
|
@ -148,6 +148,18 @@ u.isOnlyChatStateNotification = function (msg) {
|
||||||
return msg['chat_state'] && u.isEmptyMessage(msg);
|
return msg['chat_state'] && u.isEmptyMessage(msg);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
u.isOnlyMessageDeliveryReceipt = function (msg) {
|
||||||
|
if (msg instanceof Element) {
|
||||||
|
// See XEP-0184 Message Delivery Receipts
|
||||||
|
return (msg.querySelector('body') === null) &&
|
||||||
|
(msg.querySelector('received') !== null);
|
||||||
|
}
|
||||||
|
if (msg instanceof Backbone.Model) {
|
||||||
|
msg = msg.attributes;
|
||||||
|
}
|
||||||
|
return msg['received'] && u.isEmptyMessage(msg);
|
||||||
|
};
|
||||||
|
|
||||||
u.isHeadlineMessage = function (_converse, message) {
|
u.isHeadlineMessage = function (_converse, message) {
|
||||||
const from_jid = message.getAttribute('from');
|
const from_jid = message.getAttribute('from');
|
||||||
if (message.getAttribute('type') === 'headline') {
|
if (message.getAttribute('type') === 'headline') {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user