Merge pull request #527 from vector-im/kegan/hide-fs-user

Pass a userId rather than a RoomMember to isConferenceUser
This commit is contained in:
Kegsay 2015-12-16 13:56:50 +00:00
commit 856156ef5c

View file

@ -85,15 +85,15 @@ ConferenceCall.prototype._getConferenceUserRoom = function() {
}; };
/** /**
* Check if this room member is in fact a conference bot. * Check if this user ID is in fact a conference bot.
* @param {RoomMember} The room member to check * @param {string} userId The user ID to check.
* @return {boolean} True if it is a conference bot. * @return {boolean} True if it is a conference bot.
*/ */
module.exports.isConferenceUser = function(roomMember) { module.exports.isConferenceUser = function(userId) {
if (roomMember.userId.indexOf("@" + USER_PREFIX) !== 0) { if (userId.indexOf("@" + USER_PREFIX) !== 0) {
return false; return false;
} }
var base64part = roomMember.userId.split(":")[0].substring(1 + USER_PREFIX.length); var base64part = userId.split(":")[0].substring(1 + USER_PREFIX.length);
if (base64part) { if (base64part) {
var decoded = new Buffer(base64part, "base64").toString(); var decoded = new Buffer(base64part, "base64").toString();
// ! $STUFF : $STUFF // ! $STUFF : $STUFF