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

Fix multiple welcome messages, issue #3792 HTML5

Browse Source
This commit is contained in:
Klaus Klein 2017-04-10 09:55:22 -03:00
parent 70a674bc79
commit 6727f14ab7
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bigbluebutton-html5/imports/api/chat/server/modifiers/removeChat.js Executable file
View File

@ -0,0 +1,20 @@
import Chat from '/imports/api/chat';
import Logger from '/imports/startup/server/logger';
import { check } from 'meteor/check';
import { BREAK_LINE } from '/imports/utils/lineEndings.js';
/**
* Remove from chat a message that match the regex 'message' param.
*
* @param {string} meetingId
* @param {string} userId
* @param {string} message
*/
export default function removeChat(meetingId, userId, message) {
if (meetingId && userId && message) {
const modifiers = { meetingId: meetingId, "message.to_userid": userId ,"message.message":{ '$regex': message, '$options': 'i' }};
return Chat.remove(modifiers
, Logger.info(`Removing messages that match: (${message}) `));
}
};

17
bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
View File

@ -4,6 +4,7 @@ import Meetings from '/imports/api/meetings';
import Users from '/imports/api/users';
import addChat from '/imports/api/chat/server/modifiers/addChat';
import removeChat from '/imports/api/chat/server/modifiers/removeChat';
export default function handleValidateAuthToken({ payload }) {
const meetingId = payload.meeting_id;
@ -40,6 +41,7 @@ export default function handleValidateAuthToken({ payload }) {
if (numChanged) {
if (validStatus) {
clearPastWelcomeMessage(meetingId, userId);
addWelcomeChatMessage(meetingId, userId);
}
@ -50,6 +52,17 @@ export default function handleValidateAuthToken({ payload }) {
return Users.update(selector, modifier, cb);
};
/**
* Prevent the chat message having multiple welcome message showing to user, removing the past ones.
* @param {string} meetingId
* @param {string} userId
*/
const clearPastWelcomeMessage = (meetingId, userId) => {
const APP_CONFIG = Meteor.settings.public.app;
return removeChat(meetingId, userId,APP_CONFIG.defaultWelcomeMessageFooter);
};
const addWelcomeChatMessage = (meetingId, userId) => {
const APP_CONFIG = Meteor.settings.public.app;
const CHAT_CONFIG = Meteor.settings.public.chat;
@ -57,8 +70,8 @@ const addWelcomeChatMessage = (meetingId, userId) => {
const Meeting = Meetings.findOne({ meetingId });
let welcomeMessage = APP_CONFIG.defaultWelcomeMessage
.concat(APP_CONFIG.defaultWelcomeMessageFooter)
.replace(/%%CONFNAME%%/, Meeting.meetingName);
.concat(APP_CONFIG.defaultWelcomeMessageFooter)
.replace(/%%CONFNAME%%/, Meeting.meetingName);
const message = {
chat_type: CHAT_CONFIG.type_system,