From 4fe83bf79d78ccc7894b29116c8219f7aa95aea4 Mon Sep 17 00:00:00 2001
From: Oswaldo Acauan <oswaldoacauan@gmail.com>
Date: Fri, 18 Nov 2016 17:59:11 +0000
Subject: [PATCH] Refactor Shapes API
---
.../imports/api/shapes/server/handlers/whiteboardSend.js | 2 +-
.../imports/api/shapes/server/modifiers/addShape.js | 5 -----
.../imports/api/shapes/server/modifiers/clearShapes.js | 2 +-
.../api/shapes/server/modifiers/clearShapesWhiteboard.js | 2 +-
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/bigbluebutton-html5/imports/api/shapes/server/handlers/whiteboardSend.js b/bigbluebutton-html5/imports/api/shapes/server/handlers/whiteboardSend.js
index 5b6f2b77c2..734ea79442 100644
--- a/bigbluebutton-html5/imports/api/shapes/server/handlers/whiteboardSend.js
+++ b/bigbluebutton-html5/imports/api/shapes/server/handlers/whiteboardSend.js
@@ -1,7 +1,7 @@
import Logger from '/imports/startup/server/logger';
import { check } from 'meteor/check';
-import removePresentation from '../modifiers/removePresentation';
+import addShape from '../modifiers/addShape';
export default function handleWhiteboardSend({ payload }) {
const meetingId = payload.meeting_id;
diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShape.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShape.js
index 03c527b148..231d53c9c7 100644
--- a/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShape.js
+++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShape.js
@@ -5,9 +5,6 @@ import Logger from '/imports/startup/server/logger';
const SHAPE_TYPE_TEXT = 'text';
const SHAPE_TYPE_POLL_RESULT = 'poll_result';
-const SHAPE_STATUS_START = 'status';
-const SHAPE_STATUS_START = 'status';
-
export default function addShape(meetingId, whiteboardId, shape) {
check(meetingId, String);
check(whiteboardId, String);
@@ -74,8 +71,6 @@ export default function addShape(meetingId, whiteboardId, shape) {
return Logger.error(`Adding shape to collection: ${err}`);
}
- addSlides(meetingId, shape.id, shape.pages);
-
const { insertedId } = numChanged;
if (insertedId) {
return Logger.info(`Added shape id=${shape.id} whiteboard=${whiteboardId}`);
diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapes.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapes.js
index b91bd42454..8a0ab5de73 100755
--- a/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapes.js
+++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapes.js
@@ -3,7 +3,7 @@ import Logger from '/imports/startup/server/logger';
export default function clearShapes(meetingId) {
if (meetingId) {
- return Shapes.remove({ meetingId: meetingId, }, Logger.info(`Cleared Shapes (${meetingId})`));
+ return Shapes.remove({ meetingId, }, Logger.info(`Cleared Shapes (${meetingId})`));
}
return Shapes.remove({}, Logger.info('Cleared Shapes (all)'));
diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesWhiteboard.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesWhiteboard.js
index da4444aeed..e85eeac311 100644
--- a/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesWhiteboard.js
+++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesWhiteboard.js
@@ -16,7 +16,7 @@ export default function clearShapesWhiteboard(meetingId, whiteboardId) {
return Logger.error(`Removing Shapes from collection: ${err}`);
}
- return Logger.info(`Removed Shapes where whiteboardId=${presentationId}`);
+ return Logger.info(`Removed Shapes where whiteboard=${whiteboardId}`);
};
return Shapes.remove(selector, cb);
--
GitLab