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

Merge pull request #7833 from antobinary/minor-tweaks

Browse Source 
Minor optimization using Fields in miniMongo
This commit is contained in:
Anton Georgiev 2019-07-24 15:16:55 -04:00 committed by GitHub
commit a37b90b140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bigbluebutton-html5/imports/startup/client/base.jsx
View File

@ -219,15 +219,33 @@ const BaseContainer = withTracker(() => {
let breakoutRoomSubscriptionHandler;
let meetingModeratorSubscriptionHandler;
const User = Users.findOne({ intId: credentials.requesterUserId });
const meeting = Meetings.findOne({ meetingId });
if (meeting) {
const { meetingEnded } = meeting;
if (meetingEnded) Session.set('codeError', '410');
const fields = {
approved: 1,
authed: 1,
ejected: 1,
color: 1,
effectiveConnectionType: 1,
extId: 1,
guest: 1,
intId: 1,
locked: 1,
loggedOut: 1,
meetingId: 1,
userId: 1,
};
const User = Users.findOne({ intId: credentials.requesterUserId }, { fields });
const meeting = Meetings.findOne({ meetingId }, {
fields: {
meetingEnded: 1,
},
});
if (meeting && meeting.meetingEnded) {
Session.set('codeError', '410');
}
const approved = !!Users.findOne({ userId: Auth.userID, approved: true, guest: true });
const ejected = Users.findOne({ userId: Auth.userID, ejected: true });
const approved = User && User.approved && User.guest;
const ejected = User && User.ejected;
let userSubscriptionHandler;
@ -252,7 +270,7 @@ const BaseContainer = withTracker(() => {
},
});
Meetings.find({ meetingId }).observe({
Meetings.find({ meetingId }, { fields: { recordProp: 1 } }).observe({
changed: (newDocument, oldDocument) => {
if (newDocument.recordProp) {
if (!oldDocument.recordProp.recording && newDocument.recordProp.recording) {

2
bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
View File

@ -22,7 +22,7 @@ const ActionsBarContainer = props => <ActionsBar {...props} />;
export default withTracker(() => {
const POLLING_ENABLED = Meteor.settings.public.poll.enabled;
Meetings.find({ meetingId: Auth.meetingID }).observeChanges({
Meetings.find({ meetingId: Auth.meetingID }, { fields: { recordProp: 1 } }).observeChanges({
changed: (id, fields) => {
if (fields.recordProp && fields.recordProp.recording) {
this.window.parent.postMessage({ response: 'recordingStarted' }, '*');

2
bigbluebutton-html5/imports/ui/components/app/container.jsx
View File

@ -79,7 +79,7 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls })
}
// Check if user is removed out of the session
Users.find({ userId: Auth.userID }).observeChanges({
Users.find({ userId: Auth.userID }, { fields: { connectionId: 1, ejected: 1 }}).observeChanges({
changed(id, fields) {
const hasNewConnection = 'connectionId' in fields && (fields.connectionId !== Meteor.connection._lastSessionId);

2
bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
View File

@ -44,7 +44,7 @@ export default withTracker(() => {
return hasUnreadMessages;
};
Meetings.find({ meetingId: Auth.meetingID }).observeChanges({
Meetings.find({ meetingId: Auth.meetingID }, { fields: { recordProp: 1 } }).observeChanges({
changed: (id, fields) => {
if (fields.recordProp && fields.recordProp.recording) {
this.window.parent.postMessage({ response: 'recordingStarted' }, '*');

2
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/container.jsx
View File

@ -12,7 +12,7 @@ const UserListItemContainer = props => <UserListItem {...props} />;
export default withTracker(({ userId }) => {
const findUserInBreakout = Breakouts.findOne({ 'joinedUsers.userId': new RegExp(`^${userId}`) });
const breakoutSequence = (findUserInBreakout || {}).sequence;
const Meeting = Meetings.findOne({ MeetingId: Auth.meetingID });
const Meeting = Meetings.findOne({ MeetingId: Auth.meetingID }, { fields: {meetingProp: 1}});
return {
user: mapUser(Users.findOne({ userId })),
userInBreakout: !!findUserInBreakout,

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

@ -187,7 +187,7 @@ WhiteboardMultiUser.find({ meetingId: Auth.meetingID }).observeChanges({
changed: clearFakeAnnotations,
});
Users.find({ userId: Auth.userID }).observeChanges({
Users.find({ userId: Auth.userID }, { fields: { presenter: 1 } }).observeChanges({
changed(id, { presenter }) {
if (presenter === false) clearFakeAnnotations();
},