diff --git a/bigbluebutton-html5/imports/api/breakouts/server/modifiers/clearBreakouts.js b/bigbluebutton-html5/imports/api/breakouts/server/modifiers/clearBreakouts.js index 7c1fe0b5e29711bfd857fc062cdb8701e2fa7d31..21fd266fcec2b346c8de8fe6f782e31efe75ef82 100644 --- a/bigbluebutton-html5/imports/api/breakouts/server/modifiers/clearBreakouts.js +++ b/bigbluebutton-html5/imports/api/breakouts/server/modifiers/clearBreakouts.js @@ -7,8 +7,12 @@ export default function clearBreakouts(breakoutId) { breakoutId, }; - return Breakouts.remove(selector); + return Breakouts.remove(selector, () => { + Logger.info(`Cleared Breakouts (${breakoutId})`); + }); } - return Breakouts.remove({}, Logger.info('Cleared Breakouts (all)')); + return Breakouts.remove({}, () => { + Logger.info('Cleared Breakouts (all)'); + }); } diff --git a/bigbluebutton-html5/imports/api/captions/server/modifiers/clearCaptions.js b/bigbluebutton-html5/imports/api/captions/server/modifiers/clearCaptions.js index 9d10d369cd3ff37cef465f99832ee8299eee3df6..06e572114d7cd6ddc3abe27033e35ff004e7d4ed 100644 --- a/bigbluebutton-html5/imports/api/captions/server/modifiers/clearCaptions.js +++ b/bigbluebutton-html5/imports/api/captions/server/modifiers/clearCaptions.js @@ -3,8 +3,12 @@ import Logger from '/imports/startup/server/logger'; export default function clearCaptions(meetingId) { if (meetingId) { - return Captions.remove({ meetingId }, Logger.info(`Cleared Captions (${meetingId})`)); + return Captions.remove({ meetingId }, () => { + Logger.info(`Cleared Captions (${meetingId})`); + }); } - return Captions.remove({}, Logger.info('Cleared Captions (all)')); + return Captions.remove({}, () => { + Logger.info('Cleared Captions (all)'); + }); } 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 a58dcd5fac47ad538201c8d9d7ac98537939ae80..940ffc29cae9e02b05db8747e707c66728bd36f1 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,7 +9,9 @@ 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})`)); + GroupChatMsg.remove({ meetingId, chatId }, () => { + Logger.info(`Cleared GroupChatMsg (${meetingId}, ${chatId})`); + }); const clearMsg = { color: '0', @@ -26,8 +28,12 @@ export default function clearGroupChatMsg(meetingId, chatId) { } if (meetingId) { - return GroupChatMsg.remove({ meetingId }, Logger.info(`Cleared GroupChatMsg (${meetingId})`)); + return GroupChatMsg.remove({ meetingId }, () => { + Logger.info(`Cleared GroupChatMsg (${meetingId})`); + }); } - return GroupChatMsg.remove({}, Logger.info('Cleared GroupChatMsg (all)')); + return GroupChatMsg.remove({}, () => { + Logger.info('Cleared GroupChatMsg (all)'); + }); } diff --git a/bigbluebutton-html5/imports/api/group-chat/server/modifiers/clearGroupChat.js b/bigbluebutton-html5/imports/api/group-chat/server/modifiers/clearGroupChat.js index 83852af9a95fe55af4237d513b3b16e9d7dd1677..91e25bcc673ef79300f2f116a9d6f529c8cc33da 100644 --- a/bigbluebutton-html5/imports/api/group-chat/server/modifiers/clearGroupChat.js +++ b/bigbluebutton-html5/imports/api/group-chat/server/modifiers/clearGroupChat.js @@ -4,5 +4,7 @@ import clearGroupChatMsg from '/imports/api/group-chat-msg/server/modifiers/clea export default function clearGroupChat(meetingId) { clearGroupChatMsg(meetingId); - return GroupChat.remove({ meetingId }, Logger.info(`Cleared GroupChat (${meetingId})`)); + return GroupChat.remove({ meetingId }, () => { + Logger.info(`Cleared GroupChat (${meetingId})`); + }); } diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPolls.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPolls.js index d614528ebf32449b050282a3aeca4348984c9d37..67f0136f173b9ee0dbc261a724c3193ff3df5c85 100644 --- a/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPolls.js +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPolls.js @@ -3,8 +3,12 @@ import Logger from '/imports/startup/server/logger'; export default function clearPolls(meetingId) { if (meetingId) { - return Polls.remove({ meetingId }, Logger.info(`Cleared Polls (${meetingId})`)); + return Polls.remove({ meetingId }, () => { + Logger.info(`Cleared Polls (${meetingId})`); + }); } - return Polls.remove({}, Logger.info('Cleared Polls (all)')); + return Polls.remove({}, () => { + Logger.info('Cleared Polls (all)'); + }); } diff --git a/bigbluebutton-html5/imports/api/presentation-upload-token/server/modifiers/clearPresentationUploadToken.js b/bigbluebutton-html5/imports/api/presentation-upload-token/server/modifiers/clearPresentationUploadToken.js index 0bd38dec84a2187ae212c59c42b85e207e37dc9f..e101a21b1cd213157c3b8a5ffa76060c0a6ac7d9 100644 --- a/bigbluebutton-html5/imports/api/presentation-upload-token/server/modifiers/clearPresentationUploadToken.js +++ b/bigbluebutton-html5/imports/api/presentation-upload-token/server/modifiers/clearPresentationUploadToken.js @@ -3,19 +3,19 @@ import Logger from '/imports/startup/server/logger'; export default function clearPresentationUploadToken(meetingId, podId) { if (meetingId && podId) { - return PresentationUploadToken.remove( - { meetingId, podId }, - Logger.info(`Cleared Presentations Upload Token (${meetingId}, ${podId})`), - ); + return PresentationUploadToken.remove({ meetingId, podId }, () => { + Logger.info(`Cleared Presentations Upload Token (${meetingId}, ${podId})`); + }); } if (meetingId) { - return PresentationUploadToken.remove( - { meetingId }, - Logger.info(`Cleared Presentations Upload Token (${meetingId})`), - ); + return PresentationUploadToken.remove({ meetingId }, () => { + Logger.info(`Cleared Presentations Upload Token (${meetingId})`); + }); } // clearing presentations for the whole server - return PresentationUploadToken.remove({}, Logger.info('Cleared Presentations Upload Token (all)')); + return PresentationUploadToken.remove({}, () => { + Logger.info('Cleared Presentations Upload Token (all)'); + }); } diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentations.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentations.js index 7631c9c4c71f6cb16c0c2682d35b2a6e8153cc8e..d7ec7b9908118935a9eccfe4b203628610a9c36a 100644 --- a/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentations.js +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentations.js @@ -4,19 +4,20 @@ import Logger from '/imports/startup/server/logger'; export default function clearPresentations(meetingId, podId) { // clearing presentations for 1 pod if (meetingId && podId) { - return Presentations.remove( - { meetingId, podId }, - Logger.info(`Cleared Presentations (${meetingId}, ${podId})`), - ); + return Presentations.remove({ meetingId, podId }, () => { + Logger.info(`Cleared Presentations (${meetingId}, ${podId})`); + }); + } // clearing presentations for the whole meeting - } else if (meetingId) { - return Presentations.remove( - { meetingId }, - Logger.info(`Cleared Presentations (${meetingId})`), - ); + if (meetingId) { + return Presentations.remove({ meetingId }, () => { + Logger.info(`Cleared Presentations (${meetingId})`); + }); } // clearing presentations for the whole server - return Presentations.remove({}, Logger.info('Cleared Presentations (all)')); + return Presentations.remove({}, () => { + Logger.info('Cleared Presentations (all)'); + }); } diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlides.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlides.js index 6ca772b1ca3ff0312e684f0237db9c642496ffe2..f4ce83e13d0c61b12f35fec0058c2d1d2d447881 100644 --- a/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlides.js +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlides.js @@ -3,8 +3,12 @@ import Logger from '/imports/startup/server/logger'; export default function clearSlides(meetingId) { if (meetingId) { - return Slides.remove({ meetingId }, Logger.info(`Cleared Slides (${meetingId})`)); + return Slides.remove({ meetingId }, () => { + Logger.info(`Cleared Slides (${meetingId})`); + }); } - return Slides.remove({}, Logger.info('Cleared Slides (all)')); + return Slides.remove({}, () => { + Logger.info('Cleared Slides (all)'); + }); } diff --git a/bigbluebutton-html5/imports/api/users-settings/server/modifiers/clearUsersSettings.js b/bigbluebutton-html5/imports/api/users-settings/server/modifiers/clearUsersSettings.js index f1c4dd339046ae8a1f64ceee9e0c10f0e3492747..887d6d25ba93d7461f57e2f62d22699426168626 100644 --- a/bigbluebutton-html5/imports/api/users-settings/server/modifiers/clearUsersSettings.js +++ b/bigbluebutton-html5/imports/api/users-settings/server/modifiers/clearUsersSettings.js @@ -2,5 +2,7 @@ import UserSettings from '/imports/api/users-settings'; import Logger from '/imports/startup/server/logger'; export default function clearUsersSettings(meetingId) { - return UserSettings.remove({ meetingId }, Logger.info(`Cleared User Settings (${meetingId})`)); + return UserSettings.remove({ meetingId }, () => { + Logger.info(`Cleared User Settings (${meetingId})`); + }); } diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsers.js b/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsers.js index a4a75acdd99973e660c17b099fdf1eb7fc42f67d..458eb4ef68d94e978f8dcc65b7559739a95a2053 100644 --- a/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsers.js +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsers.js @@ -3,10 +3,14 @@ import Users from '/imports/api/users/index'; const clearUsers = (meetingId) => { if (meetingId) { - return Users.remove({ meetingId }, Logger.info(`Cleared Users (${meetingId})`)); + return Users.remove({ meetingId }, () => { + Logger.info(`Cleared Users (${meetingId})`); + }); } - return Users.remove({}, Logger.info('Cleared Users (all)')); + return Users.remove({}, () => { + Logger.info('Cleared Users (all)'); + }); }; export default clearUsers; diff --git a/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js b/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js index 9321a9183a961840548a39923b605f0f77658a18..cf067837a0668645adfba9ea9fa14aaf4eef6756 100644 --- a/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js +++ b/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js @@ -3,8 +3,12 @@ import VoiceUsers from '/imports/api/voice-users'; export default function clearVoiceUser(meetingId) { if (meetingId) { - return VoiceUsers.remove({ meetingId }, Logger.info(`Cleared Users (${meetingId})`)); + return VoiceUsers.remove({ meetingId }, () => { + Logger.info(`Cleared Users (${meetingId})`); + }); } - return VoiceUsers.remove({}, Logger.info('Cleared Users (all)')); + return VoiceUsers.remove({}, () => { + Logger.info('Cleared Users (all)'); + }); }