Skip to content

Commit

Permalink
Removes email references.
Browse files Browse the repository at this point in the history
  • Loading branch information
@damencho @bgrozev
damencho authored and bgrozev committed Jan 28, 2016
1 parent 2739340 commit e5ee21b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 60 deletions.
28 changes: 3 additions & 25 deletions lib-jitsi-meet.js
View file
Expand Up @@ -4927,10 +4927,8 @@ function generateUniqueId() {
}

function Settings(conferenceID) {
this.email = '';
this.displayName = '';
this.userId;
this.language = null;
this.confSettings = null;
this.conferenceID = conferenceID;
if (supportsLocalStorage()) {
Expand All @@ -4945,9 +4943,7 @@ function Settings(conferenceID) {
this.save();
}
this.userId = this.confSettings.jitsiMeetId || '';
this.email = this.confSettings.email || '';
this.displayName = this.confSettings.displayname || '';
this.language = this.confSettings.language;
} else {
logger.log("local storage is not supported");
this.userId = generateUniqueId();
Expand All @@ -4966,27 +4962,12 @@ Settings.prototype.setDisplayName = function (newDisplayName) {
this.save();
return this.displayName;
},
Settings.prototype.setEmail = function (newEmail) {
this.email = newEmail;
if(this.confSettings != null)
this.confSettings.email = newEmail;
this.save();
return this.email;
},
Settings.prototype.getSettings = function () {
return {
email: this.email,
displayName: this.displayName,
uid: this.userId,
language: this.language
uid: this.userId
};
},
Settings.prototype.setLanguage = function (lang) {
this.language = lang;
if(this.confSettings != null)
this.confSettings.language = lang;
this.save();
}

module.exports = Settings;

Expand Down Expand Up @@ -6333,9 +6314,6 @@ ChatRoom.prototype.onPresence = function (pres) {
case "userId":
member.id = node.value;
break;
case "email":
member.email = node.value;
break;
case "bridgeIsDown":
if(!this.bridgeIsDown) {
this.bridgeIsDown = true;
Expand Down Expand Up @@ -6388,7 +6366,7 @@ ChatRoom.prototype.onPresence = function (pres) {
logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
}
else {
this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id || member.email, member.nick);
this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id, member.nick);
}
} else {
// Presence update for existing participant
Expand All @@ -6406,7 +6384,7 @@ ChatRoom.prototype.onPresence = function (pres) {


if(!member.isFocus)
this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id || member.email);
this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id);

// Trigger status message update
if (member.status) {
Expand Down
20 changes: 10 additions & 10 deletions lib-jitsi-meet.min.js
View file

Large diffs are not rendered by default.

21 changes: 1 addition & 20 deletions modules/settings/Settings.js
View file
Expand Up @@ -18,10 +18,8 @@ function generateUniqueId() {
}

function Settings(conferenceID) {
this.email = '';
this.displayName = '';
this.userId;
this.language = null;
this.confSettings = null;
this.conferenceID = conferenceID;
if (supportsLocalStorage()) {
Expand All @@ -36,9 +34,7 @@ function Settings(conferenceID) {
this.save();
}
this.userId = this.confSettings.jitsiMeetId || '';
this.email = this.confSettings.email || '';
this.displayName = this.confSettings.displayname || '';
this.language = this.confSettings.language;
} else {
logger.log("local storage is not supported");
this.userId = generateUniqueId();
Expand All @@ -57,26 +53,11 @@ Settings.prototype.setDisplayName = function (newDisplayName) {
this.save();
return this.displayName;
},
Settings.prototype.setEmail = function (newEmail) {
this.email = newEmail;
if(this.confSettings != null)
this.confSettings.email = newEmail;
this.save();
return this.email;
},
Settings.prototype.getSettings = function () {
return {
email: this.email,
displayName: this.displayName,
uid: this.userId,
language: this.language
uid: this.userId
};
},
Settings.prototype.setLanguage = function (lang) {
this.language = lang;
if(this.confSettings != null)
this.confSettings.language = lang;
this.save();
}

module.exports = Settings;
7 changes: 2 additions & 5 deletions modules/xmpp/ChatRoom.js
View file
Expand Up @@ -236,9 +236,6 @@ ChatRoom.prototype.onPresence = function (pres) {
case "userId":
member.id = node.value;
break;
case "email":
member.email = node.value;
break;
case "bridgeIsDown":
if(!this.bridgeIsDown) {
this.bridgeIsDown = true;
Expand Down Expand Up @@ -291,7 +288,7 @@ ChatRoom.prototype.onPresence = function (pres) {
logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
}
else {
this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id || member.email, member.nick);
this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id, member.nick);
}
} else {
// Presence update for existing participant
Expand All @@ -309,7 +306,7 @@ ChatRoom.prototype.onPresence = function (pres) {


if(!member.isFocus)
this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id || member.email);
this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id);

// Trigger status message update
if (member.status) {
Expand Down

0 comments on commit e5ee21b

Please sign in to comment.