Fixed polling for the HTML5 viewers

bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js

@@ -12,10 +12,10 @@ Meteor.methods({
       const eventName = 'vote_poll_user_request_message';
 
       const result = Polls.findOne({
-        users: { $in: [requesterUserId] },
+        users: requesterUserId,
         meetingId: meetingId,
-        poll: { answers: { id: { $in: [pollAnswerId] } } },
-        poll: { id: pollId },
+        'poll.answers.id': pollAnswerId,
+        'poll.id': pollId,
       });
 
       if ((meetingId != null) &&
@@ -32,9 +32,9 @@ Meteor.methods({
           },
         };
         Polls.update({
-          users: { $in: [requesterUserId] },
+          users: requesterUserId,
           meetingId: meetingId,
-          poll: { answers: { id: { $in: [pollAnswerId] } } },
+          'poll.answers.id': pollAnswerId,
         }, {
           $pull: {
             users: requesterUserId,

bigbluebutton-html5/imports/api/polls/server/publications.js

@@ -12,18 +12,18 @@ Meteor.publish('polls', function (credentials) {
       logger.info('publishing Poll for presenter: ' + meetingId + ' ' + requesterUserId + ' ' +
         requesterToken);
       return Polls.find({
-        'poll_info.meetingId': meetingId,
-        'poll_info.users': requesterUserId,
+        meetingId: meetingId,
+        users: requesterUserId,
       });
     } else {
       logger.info('publishing Poll for viewer: ' + meetingId + ' ' + requesterUserId + ' ' +
         requesterToken);
       return Polls.find({
-        'poll_info.meetingId': meetingId,
-        'poll_info.users': requesterUserId,
+        meetingId: meetingId,
+        users: requesterUserId,
       }, {
         fields: {
-          'poll_info.poll.answers.num_votes': 0,
+          'poll.answers.num_votes': 0,
         },
       });
     }

bigbluebutton-html5/imports/ui/components/polling/service.js

-import { Polls } from '/imports/api/polls';
 import { callServer } from '/imports/ui/services/api';
+import Polls from '/imports/api/polls';
 
 let mapPolls = function () {
   let poll = Polls.findOne({});