Pass a userId rather than a RoomMember to isConferenceUser

Because invites do not have RoomMembers because we don't have an m.room.member
event for them, just a user ID, and we want to detect conf users at invite
time.
pull/527/head
Kegan Dougal 2015-12-16 11:55:13 +00:00
parent d3ecce2d2e
commit c8ca1dd8d0
1 changed files with 5 additions and 5 deletions

View File

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