From 3b2e5369729ffc62bd951a4381ad78d34696a5f4 Mon Sep 17 00:00:00 2001
From: bobakoftadeh <bobakoftadeh@outlook.com>
Date: Thu, 14 Feb 2019 19:16:15 +0000
Subject: [PATCH] Fix clear chat bug

---
 .../server/modifiers/clearGroupChatMsg.js     | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js b/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
index 172a200f3a..3c7ee643f0 100644
--- a/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
+++ b/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
@@ -9,21 +9,19 @@ export default function clearGroupChatMsg(meetingId, chatId) {
   const CHAT_CLEAR_MESSAGE = CHAT_CONFIG.system_messages_keys.chat_clear;
 
   if (chatId) {
-    GroupChatMsg.remove({ meetingId, chatId }, () => {
-      Logger.info(`Cleared GroupChatMsg (${meetingId}, ${chatId})`);
-      const clearMsg = {
-        color: '0',
-        timestamp: Date.now(),
-        correlationId: `${PUBLIC_CHAT_SYSTEM_ID}-${Date.now()}`,
-        sender: {
-          id: PUBLIC_CHAT_SYSTEM_ID,
-          name: '',
-        },
-        message: CHAT_CLEAR_MESSAGE,
-      };
-
-      return addGroupChatMsg(meetingId, PUBLIC_GROUP_CHAT_ID, clearMsg);
-    });
+    GroupChatMsg.remove({ meetingId, chatId });
+    Logger.info(`Cleared GroupChatMsg (${meetingId}, ${chatId})`);
+    const clearMsg = {
+      color: '0',
+      timestamp: Date.now(),
+      correlationId: `${PUBLIC_CHAT_SYSTEM_ID}-${Date.now()}`,
+      sender: {
+        id: PUBLIC_CHAT_SYSTEM_ID,
+        name: '',
+      },
+      message: CHAT_CLEAR_MESSAGE,
+    };
+    return addGroupChatMsg(meetingId, PUBLIC_GROUP_CHAT_ID, clearMsg);
   }
 
   if (meetingId) {
-- 
GitLab