diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js index c25db115efae792ae625541c295ce0e1d44b4547..b622afb8cc7640963fd62dae639674c441919ef3 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js @@ -23,11 +23,31 @@ const getUsersNotAssigned = filterBreakoutUsers(currentBreakoutUsers); const takePresenterRole = () => makeCall('assignPresenter', Auth.userID); +const amIPresenter = () => { + const currentUser = Users.findOne({ userId: Auth.userID }, + { fields: { presenter: 1 } }); + + if (!currentUser) { + return false; + } + + return currentUser.presenter; +}; + +const amIModerator = () => { + const currentUser = Users.findOne({ userId: Auth.userID }, + { fields: { role: 1 } }); + + if (!currentUser) { + return false; + } + + return currentUser.role === ROLE_MODERATOR; +}; + export default { - amIPresenter: () => Users.findOne({ userId: Auth.userID }, - { fields: { presenter: 1 } }).presenter || false, - amIModerator: () => Users.findOne({ userId: Auth.userID }, - { fields: { role: 1 } }).role === ROLE_MODERATOR || false, + amIPresenter, + amIModerator, meetingName: () => Meetings.findOne({ meetingId: Auth.meetingID }, { fields: { 'meetingProp.name': 1 } }).meetingProp.name, users: () => Users.find({ diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js index 33c73285ac169f977ca512d7e37a90689e8a47d5..721db51b34fd4830692f3074cdf1d8c18859e5f3 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/service.js +++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js @@ -429,6 +429,18 @@ const toggleVoice = (userId) => { } }; +const getEmoji = () => { + const currentUser = Users.findOne({ userId: Auth.userID }, + { fields: { emoji: 1 } }); + + if (!currentUser) { + return false; + } + + return currentUser.emoji; +}; + + const muteAllUsers = (userId) => { makeCall('muteAllUsers', userId); }; const muteAllExceptPresenter = (userId) => { makeCall('muteAllExceptPresenter', userId); }; @@ -617,7 +629,7 @@ export default { getGroupChatPrivate, hasBreakoutRoom, getEmojiList: () => EMOJI_STATUSES, - getEmoji: () => Users.findOne({ userId: Auth.userID }, { fields: { emoji: 1 } }).emoji, + getEmoji, hasPrivateChatBetweenUsers, toggleUserLock, requestUserInformation,