[2.3] Clear missing collections on meeting end

bigbluebutton-html5/imports/api/guest-users/server/modifiers/clearGuestUsers.js

@@ -0,0 +1,26 @@
+import GuestUsers from '/imports/api/guest-users';
+import Logger from '/imports/startup/server/logger';
+
+export default function clearGuestUsers(meetingId) {
+  if (meetingId) {
+    try {
+      const numberAffected = GuestUsers.remove({ meetingId });
+
+      if (numberAffected) {
+        Logger.info(`Cleared GuestUsers in (${meetingId})`);
+      }
+    } catch (err) {
+      Logger.info(`Error on clearing GuestUsers in (${meetingId}). ${err}`);
+    }
+  } else {
+    try {
+      const numberAffected = GuestUsers.remove({});
+
+      if (numberAffected) {
+        Logger.info('Cleared GuestUsers in all meetings');
+      }
+    } catch (err) {
+      Logger.error(`Error on clearing GuestUsers in all meetings. ${err}`);
+    }
+  }
+}

bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingTimeRemaining.js

@@ -0,0 +1,26 @@
+import { MeetingTimeRemaining } from '/imports/api/meetings';
+import Logger from '/imports/startup/server/logger';
+
+export default function clearMeetingTimeRemaining(meetingId) {
+  if (meetingId) {
+    try {
+      const numberAffected = MeetingTimeRemaining.remove({ meetingId });
+
+      if (numberAffected) {
+        Logger.info(`Cleared MeetingTimeRemaining in (${meetingId})`);
+      }
+    } catch (err) {
+      Logger.info(`Error on clearing MeetingTimeRemaining in (${meetingId}). ${err}`);
+    }
+  } else {
+    try {
+      const numberAffected = MeetingTimeRemaining.remove({});
+
+      if (numberAffected) {
+        Logger.info('Cleared MeetingTimeRemaining in all meetings');
+      }
+    } catch (err) {
+      Logger.error(`Error on clearing MeetingTimeRemaining in all meetings. ${err}`);
+    }
+  }
+}

bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js

@@ -8,6 +8,7 @@ import { removeCursorStreamer } from '/imports/api/cursor/server/streamer';
 import clearUsers from '/imports/api/users/server/modifiers/clearUsers';
 import clearUsersSettings from '/imports/api/users-settings/server/modifiers/clearUsersSettings';
 import clearGroupChat from '/imports/api/group-chat/server/modifiers/clearGroupChat';
+import clearGuestUsers from '/imports/api/guest-users/server/modifiers/clearGuestUsers';
 import clearBreakouts from '/imports/api/breakouts/server/modifiers/clearBreakouts';
 import clearAnnotations from '/imports/api/annotations/server/modifiers/clearAnnotations';
 import clearSlides from '/imports/api/slides/server/modifiers/clearSlides';
@@ -17,13 +18,16 @@ import clearPresentationPods from '/imports/api/presentation-pods/server/modifie
 import clearVoiceUsers from '/imports/api/voice-users/server/modifiers/clearVoiceUsers';
 import clearUserInfo from '/imports/api/users-infos/server/modifiers/clearUserInfo';
 import clearConnectionStatus from '/imports/api/connection-status/server/modifiers/clearConnectionStatus';
+import clearScreenshare from '/imports/api/screenshare/server/modifiers/clearScreenshare';
 import clearNote from '/imports/api/note/server/modifiers/clearNote';
 import clearNetworkInformation from '/imports/api/network-information/server/modifiers/clearNetworkInformation';
+import clearMeetingTimeRemaining from '/imports/api/meetings/server/modifiers/clearMeetingTimeRemaining';
 import clearLocalSettings from '/imports/api/local-settings/server/modifiers/clearLocalSettings';
 import clearRecordMeeting from './clearRecordMeeting';
 import clearVoiceCallStates from '/imports/api/voice-call-states/server/modifiers/clearVoiceCallStates';
 import clearVideoStreams from '/imports/api/video-streams/server/modifiers/clearVideoStreams';
 import clearAuthTokenValidation from '/imports/api/auth-token-validation/server/modifiers/clearAuthTokenValidation';
+import clearWhiteboardMultiUser from '/imports/api/whiteboard-multi-user/server/modifiers/clearWhiteboardMultiUser';
 import Metrics from '/imports/startup/server/metrics';
 
 export default function meetingHasEnded(meetingId) {
@@ -33,6 +37,7 @@ export default function meetingHasEnded(meetingId) {
   return Meetings.remove({ meetingId }, () => {
     clearCaptions(meetingId);
     clearGroupChat(meetingId);
+    clearGuestUsers(meetingId);
     clearPresentationPods(meetingId);
     clearBreakouts(meetingId);
     clearPolls(meetingId);
@@ -46,10 +51,13 @@ export default function meetingHasEnded(meetingId) {
     clearNote(meetingId);
     clearNetworkInformation(meetingId);
     clearLocalSettings(meetingId);
+    clearMeetingTimeRemaining(meetingId);
     clearRecordMeeting(meetingId);
     clearVoiceCallStates(meetingId);
     clearVideoStreams(meetingId);
     clearAuthTokenValidation(meetingId);
+    clearWhiteboardMultiUser(meetingId);
+    clearScreenshare(meetingId);
     BannedUsers.delete(meetingId);
     Metrics.removeMeeting(meetingId);
 

bigbluebutton-html5/imports/api/screenshare/server/modifiers/clearScreenshare.js

@@ -7,6 +7,8 @@ export default function clearScreenshare(meetingId, screenshareConf) {
 
     if (meetingId && screenshareConf) {
       numberAffected = Screenshare.remove({ meetingId, 'screenshare.screenshareConf': screenshareConf });
+    } else if (meetingId) {
+      numberAffected = Screenshare.remove({ meetingId });
     } else {
       numberAffected = Screenshare.remove({});
     }

bigbluebutton-html5/imports/api/voice-call-states/server/modifiers/clearVoiceCallStates.js

@@ -1,5 +1,5 @@
 import Logger from '/imports/startup/server/logger';
-import VoiceCallStates from '/imports/api/voice-users';
+import VoiceCallStates from '/imports/api/voice-call-states';
 
 export default function clearVoiceCallStates(meetingId) {
   if (meetingId) {

bigbluebutton-html5/imports/api/whiteboard-multi-user/server/modifiers/clearWhiteboardMultiUser.js

@@ -0,0 +1,26 @@
+import Logger from '/imports/startup/server/logger';
+import WhiteboardMultiUser from '/imports/api/whiteboard-multi-user';
+
+export default function clearWhiteboardMultiUser(meetingId) {
+  if (meetingId) {
+    try {
+      const numberAffected = WhiteboardMultiUser.remove({ meetingId });
+
+      if (numberAffected) {
+        Logger.info(`Cleared WhiteboardMultiUser (${meetingId})`);
+      }
+    } catch (err) {
+      Logger.info(`Error clearing WhiteboardMultiUser (${meetingId}). ${err}`);
+    }
+  } else {
+    try {
+      const numberAffected = WhiteboardMultiUser.remove({});
+
+      if (numberAffected) {
+        Logger.info('Cleared WhiteboardMultiUser (all)');
+      }
+    } catch (err) {
+      Logger.info(`Error clearing WhiteboardMultiUser (all). ${err}`);
+    }
+  }
+}