From 3ff065aa5cf47484a2f16485f43d4db4b1978f4f Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Tue, 27 Apr 2021 11:57:53 -0300
Subject: [PATCH] Fix messages load stuck

---
 .../server/methods/chatMessageBeforeJoinCounter.js        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/group-chat-msg/server/methods/chatMessageBeforeJoinCounter.js b/bigbluebutton-html5/imports/api/group-chat-msg/server/methods/chatMessageBeforeJoinCounter.js
index 175eee0cdb..5f502a9d33 100644
--- a/bigbluebutton-html5/imports/api/group-chat-msg/server/methods/chatMessageBeforeJoinCounter.js
+++ b/bigbluebutton-html5/imports/api/group-chat-msg/server/methods/chatMessageBeforeJoinCounter.js
@@ -24,11 +24,15 @@ export default function chatMessageBeforeJoinCounter() {
   const User = Users.findOne({ userId: requesterUserId, meetingId });
 
   const chatIdWithCounter = groupChats.map((groupChat) => {
-    const msgCount = GroupChatMsg.find({ chatId: groupChat.chatId, timestamp: { $lt: User.authTokenValidatedTime } }).count();
+    const msgCount = GroupChatMsg.find({
+      meetingId,
+      chatId: groupChat.chatId,
+      timestamp: { $lt: User.authTokenValidatedTime },
+    }).count();
     return {
       chatId: groupChat.chatId,
       count: msgCount,
     };
-  }).filter(chat => chat.count);
+  }).filter((chat) => chat.count);
   return chatIdWithCounter;
 }
-- 
GitLab