From 05d84c25dbd8c8dd66ae1bca2a213c63906a2dc9 Mon Sep 17 00:00:00 2001 From: isymchych Date: Mon, 14 Dec 2015 18:07:49 +0200 Subject: [PATCH] propagate MESSAGE_RECEIVED event --- JitsiConference.js | 5 +++++ doc/API.md | 2 +- lib-jitsi-meet.js | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/JitsiConference.js b/JitsiConference.js index 654e40667..a8f1b05c9 100644 --- a/JitsiConference.js +++ b/JitsiConference.js @@ -499,6 +499,11 @@ function setupListeners(conference) { conference.eventEmitter.emit(JitsiConferenceEvents.SETUP_FAILED); }); + conference.room.addListener(XMPPEvents.MESSAGE_RECEIVED, function (jid, displayName, txt, myJid, ts) { + var id = Strophe.getResourceFromJid(jid); + conference.eventEmitter.emit(JitsiConferenceEvents.MESSAGE_RECEIVED, id, txt, ts); + }); + conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) { if(conference.lastActiveSpeaker !== id && conference.room) { conference.lastActiveSpeaker = id; diff --git a/doc/API.md b/doc/API.md index 5b35c11a3..2e5e5a3a7 100644 --- a/doc/API.md +++ b/doc/API.md @@ -71,7 +71,7 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR); - ACTIVE_SPEAKER_CHANGED - the active speaker is changed. (parameters - id(string)) - USER_JOINED - new user joined a conference. (parameters - id(string), user(JitsiParticipant)) - USER_LEFT - a participant left conference. (parameters - id(string), user(JitsiParticipant)) - - MESSAGE_RECEIVED - new text message received. (parameters - id(string), text(string)) + - MESSAGE_RECEIVED - new text message received. (parameters - id(string), text(string), ts(number)) - DISPLAY_NAME_CHANGED - user has changed his display name. (parameters - id(string), displayName(string)) - LAST_N_ENDPOINTS_CHANGED - last n set was changed (parameters - array of ids of users) - IN_LAST_N_CHANGED - passes boolean property that shows whether the local user is included in last n set of any other user or not. (parameters - boolean) diff --git a/lib-jitsi-meet.js b/lib-jitsi-meet.js index 415ce2224..ccd575b05 100644 --- a/lib-jitsi-meet.js +++ b/lib-jitsi-meet.js @@ -501,6 +501,11 @@ function setupListeners(conference) { conference.eventEmitter.emit(JitsiConferenceEvents.SETUP_FAILED); }); + conference.room.addListener(XMPPEvents.MESSAGE_RECEIVED, function (jid, displayName, txt, myJid, ts) { + var id = Strophe.getResourceFromJid(jid); + conference.eventEmitter.emit(JitsiConferenceEvents.MESSAGE_RECEIVED, id, txt, ts); + }); + conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) { if(conference.lastActiveSpeaker !== id && conference.room) { conference.lastActiveSpeaker = id;