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

remove unused code

Browse Source
This commit is contained in:
Ramón Souza 2023-10-11 09:48:10 -03:00
parent b99c75f843
commit b3f74c9280
2 changed files with 2 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
bigbluebutton-html5/imports/ui/components/whiteboard/service.js
View File

@ -1,12 +1,9 @@
import Users from '/imports/api/users';
import Auth from '/imports/ui/services/auth';
import WhiteboardMultiUser from '/imports/api/whiteboard-multi-user';
import addAnnotationQuery from '/imports/api/annotations/addAnnotation';
import { Slides } from '/imports/api/slides';
import { makeCall } from '/imports/ui/services/api';
import PresentationService from '/imports/ui/components/presentation/service';
import PollService from '/imports/ui/components/poll/service';
import logger from '/imports/startup/client/logger';
import { defineMessages } from 'react-intl';
import { notify } from '/imports/ui/services/notification';
import caseInsensitiveReducer from '/imports/utils/caseInsensitiveReducer';
@ -25,79 +22,6 @@ const intlMessages = defineMessages({
},
});
let annotationsStreamListener = null;
async function handleAddedAnnotation({
meetingId,
whiteboardId,
userId,
annotation,
}) {
const query = await addAnnotationQuery(meetingId, whiteboardId, userId, annotation, Annotations);
Annotations.upsert(query.selector, query.modifier);
}
function handleRemovedAnnotation({
meetingId, whiteboardId, userId, shapeId,
}) {
const query = { meetingId, whiteboardId };
if (userId) {
query.userId = userId;
}
if (shapeId) {
query.id = shapeId;
}
Annotations.remove(query);
}
export function initAnnotationsStreamListener() {
logger.info(
{ logCode: 'init_annotations_stream_listener' },
'initAnnotationsStreamListener called',
);
/**
* We create a promise to add the handlers after a ddp subscription stop.
* The problem was caused because we add handlers to stream before the onStop event happens,
* which set the handlers to undefined.
*/
annotationsStreamListener = new Meteor.Streamer(
`annotations-${Auth.meetingID}`,
{ retransmit: false },
);
const startStreamHandlersPromise = new Promise((resolve) => {
const checkStreamHandlersInterval = setInterval(() => {
const streamHandlersSize = Object.values(
Meteor.StreamerCentral.instances[`annotations-${Auth.meetingID}`]
.handlers,
).filter((el) => el !== undefined).length;
if (!streamHandlersSize) {
resolve(clearInterval(checkStreamHandlersInterval));
}
}, 250);
});
startStreamHandlersPromise.then(() => {
logger.debug(
{ logCode: 'annotations_stream_handler_attach' },
'Attaching handlers for annotations stream',
);
annotationsStreamListener.on('removed', handleRemovedAnnotation);
annotationsStreamListener.on('added', async ({ annotations }) => {
await Promise.all(annotations.map(async (annotation) => {
const addedHandeler = await handleAddedAnnotation(annotation);
return addedHandeler;
}));
});
});
}
const annotationsQueue = [];
// How many packets we need to have to use annotationsBufferTimeMax
const annotationsMaxDelayQueueSize = 60;
@ -167,33 +91,6 @@ const getMultiUser = (whiteboardId) => {
return data.multiUser;
};
const getMultiUserSize = (whiteboardId) => {
const multiUser = getMultiUser(whiteboardId);
if (multiUser.length === 0) return 0;
// Individual whiteboard access is controlled by an array of userIds.
// When an user leaves the meeting or the presenter role moves from an
// user to another we applying a filter at the whiteboard collection.
// Ideally this should change to something more cohese but this would
// require extra changes at multiple backend modules.
const multiUserSize = Users.find(
{
meetingId: Auth.meetingID,
$or: [
{
userId: { $in: multiUser },
presenter: false,
},
{ presenter: true },
],
},
{ fields: { userId: 1 } },
).fetch();
return multiUserSize.length;
};
const getCurrentWhiteboardId = () => {
const podId = 'DEFAULT_PRESENTATION_POD';
const currentPresentation = PresentationService.getCurrentPresentation(podId);
@ -409,7 +306,6 @@ const formatAnnotations = (annotations, intl, curPageId) => {
let annotationInfo = JSON.parse(annotation.annotationInfo);
if (annotationInfo.questionType) {
const modAnnotation = annotation;
// poll result, convert it to text and create tldraw shape
annotationInfo.answers = annotationInfo.answers.reduce(
caseInsensitiveReducer, [],
@ -438,7 +334,8 @@ const formatAnnotations = (annotations, intl, curPageId) => {
scale: 1,
};
const textSize = getTextSize(pollResult, style, padding = 20);
const padding = 20;
const textSize = getTextSize(pollResult, style, padding);
annotationInfo = {
childIndex: 0,
@ -464,7 +361,6 @@ export {
Annotations,
sendAnnotation,
getMultiUser,
getMultiUserSize,
getCurrentWhiteboardId,
isMultiUserActive,
hasMultiUserAccess,

2
bigbluebutton-html5/imports/ui/services/auth/index.js
View File

@ -3,7 +3,6 @@ import { Tracker } from 'meteor/tracker';
import Storage from '/imports/ui/services/storage/session';
import { initAnnotationsStreamListener } from '/imports/ui/components/whiteboard/service';
import allowRedirectToLogoutURL from '/imports/ui/components/meeting-ended/service';
import { initCursorStreamListener } from '/imports/ui/components/whiteboard/cursors/service';
import SubscriptionRegistry from '/imports/ui/services/subscription-registry/subscriptionRegistry';
@ -250,7 +249,6 @@ class Auth {
break;
case ValidationStates.VALIDATED:
initCursorStreamListener();
initAnnotationsStreamListener();
clearTimeout(validationTimeout);
this.connectionID = authenticationTokenValidation.connectionId;
this.connectionAuthTime = new Date().getTime();