Prevent a case where voiceUser collection was being clean for entire server

bigbluebutton-html5/imports/api/annotations/server/modifiers/clearAnnotations.js

@@ -21,15 +21,18 @@ export default function clearAnnotations(meetingId, whiteboardId, userId) {
 
     if (numberAffected) {
       if (userId) {
-        return Logger.info(`Cleared Annotations for userId=${userId} where whiteboard=${whiteboardId}`);
+        Logger.info(`Cleared Annotations for userId=${userId} where whiteboard=${whiteboardId}`);]
+        return;
       }
 
       if (whiteboardId) {
-        return Logger.info(`Cleared Annotations for whiteboard=${whiteboardId}`);
+        Logger.info(`Cleared Annotations for whiteboard=${whiteboardId}`);
+        return
       }
 
       if (meetingId) {
-        return Logger.info(`Cleared Annotations (${meetingId})`);
+        Logger.info(`Cleared Annotations (${meetingId})`);
+        return
       }
 
       Logger.info('Cleared Annotations (all)');

bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js

@@ -13,7 +13,10 @@ export default function createBreakoutRoom(rooms, durationInMinutes, record = fa
   const { meetingId, requesterUserId } = extractCredentials(this.userId);
 
   const eventName = 'CreateBreakoutRoomsCmdMsg';
-  if (rooms.length > MAX_BREAKOUT_ROOMS) return Logger.info(`Attempt to create breakout rooms with invalid number of rooms in meeting id=${meetingId}`);
+  if (rooms.length > MAX_BREAKOUT_ROOMS) {
+    Logger.info(`Attempt to create breakout rooms with invalid number of rooms in meeting id=${meetingId}`);
+    return;
+  }
   const payload = {
     record,
     durationInMinutes,

bigbluebutton-html5/imports/api/captions/server/methods/editCaptions.js

@@ -16,7 +16,11 @@ export default function editCaptions(padId, data) {
 
   const pad = Captions.findOne({ padId });
 
-  if (!pad) return Logger.error(`Editing captions history: ${padId}`);
+  if (!pad) {
+    Logger.error(`Editing captions history: ${padId}`);
+    return;
+  }
+
 
   const {
     meetingId,

bigbluebutton-html5/imports/api/captions/server/methods/updateOwner.js

@@ -15,7 +15,10 @@ export default function editCaptions(meetingId, userId, padId) { // TODO
 
   const pad = Captions.findOne({ meetingId, padId });
 
-  if (!pad) return Logger.error(`Editing captions owner: ${padId}`);
+  if (!pad) {
+    Logger.error(`Editing captions owner: ${padId}`);
+    return;
+  }
 
   const { locale } = pad;
 

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

@@ -47,6 +47,7 @@ export default function meetingHasEnded(meetingId) {
     clearVideoStreams(meetingId);
     BannedUsers.delete(meetingId);
 
-    return Logger.info(`Cleared Meetings with id ${meetingId}`);
+    Logger.info(`Cleared Meetings with id ${meetingId}`);
+    return;
   });
 }

bigbluebutton-html5/imports/api/presentations/server/modifiers/setCurrentPresentation.js

@@ -18,10 +18,12 @@ export default function setCurrentPresentation(meetingId, podId, presentationId)
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Unsetting the current presentation: ${err}`);
+        Logger.error(`Unsetting the current presentation: ${err}`);
+        return;
       }
 
-      return Logger.info('Unsetted as current presentation');
+      Logger.info('Unsetted as current presentation');
+      return;
     },
   };
 
@@ -36,10 +38,12 @@ export default function setCurrentPresentation(meetingId, podId, presentationId)
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Setting as current presentation id=${presentationId}: ${err}`);
+        Logger.error(`Setting as current presentation id=${presentationId}: ${err}`);
+        return;
       }
 
-      return Logger.info(`Setted as current presentation id=${presentationId}`);
+      Logger.info(`Setted as current presentation id=${presentationId}`);
+      return;
     },
   };
 

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

@@ -24,6 +24,6 @@ export default function addScreenshare(meetingId, body) {
       Logger.info(`Upserted screenshare id=${body.screenshareConf}`);
     }
   } catch (err) {
-    return Logger.error(`Adding screenshare to collection: ${err}`);
+    Logger.error(`Adding screenshare to collection: ${err}`);
   }
 }

bigbluebutton-html5/imports/api/slides/server/modifiers/changeCurrentSlide.js

@@ -20,10 +20,12 @@ export default function changeCurrentSlide(meetingId, podId, presentationId, sli
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Unsetting the current slide: ${err}`);
+        Logger.error(`Unsetting the current slide: ${err}`);
+        return;
       }
 
-      return Logger.info('Unsetted the current slide');
+      Logger.info('Unsetted the current slide');
+      return;
     },
   };
 
@@ -39,10 +41,12 @@ export default function changeCurrentSlide(meetingId, podId, presentationId, sli
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Setting as current slide id=${slideId}: ${err}`);
+        Logger.error(`Setting as current slide id=${slideId}: ${err}`);
+        return;
       }
 
-      return Logger.info(`Setted as current slide id=${slideId}`);
+      Logger.info(`Setted as current slide id=${slideId}`);
+      return;
     },
   };
 

bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesPresentation.js

@@ -25,6 +25,7 @@ export default function clearSlidesPresentation(meetingId, presentationId) {
       Logger.info(`Removed Slides where presentationId=${presentationId}`);
     }
   } catch (err) {
-    return Logger.error(`Removing Slides from collection: ${err}`);
+    Logger.error(`Removing Slides from collection: ${err}`);
+    return;
   }
 }

bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js

@@ -19,7 +19,8 @@ export default function userLeaving(meetingId, userId, connectionId) {
   const User = Users.findOne(selector);
 
   if (!User) {
-    return Logger.info(`Skipping userLeaving. Could not find ${userId} in ${meetingId}`);
+    Logger.info(`Skipping userLeaving. Could not find ${userId} in ${meetingId}`);
+    return;
   }
 
   // If the current user connection is not the same that triggered the leave we skip

bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js

@@ -50,7 +50,8 @@ export default function removeUser(meetingId, userId) {
 
       clearUserInfoForRequester(meetingId, userId);
 
-      return Logger.info(`Removed user id=${userId} meeting=${meetingId}`);
+      Logger.info(`Removed user id=${userId} meeting=${meetingId}`);
+      return;
     }
   } catch (err) {
     Logger.error(`Removing user from collection: ${err}`);

bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js

@@ -7,20 +7,20 @@ export default function clearVoiceUser(meetingId) {
       const numberAffected = VoiceUsers.remove({ meetingId });
 
       if (numberAffected) {
-        return Logger.info(`Cleared VoiceUsers in (${meetingId})`);
+        Logger.info(`Cleared VoiceUsers in (${meetingId})`);
       }
     } catch (err) {
-      return Logger.error(`Error on clearing VoiceUsers in ${meetingId}. ${err}`);
+      Logger.error(`Error on clearing VoiceUsers in ${meetingId}. ${err}`);
     }
-  }
-
-  try {
-    const numberAffected = VoiceUsers.remove({});
+  } else {
+    try {
+      const numberAffected = VoiceUsers.remove({});
 
-    if (numberAffected) {
-      return Logger.info('Cleared VoiceUsers in all meetings');
+      if (numberAffected) {
+        Logger.info('Cleared VoiceUsers in all meetings');
+      }
+    } catch (err) {
+      Logger.error(`Error on clearing VoiceUsers. ${err}`);
     }
-  } catch (err) {
-    return Logger.error(`Error on clearing VoiceUsers. ${err}`);
   }
 }