|
@@ -4927,10 +4927,8 @@ function generateUniqueId() {
|
4927
|
4927
|
}
|
4928
|
4928
|
|
4929
|
4929
|
function Settings(conferenceID) {
|
4930
|
|
- this.email = '';
|
4931
|
4930
|
this.displayName = '';
|
4932
|
4931
|
this.userId;
|
4933
|
|
- this.language = null;
|
4934
|
4932
|
this.confSettings = null;
|
4935
|
4933
|
this.conferenceID = conferenceID;
|
4936
|
4934
|
if (supportsLocalStorage()) {
|
|
@@ -4945,9 +4943,7 @@ function Settings(conferenceID) {
|
4945
|
4943
|
this.save();
|
4946
|
4944
|
}
|
4947
|
4945
|
this.userId = this.confSettings.jitsiMeetId || '';
|
4948
|
|
- this.email = this.confSettings.email || '';
|
4949
|
4946
|
this.displayName = this.confSettings.displayname || '';
|
4950
|
|
- this.language = this.confSettings.language;
|
4951
|
4947
|
} else {
|
4952
|
4948
|
logger.log("local storage is not supported");
|
4953
|
4949
|
this.userId = generateUniqueId();
|
|
@@ -4966,27 +4962,12 @@ Settings.prototype.setDisplayName = function (newDisplayName) {
|
4966
|
4962
|
this.save();
|
4967
|
4963
|
return this.displayName;
|
4968
|
4964
|
},
|
4969
|
|
-Settings.prototype.setEmail = function (newEmail) {
|
4970
|
|
- this.email = newEmail;
|
4971
|
|
- if(this.confSettings != null)
|
4972
|
|
- this.confSettings.email = newEmail;
|
4973
|
|
- this.save();
|
4974
|
|
- return this.email;
|
4975
|
|
-},
|
4976
|
4965
|
Settings.prototype.getSettings = function () {
|
4977
|
4966
|
return {
|
4978
|
|
- email: this.email,
|
4979
|
4967
|
displayName: this.displayName,
|
4980
|
|
- uid: this.userId,
|
4981
|
|
- language: this.language
|
|
4968
|
+ uid: this.userId
|
4982
|
4969
|
};
|
4983
|
4970
|
},
|
4984
|
|
-Settings.prototype.setLanguage = function (lang) {
|
4985
|
|
- this.language = lang;
|
4986
|
|
- if(this.confSettings != null)
|
4987
|
|
- this.confSettings.language = lang;
|
4988
|
|
- this.save();
|
4989
|
|
-}
|
4990
|
4971
|
|
4991
|
4972
|
module.exports = Settings;
|
4992
|
4973
|
|
|
@@ -6333,9 +6314,6 @@ ChatRoom.prototype.onPresence = function (pres) {
|
6333
|
6314
|
case "userId":
|
6334
|
6315
|
member.id = node.value;
|
6335
|
6316
|
break;
|
6336
|
|
- case "email":
|
6337
|
|
- member.email = node.value;
|
6338
|
|
- break;
|
6339
|
6317
|
case "bridgeIsDown":
|
6340
|
6318
|
if(!this.bridgeIsDown) {
|
6341
|
6319
|
this.bridgeIsDown = true;
|
|
@@ -6388,7 +6366,7 @@ ChatRoom.prototype.onPresence = function (pres) {
|
6388
|
6366
|
logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
|
6389
|
6367
|
}
|
6390
|
6368
|
else {
|
6391
|
|
- this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id || member.email, member.nick);
|
|
6369
|
+ this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id, member.nick);
|
6392
|
6370
|
}
|
6393
|
6371
|
} else {
|
6394
|
6372
|
// Presence update for existing participant
|
|
@@ -6406,7 +6384,7 @@ ChatRoom.prototype.onPresence = function (pres) {
|
6406
|
6384
|
|
6407
|
6385
|
|
6408
|
6386
|
if(!member.isFocus)
|
6409
|
|
- this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id || member.email);
|
|
6387
|
+ this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id);
|
6410
|
6388
|
|
6411
|
6389
|
// Trigger status message update
|
6412
|
6390
|
if (member.status) {
|