BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set dial-in clientType in html5 client

Browse Source
This commit is contained in:
Anton Georgiev 2018-06-26 20:50:03 +00:00
parent e2e83e08df
commit 79329d036a
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
View File

@ -604,7 +604,7 @@ public class MeetingService implements MessageListener {
logData.put("waitingForAcceptance", user.isWaitingForAcceptance()); logData.put("waitingForAcceptance", user.isWaitingForAcceptance());
logData.put("event", "user_joined_message"); logData.put("event", "user_joined_message");
logData.put("description", "User joined the meeting."); logData.put("description", "User joined the meeting.");
logData.put("clientType", "unknown"); logData.put("clientType", user.getClientType());
Gson gson = new Gson(); Gson gson = new Gson();
String logStr = gson.toJson(logData); String logStr = gson.toJson(logData);
@ -740,7 +740,7 @@ public class MeetingService implements MessageListener {
if (message.userId.startsWith("v_")) { if (message.userId.startsWith("v_")) {
// A dial-in user joined the meeting. Dial-in users by convention has userId that starts with "v_". // A dial-in user joined the meeting. Dial-in users by convention has userId that starts with "v_".
User vuser = new User(message.userId, message.userId, User vuser = new User(message.userId, message.userId,
message.name, "DIAL-IN-USER", "no-avatar-url", true, false, "dial-in"); message.name, "DIAL-IN-USER", "no-avatar-url", true, false, "DIAL-IN");
vuser.setVoiceJoined(true); vuser.setVoiceJoined(true);
m.userJoined(vuser); m.userJoined(vuser);
} }

1
bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
View File

@ -88,7 +88,6 @@ export default function addUser(meetingId, user) {
listenOnly: false, listenOnly: false,
voiceConf: '', voiceConf: '',
joined: false, joined: false,
clientType: 'dial-in__2',
}); });
const cb = (err, numChanged) => { const cb = (err, numChanged) => {

4
bigbluebutton-html5/imports/api/voice-users/server/handlers/joinVoiceUser.js
View File

@ -38,7 +38,7 @@ export default function handleJoinVoiceUser({ body }, meetingId) {
const USER_CONFIG = Meteor.settings.public.user; const USER_CONFIG = Meteor.settings.public.user;
const ROLE_VIEWER = USER_CONFIG.role_viewer; const ROLE_VIEWER = USER_CONFIG.role_viewer;
const modifier = { const modifier = { // web (Users) representation of dial-in user
$set: { $set: {
meetingId, meetingId,
connectionStatus: 'online', connectionStatus: 'online',
@ -56,7 +56,7 @@ export default function handleJoinVoiceUser({ body }, meetingId) {
presenter: false, presenter: false,
locked: false, // TODO locked: false, // TODO
avatar: '', avatar: '',
clientType: 'dial-in__1', clientType: 'dial-in-user',
}, },
}; };

1
bigbluebutton-html5/imports/api/voice-users/server/modifiers/addVoiceUser.js
View File

@ -16,7 +16,6 @@ export default function addVoiceUser(meetingId, voiceUser) {
listenOnly: Boolean, listenOnly: Boolean,
voiceConf: String, voiceConf: String,
joined: Boolean, // This is a HTML5 only param. joined: Boolean, // This is a HTML5 only param.
clientType: String,
}); });
const { intId } = voiceUser; const { intId } = voiceUser;