Skip to content

[WIP] candy:core:message:chatstate triggerHandler #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malakada wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[WIP] candy:core:message:chatstate triggerHandler #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/core/event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,9 @@ Candy.Core.Event = (function(self, Strophe, $) {
if(msg.attr('type') === 'chat' || msg.attr('type') === 'normal') {
var from = Candy.Util.unescapeJid(msg.attr('from')),
bareFrom = Strophe.getBareJidFromJid(from),
isNoConferenceRoomJid = !Candy.Core.getRoom(bareFrom);
isNoConferenceRoomJid = !Candy.Core.getRoom(bareFrom),
fromUser = Candy.Core.getRoster().get(from);


if (isNoConferenceRoomJid) {
roomJid = bareFrom;
Expand Down Expand Up @@ -798,7 +800,7 @@ Candy.Core.Event = (function(self, Strophe, $) {
message.xhtmlMessage = xhtmlMessage;
}

self.Jabber.Room._checkForChatStateNotification(msg, roomJid, name);
self.Jabber.Room._checkForChatStateNotification(msg, roomJid, fromUser);
// Unhandled message
} else {
return true;
Expand Down Expand Up @@ -862,9 +864,10 @@ Candy.Core.Event = (function(self, Strophe, $) {
return true;
},

_checkForChatStateNotification: function (msg, roomJid, name) {
_checkForChatStateNotification: function (msg, roomJid, fromUser) {
var chatStateElements = msg.children('*[xmlns="http://jabber.org/protocol/chatstates"]');
if (chatStateElements.length > 0) {
var room = Candy.Core.getRoom(roomJid);
/** Event: candy:core:message:chatstate
* Triggers on any recieved chatstate notification.
*
Expand All @@ -874,13 +877,13 @@ Candy.Core.Event = (function(self, Strophe, $) {
*
* Message Object Parameters:
* (String) name - User name
* (String) roomJid - Room jid
* (Candy.Core.Chatroom) room - Room jid
* (String) chatstate - Chatstate being indicated. ("active", "composing", "paused", "inactive", "gone")
*
*/
$(Candy).triggerHandler('candy:core:message:chatstate', {
name: name,
roomJid: roomJid,
name: fromUser.getNick(),
room: room,
chatstate: chatStateElements[0].tagName
});
}
Expand Down