Fix shapes not being removed while non existent in the reply message

bigbluebutton-html5/imports/api/shapes/server/handlers/whiteboardGetReply.js

 import Logger from '/imports/startup/server/logger';
 import { check } from 'meteor/check';
 import { inReplyToHTML5Client } from '/imports/api/common/server/helpers';
+import Shapes from '/imports/api/shapes';
 
 import addShape from '../modifiers/addShape';
+import removeShape from '../modifiers/removeShape';
 
 export default function handleWhiteboardGetReply({ payload }) {
   if (!inReplyToHTML5Client({ payload })) {
@@ -15,6 +17,14 @@ export default function handleWhiteboardGetReply({ payload }) {
   check(meetingId, String);
   check(shapes, Array);
 
+  const shapesIds = shapes.map(_ => _.id);
+  const shapesToRemove = Shapes.find({
+    meetingId,
+    'shape.id': { $nin: shapesIds },
+  }).fetch();
+
+  shapesToRemove.forEach(s => removeShape(meetingId, s.shape.wb_id, s.shape.id));
+
   let shapesAdded = [];
   shapes.forEach(shape => {
     let whiteboardId = shape.wb_id;

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

@@ -65,8 +65,9 @@ export default function addSlide(meetingId, presentationId, slide) {
 
     const { insertedId } = numChanged;
 
+    requestWhiteboardHistory(meetingId, slide.id);
+
     if (insertedId) {
-      requestWhiteboardHistory(meetingId, slide.id);
       return Logger.info(`Added slide id=${slide.id} to presentation=${presentationId}`);
     }