From 2fb8296ff071abea050238ac6fbf7a3e8787f32c Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Wed, 26 Aug 2015 18:51:05 +0100
Subject: [PATCH] - Fixed emojiStatus not set correctly in server. - Upgraded
bbb-common-message version.
---
akka-bbb-apps/build.sbt | 4 ++--
.../scala/org/bigbluebutton/core/BigBlueButtonInGW.scala | 1 -
.../main/scala/org/bigbluebutton/core/apps/UsersApp.scala | 2 +-
bbb-common-message/build.sbt | 2 +-
bigbluebutton-apps/build.gradle | 2 +-
.../bigbluebutton/red5/client/UserClientMessageSender.java | 5 +++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt
index 3409c0ecd8..f1b50c3571 100755
--- a/akka-bbb-apps/build.sbt
+++ b/akka-bbb-apps/build.sbt
@@ -4,7 +4,7 @@ name := "bbb-apps-akka"
organization := "org.bigbluebutton"
-version := "0.0.1"
+version := "0.0.2"
scalaVersion := "2.11.6"
@@ -50,7 +50,7 @@ libraryDependencies ++= {
"com.google.code.gson" % "gson" % "1.7.1",
"redis.clients" % "jedis" % "2.7.2",
"org.apache.commons" % "commons-lang3" % "3.2",
- "org.bigbluebutton" % "bbb-common-message" % "0.0.13"
+ "org.bigbluebutton" % "bbb-common-message" % "0.0.14"
)}
seq(Revolver.settings: _*)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
index 0358965723..b6f73d30c2 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
@@ -18,7 +18,6 @@ import org.bigbluebutton.core.service.recorder.RecorderApplication
import org.bigbluebutton.common.messages.IBigBlueButtonMessage
import org.bigbluebutton.common.messages.StartCustomPollRequestMessage
import org.bigbluebutton.common.messages.PubSubPingMessage
-import org.bigbluebutton.core.api.UserEmojiStatus
class BigBlueButtonInGW(val system: ActorSystem, recorderApp: RecorderApplication, messageSender: MessageSender, voiceEventRecorder: VoiceEventRecorder) extends IBigBlueButtonInGW {
val log = system.log
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
index 65ba73d4a1..cf58fbd607 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
@@ -209,7 +209,7 @@ trait UsersApp {
usersModel.getUser(msg.userId) foreach { user =>
val uvo = user.copy()
usersModel.addUser(uvo)
- outGW.send(new UserChangedEmojiStatus(mProps.meetingID, mProps.recorded, uvo.emojiStatus, uvo.userID))
+ outGW.send(new UserChangedEmojiStatus(mProps.meetingID, mProps.recorded, msg.emojiStatus, uvo.userID))
}
}
diff --git a/bbb-common-message/build.sbt b/bbb-common-message/build.sbt
index 6d78d92b26..f0beb53546 100755
--- a/bbb-common-message/build.sbt
+++ b/bbb-common-message/build.sbt
@@ -4,7 +4,7 @@ name := "bbb-common-message"
organization := "org.bigbluebutton"
-version := "0.0.13"
+version := "0.0.14"
// We want to have our jar files in lib_managed dir.
// This way we'll have the right path when we import
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index fc6a8dfd7a..e34754a7c3 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -105,7 +105,7 @@ dependencies {
compile 'com.google.code.gson:gson:1.7.1'
providedCompile 'org.apache.commons:commons-lang3:3.2'
- compile 'org.bigbluebutton:bbb-common-message:0.0.13'
+ compile 'org.bigbluebutton:bbb-common-message:0.0.14'
}
test {
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
index 250aad86ee..232cea9fb4 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
@@ -291,7 +291,8 @@ public class UserClientMessageSender {
private void processUserEmojiStatusMessage(UserEmojiStatusMessage msg) {
Map<String, Object> args = new HashMap<String, Object>();
args.put("userId", msg.userId);
-
+ args.put("emojiStatus", msg.emojiStatus);
+
Map<String, Object> message = new HashMap<String, Object>();
Gson gson = new Gson();
message.put("msg", gson.toJson(args));
@@ -303,7 +304,7 @@ public class UserClientMessageSender {
private void processUserListeningOnlyMessage(UserListeningOnlyMessage msg) {
Map<String, Object> args = new HashMap<String, Object>();
args.put("userId", msg.userId);
- args.put("listenOnly", msg.listenOnly);
+ args.put("listenOnly", msg.listenOnly);
Map<String, Object> message = new HashMap<String, Object>();
Gson gson = new Gson();
--
GitLab