Преглед на файлове

Removes email references.

dev1
damencho преди 9 години
родител
ревизия
e5ee21b19b
променени са 4 файла, в които са добавени 16 реда и са изтрити 60 реда
  1. 3
    25
      lib-jitsi-meet.js
  2. 10
    10
      lib-jitsi-meet.min.js
  3. 1
    20
      modules/settings/Settings.js
  4. 2
    5
      modules/xmpp/ChatRoom.js

+ 3
- 25
lib-jitsi-meet.js Целия файл

4927
 }
4927
 }
4928
 
4928
 
4929
 function Settings(conferenceID) {
4929
 function Settings(conferenceID) {
4930
-    this.email = '';
4931
     this.displayName = '';
4930
     this.displayName = '';
4932
     this.userId;
4931
     this.userId;
4933
-    this.language = null;
4934
     this.confSettings = null;
4932
     this.confSettings = null;
4935
     this.conferenceID = conferenceID;
4933
     this.conferenceID = conferenceID;
4936
     if (supportsLocalStorage()) {
4934
     if (supportsLocalStorage()) {
4945
             this.save();
4943
             this.save();
4946
         }
4944
         }
4947
         this.userId = this.confSettings.jitsiMeetId || '';
4945
         this.userId = this.confSettings.jitsiMeetId || '';
4948
-        this.email = this.confSettings.email || '';
4949
         this.displayName = this.confSettings.displayname || '';
4946
         this.displayName = this.confSettings.displayname || '';
4950
-        this.language = this.confSettings.language;
4951
     } else {
4947
     } else {
4952
         logger.log("local storage is not supported");
4948
         logger.log("local storage is not supported");
4953
         this.userId = generateUniqueId();
4949
         this.userId = generateUniqueId();
4966
     this.save();
4962
     this.save();
4967
     return this.displayName;
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
 Settings.prototype.getSettings = function () {
4965
 Settings.prototype.getSettings = function () {
4977
     return {
4966
     return {
4978
-        email: this.email,
4979
         displayName: this.displayName,
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
 module.exports = Settings;
4972
 module.exports = Settings;
4992
 
4973
 
6333
             case "userId":
6314
             case "userId":
6334
                 member.id = node.value;
6315
                 member.id = node.value;
6335
                 break;
6316
                 break;
6336
-            case "email":
6337
-                member.email = node.value;
6338
-                break;
6339
             case "bridgeIsDown":
6317
             case "bridgeIsDown":
6340
                 if(!this.bridgeIsDown) {
6318
                 if(!this.bridgeIsDown) {
6341
                     this.bridgeIsDown = true;
6319
                     this.bridgeIsDown = true;
6388
             logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
6366
             logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
6389
         }
6367
         }
6390
         else {
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
     } else {
6371
     } else {
6394
         // Presence update for existing participant
6372
         // Presence update for existing participant
6406
 
6384
 
6407
 
6385
 
6408
     if(!member.isFocus)
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
     // Trigger status message update
6389
     // Trigger status message update
6412
     if (member.status) {
6390
     if (member.status) {

+ 10
- 10
lib-jitsi-meet.min.js
Файловите разлики са ограничени, защото са твърде много
Целия файл


+ 1
- 20
modules/settings/Settings.js Целия файл

18
 }
18
 }
19
 
19
 
20
 function Settings(conferenceID) {
20
 function Settings(conferenceID) {
21
-    this.email = '';
22
     this.displayName = '';
21
     this.displayName = '';
23
     this.userId;
22
     this.userId;
24
-    this.language = null;
25
     this.confSettings = null;
23
     this.confSettings = null;
26
     this.conferenceID = conferenceID;
24
     this.conferenceID = conferenceID;
27
     if (supportsLocalStorage()) {
25
     if (supportsLocalStorage()) {
36
             this.save();
34
             this.save();
37
         }
35
         }
38
         this.userId = this.confSettings.jitsiMeetId || '';
36
         this.userId = this.confSettings.jitsiMeetId || '';
39
-        this.email = this.confSettings.email || '';
40
         this.displayName = this.confSettings.displayname || '';
37
         this.displayName = this.confSettings.displayname || '';
41
-        this.language = this.confSettings.language;
42
     } else {
38
     } else {
43
         logger.log("local storage is not supported");
39
         logger.log("local storage is not supported");
44
         this.userId = generateUniqueId();
40
         this.userId = generateUniqueId();
57
     this.save();
53
     this.save();
58
     return this.displayName;
54
     return this.displayName;
59
 },
55
 },
60
-Settings.prototype.setEmail = function (newEmail) {
61
-    this.email = newEmail;
62
-    if(this.confSettings != null)
63
-        this.confSettings.email = newEmail;
64
-    this.save();
65
-    return this.email;
66
-},
67
 Settings.prototype.getSettings = function () {
56
 Settings.prototype.getSettings = function () {
68
     return {
57
     return {
69
-        email: this.email,
70
         displayName: this.displayName,
58
         displayName: this.displayName,
71
-        uid: this.userId,
72
-        language: this.language
59
+        uid: this.userId
73
     };
60
     };
74
 },
61
 },
75
-Settings.prototype.setLanguage = function (lang) {
76
-    this.language = lang;
77
-    if(this.confSettings != null)
78
-        this.confSettings.language = lang;
79
-    this.save();
80
-}
81
 
62
 
82
 module.exports = Settings;
63
 module.exports = Settings;

+ 2
- 5
modules/xmpp/ChatRoom.js Целия файл

236
             case "userId":
236
             case "userId":
237
                 member.id = node.value;
237
                 member.id = node.value;
238
                 break;
238
                 break;
239
-            case "email":
240
-                member.email = node.value;
241
-                break;
242
             case "bridgeIsDown":
239
             case "bridgeIsDown":
243
                 if(!this.bridgeIsDown) {
240
                 if(!this.bridgeIsDown) {
244
                     this.bridgeIsDown = true;
241
                     this.bridgeIsDown = true;
291
             logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
288
             logger.info("Ignore focus: " + from + ", real JID: " + member.jid);
292
         }
289
         }
293
         else {
290
         else {
294
-            this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id || member.email, member.nick);
291
+            this.eventEmitter.emit(XMPPEvents.MUC_MEMBER_JOINED, from, member.id, member.nick);
295
         }
292
         }
296
     } else {
293
     } else {
297
         // Presence update for existing participant
294
         // Presence update for existing participant
309
 
306
 
310
 
307
 
311
     if(!member.isFocus)
308
     if(!member.isFocus)
312
-        this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id || member.email);
309
+        this.eventEmitter.emit(XMPPEvents.USER_ID_CHANGED, from, member.id);
313
 
310
 
314
     // Trigger status message update
311
     // Trigger status message update
315
     if (member.status) {
312
     if (member.status) {

Loading…
Отказ
Запис