BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages

Browse Source
This commit is contained in:
Anton Georgiev 2017-06-28 15:24:46 -04:00
commit 5ca466c448
22 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/clearCursor.js
View File

@ -1,4 +1,4 @@
import Cursor from './../../';
import Cursor from '/imports/api/2.0/cursor';
import Logger from '/imports/startup/server/logger';
export default function clearCursor(meetingId) {

2
bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/initializeCursor.js
View File

@ -1,4 +1,4 @@
import Cursor from './../../';
import Cursor from '/imports/api/2.0/cursor';
import updateCursor from './updateCursor';
export default function initializeCursor(meetingId) {

2
bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/updateCursor.js
View File

@ -1,5 +1,5 @@
import Logger from '/imports/startup/server/logger';
import Cursor from './../../';
import Cursor from '/imports/api/2.0/cursor';
import { check } from 'meteor/check';
export default function updateCursor(meetingId, userId, x = -1, y = -1) {

6
bigbluebutton-html5/imports/api/2.0/cursor/server/publishers.js
View File

@ -1,4 +1,4 @@
import Cursor from './../';
import Cursor from '/imports/api/2.0/cursor';
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
@ -12,14 +12,12 @@ function cursor(credentials) {
check(requesterUserId, String);
check(requesterToken, String);
Logger.debug(`Publishing Cursor for ${meetingId} ${requesterUserId} ${requesterToken}`);
Logger.debug(`Publishing Cursor2x for ${meetingId} ${requesterUserId} ${requesterToken}`);
return Cursor.find({ meetingId });
}
function publish(...args) {
console.error('cursor2x publish');
const boundCursor = cursor.bind(this);
return mapToAcl('subscriptions.cursor', boundCursor)(args);
}

3
bigbluebutton-html5/imports/api/2.0/meetings/server/publishers.js
View File

@ -1,11 +1,10 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import Meetings from '..';
import Meetings from '/imports/api/2.0/meetings';
import Logger from '/imports/startup/server/logger';
import mapToAcl from '/imports/startup/mapToAcl';
function meetings(credentials) {
console.error('meetings2x publish');
const { meetingId, requesterUserId, requesterToken } = credentials;
check(meetingId, String);

2
bigbluebutton-html5/imports/api/2.0/shapes/server/modifiers/addShape.js
View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
import Shapes from './../../';
import Shapes from '/imports/api/2.0/shapes';
const SHAPE_TYPE_TEXT = 'text';
const SHAPE_TYPE_POLL_RESULT = 'poll_result';

2
bigbluebutton-html5/imports/api/2.0/shapes/server/modifiers/clearShapes.js
View File

@ -1,4 +1,4 @@
import Shapes from './../../';
import Shapes from '/imports/api/2.0/shapes';
import Logger from '/imports/startup/server/logger';
export default function clearShapes(meetingId) {

2
bigbluebutton-html5/imports/api/2.0/shapes/server/modifiers/clearShapesWhiteboard.js
View File

@ -1,4 +1,4 @@
import Shapes from './../../';
import Shapes from '/imports/api/2.0/shapes';
import Logger from '/imports/startup/server/logger';
import { check } from 'meteor/check';

2
bigbluebutton-html5/imports/api/2.0/shapes/server/modifiers/removeShape.js
View File

@ -1,5 +1,5 @@
import { check } from 'meteor/check';
import Shapes from './../../';
import Shapes from '/imports/api/2.0/shapes';
import Logger from '/imports/startup/server/logger';
export default function removeShape(meetingId, whiteboardId, shapeId) {

4
bigbluebutton-html5/imports/api/2.0/shapes/server/publishers.js
View File

@ -1,4 +1,4 @@
import Shapes from './../';
import Shapes from '/imports/api/2.0/shapes';
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
@ -17,8 +17,6 @@ function shapes(credentials) {
}
function publish(...args) {
console.error('shapes2x publish');
const boundShapes = shapes.bind(this);
return mapToAcl('subscriptions.shapes', boundShapes)(args);
}

2
bigbluebutton-html5/imports/api/2.0/users/server/handlers/emojiStatus.js
View File

@ -1,6 +1,6 @@
import Logger from '/imports/startup/server/logger';
import { check } from 'meteor/check';
import Users from './../../';
import Users from '/imports/api/2.0/users';
export default function handleEmojiStatus({ body , header }) {
const { meetingId } = header;

2
bigbluebutton-html5/imports/api/2.0/users/server/handlers/listeningOnly.js
View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
import Users from './../../';
import Users from '/imports/api/2.0/users';
export default function handleListeningOnly({ payload }) {
const meetingId = payload.meeting_id;

2
bigbluebutton-html5/imports/api/2.0/users/server/handlers/presenterAssigned.js
View File

@ -1,6 +1,6 @@
import Logger from '/imports/startup/server/logger';
import { check } from 'meteor/check';
import Users from './../../';
import Users from '/imports/api/2.0/users';
export default function handlePresenterAssigned({ body, header }) {
const { meetingId } = header;

2
bigbluebutton-html5/imports/api/2.0/users/server/methods/listenOnlyToggle.js
View File

@ -3,7 +3,7 @@ import { check } from 'meteor/check';
import RedisPubSub from '/imports/startup/server/redis2x';
import Logger from '/imports/startup/server/logger';
import Meetings from '/imports/api/2.0/meetings';
import Users from './../../';
import Users from '/imports/api/2.0/users';
export default function listenOnlyToggle(credentials, isJoining = true) {
const REDIS_CONFIG = Meteor.settings.redis;

2
bigbluebutton-html5/imports/api/2.0/users/server/methods/userLeaving.js
View File

@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import RedisPubSub from '/imports/startup/server/redis2x';
import Logger from '/imports/startup/server/logger';
import Users from './../../';
import Users from '/imports/api/2.0/users';
import listenOnlyToggle from './listenOnlyToggle';

2
bigbluebutton-html5/imports/api/2.0/users/server/methods/validateAuthToken.js
View File

@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import RedisPubSub from '/imports/startup/server/redis2x';
import Logger from '/imports/startup/server/logger';
import Users from './../../';
import Users from '/imports/api/2.0/users';
import createDummyUser2x from '../modifiers/createDummyUser';
import setConnectionStatus from '../modifiers/setConnectionStatus';

3
bigbluebutton-html5/imports/api/2.0/users/server/modifiers/addUser.js
View File

@ -1,7 +1,6 @@
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
import Users from './../../';
import Users from '/imports/api/2.0/users';
import requestStunTurn from '../methods/requestStunTurn';

6
bigbluebutton-html5/imports/api/2.0/users/server/modifiers/createDummyUser.js
View File

@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
import Users2x from '/imports/api/2.0/users';
import Users from '/imports/api/2.0/users';
export default function createDummyUser2x(meetingId, userId, authToken) {
console.error(`create dummy user2x ${meetingId} ${userId} ${authToken}`);
@ -9,7 +9,7 @@ export default function createDummyUser2x(meetingId, userId, authToken) {
check(userId, String);
check(authToken, String);
const User = Users2x.findOne({ meetingId, userId });
const User = Users.findOne({ meetingId, userId });
if (User) {
throw new Meteor.Error('existing-user', 'Tried to create a dummy user for an existing user');
}
@ -30,5 +30,5 @@ export default function createDummyUser2x(meetingId, userId, authToken) {
Logger.info(`Created dummy user 2x id=${userId} token=${authToken} meeting=${meetingId}`);
};
return Users2x.insert(doc, cb);
return Users.insert(doc, cb);
}

2
bigbluebutton-html5/imports/api/2.0/users/server/modifiers/removeUser.js
View File

@ -1,5 +1,5 @@
import { check } from 'meteor/check';
import Users from './../../';
import Users from '/imports/api/2.0/users';
import Logger from '/imports/startup/server/logger';
const CLIENT_TYPE_HTML = 'HTML5';

2
bigbluebutton-html5/imports/api/2.0/users/server/modifiers/setConnectionStatus.js
View File

@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import Users from './../../';
import Users from '/imports/api/2.0/users';
import Logger from '/imports/startup/server/logger';
const VALID_CONNECTION_STATUS = ['online', 'offline'];

2
bigbluebutton-html5/imports/api/2.0/users/server/modifiers/updateVoiceUser.js
View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
import Users from './../../';
import Users from '/imports/api/2.0/users';
export default function updateVoiceUser(meetingId, voiceUser) {
check(meetingId, String);

3
bigbluebutton-html5/imports/api/2.0/users/server/publishers.js
View File

@ -1,4 +1,4 @@
import Users from '..';
import Users from '/imports/api/2.0/users';
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
@ -29,7 +29,6 @@ Meteor.publish('current-user2x', (credentials) => {
});
function users(credentials) {
console.error('users2x publish');
const {
meetingId,
requesterUserId,