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

Also show HTML5 notifications for chat state changes.

Browse Source 
updates #443
This commit is contained in:
JC Brand 2016-02-29 21:59:56 +00:00
parent 578ca540b3
commit 14c66ff755
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/converse-core.js
View File

@ -882,6 +882,7 @@
this.RosterContact = Backbone.Model.extend({
initialize: function (attributes, options) {
var jid = attributes.jid;
var bare_jid = Strophe.getBareJidFromJid(jid);
@ -903,7 +904,7 @@
this.on('destroy', function () { this.removeFromRoster(); }.bind(this));
},
subscribe: function (message) {
subscribe: function (message) {
/* Send a presence subscription request to this roster contact
*
* Parameters:
@ -1019,6 +1020,7 @@
this.RosterContacts = Backbone.Collection.extend({
model: converse.RosterContact,
comparator: function (contact1, contact2) {
var name1, name2;
var status1 = contact1.get('chat_status') || 'offline';
@ -2124,6 +2126,7 @@
this.$el.find('div.chat-event').remove();
}
}
// FIXME: multiple parameters not accepted?
converse.emit('contactStatusChanged', item.attributes, item.get('chat_status'));
},

38
src/converse-notification.js
View File

@ -23,7 +23,7 @@
"doesn't support HTML5 notifications.");
return;
}
// Ask user to enable HTML5 notifications
// Ask user to enable HTML5 notifications
Notification.requestPermission();
@ -35,11 +35,11 @@
// relevant objects or classes.
//
// New functions which don't exist yet can also be added.
notifyOfNewMessage: function ($message) {
var result = this._super.notifyOfNewMessage.apply(this, arguments);
if (result && (this.windowState === 'blur') && (Notification.permission === "granted")) {
this.showNotification($message);
this.showMessageNotification($message);
}
return result;
}
@ -51,7 +51,35 @@
*/
var converse = this.converse;
converse.showNotification = function ($message) {
converse.showChatStateNotification = function (event, contact) {
/* Show an HTML5 notification indicating that a contact changed
* their chat state.
*/
var chat_state = contact.chat_status,
message = null;
if (chat_state === 'offline') {
message = __('has gone offline');
} else if (chat_state === 'away') {
message = __('has gone away');
} else if ((chat_state === 'dnd')) {
message = __('is busy');
} else if (chat_state === 'online') {
message = __('has come online');
}
if (message === null) {
return;
}
var n = new Notification(contact.fullname, {
body: message,
lang: converse.i18n.locale_data.converse[""].lang,
icon: 'logo/conversejs.png'
});
setTimeout(n.close.bind(n), 5000);
};
converse.on('contactStatusChanged', converse.showChatStateNotification);
converse.showMessageNotification = function ($message) {
/* Show an HTML5 notification of a received message.
*/
var contact_jid = Strophe.getBareJidFromJid($message.attr('from'));
@ -61,7 +89,7 @@
lang: converse.i18n.locale_data.converse[""].lang,
icon: 'logo/conversejs.png'
});
setTimeout(n.close.bind(n), 5000);
setTimeout(n.close.bind(n), 5000);
};
}
});