diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java index cb54de3b4b667c53c97f4f5ca0d15e8caca6294f..7e6a0258b97a2f1103c2c9c2dd79d074354b58fa 100644 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java @@ -56,6 +56,4 @@ public class MessagingConstants { public static final String SEND_PUBLIC_CHAT_MESSAGE_REQUEST = "send_public_chat_message_request"; public static final String SEND_PRIVATE_CHAT_MESSAGE_REQUEST = "send_private_chat_message_request"; public static final String MUTE_USER_REQUEST = "mute_user_request"; - public static final String USER_CONNECTED_TO_GLOBAL_AUDIO = "user_connected_to_global_audio"; - public static final String USER_DISCONNECTED_FROM_GLOBAL_AUDIO = "user_disconnected_from_global_audio"; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceMessageListener.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceMessageListener.java index 344697af303343303153385ceb0702e63149b0e6..35be1ab2f4a44ecb18799b75eb1a18838040a1d2 100644 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceMessageListener.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceMessageListener.java @@ -45,24 +45,6 @@ public class VoiceMessageListener implements MessageHandler{ System.out.println("handling user_left_voice_request"); bbbGW.voiceUserLeft(meetingID, userID); } - else if (eventName.equalsIgnoreCase(MessagingConstants.USER_CONNECTED_TO_GLOBAL_AUDIO)){ - - // String meetingID = payloadObject.get("meeting_id").toString().replace("\"", ""); - String userID = payloadObject.get("userid").toString().replace("\"", ""); - String voiceConf = payloadObject.get("voiceConf").toString().replace("\"", ""); - String userName = payloadObject.get("name").toString().replace("\"", ""); - - bbbGW.userConnectedToGlobalAudio(voiceConf, userID, userName); - } - else if (eventName.equalsIgnoreCase(MessagingConstants.USER_DISCONNECTED_FROM_GLOBAL_AUDIO)){ - - // String meetingID = payloadObject.get("meeting_id").toString().replace("\"", ""); - String userID = payloadObject.get("userid").toString().replace("\"", ""); - String voiceConf = payloadObject.get("voiceConf").toString().replace("\"", ""); - String userName = payloadObject.get("name").toString().replace("\"", ""); - - bbbGW.userDisconnectedFromGlobalAudio(voiceConf, userID, userName); - } } } } diff --git a/bigbluebutton-html5/app/server/collection_methods/users.coffee b/bigbluebutton-html5/app/server/collection_methods/users.coffee index 4b415f7156c2fd4aa001a62e7df611dab8b5cb18..5e636883642717e8eaba5a7f571703a9ecd70ee5 100755 --- a/bigbluebutton-html5/app/server/collection_methods/users.coffee +++ b/bigbluebutton-html5/app/server/collection_methods/users.coffee @@ -19,7 +19,7 @@ Meteor.methods payload: userid: userId meeting_id: meetingId - voiceConf: voiceConf + voice_conf: voiceConf name: username header: timestamp: new Date().getTime() @@ -28,7 +28,7 @@ Meteor.methods Meteor.log.info "publishing a user listenOnly toggleRequest #{isJoining} request for #{userId}" - publish Meteor.config.redis.channels.toBBBApps.voice, message + publish Meteor.config.redis.channels.toBBBApps.meeting, message else if isAllowedTo('leaveListenOnly', meetingId, userId, authToken) @@ -36,7 +36,7 @@ Meteor.methods payload: userid: userId meeting_id: meetingId - voiceConf: voiceConf + voice_conf: voiceConf name: username header: timestamp: new Date().getTime() @@ -45,7 +45,7 @@ Meteor.methods Meteor.log.info "publishing a user listenOnly toggleRequest #{isJoining} request for #{userId}" - publish Meteor.config.redis.channels.toBBBApps.voice, message + publish Meteor.config.redis.channels.toBBBApps.meeting, message return