Browse Source

Fixes uid, email and displayName advertisement in MUC presence.

j8
paweldomas 10 years ago
parent
commit
f98621173f
3 changed files with 26095 additions and 26067 deletions
  1. 1
    1
      index.html
  2. 26078
    26064
      libs/app.bundle.js
  3. 16
    2
      modules/xmpp/xmpp.js

+ 1
- 1
index.html View File

19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
21
     <script src="interface_config.js?v=5"></script>
21
     <script src="interface_config.js?v=5"></script>
22
-    <script src="libs/app.bundle.js?v=45"></script>
22
+    <script src="libs/app.bundle.js?v=46"></script>
23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24
     <link rel="stylesheet" href="css/font.css?v=6"/>
24
     <link rel="stylesheet" href="css/font.css?v=6"/>
25
     <link rel="stylesheet" href="css/toastr.css?v=1">
25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 26078
- 26064
libs/app.bundle.js
File diff suppressed because it is too large
View File


+ 16
- 2
modules/xmpp/xmpp.js View File

3
 var EventEmitter = require("events");
3
 var EventEmitter = require("events");
4
 var Recording = require("./recording");
4
 var Recording = require("./recording");
5
 var SDP = require("./SDP");
5
 var SDP = require("./SDP");
6
+var Settings = require("../settings/Settings");
6
 var Pako = require("pako");
7
 var Pako = require("pako");
7
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
8
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
8
 var UIEvents = require("../../service/UI/UIEvents");
9
 var UIEvents = require("../../service/UI/UIEvents");
27
         connection.jingle.pc_constraints.optional.push({googIPv6: true});
28
         connection.jingle.pc_constraints.optional.push({googIPv6: true});
28
     }
29
     }
29
 
30
 
31
+    // Include user info in MUC presence
32
+    var settings = Settings.getSettings();
33
+    if (settings.email) {
34
+        connection.emuc.addEmailToPresence(settings.email);
35
+    }
36
+    if (settings.uid) {
37
+        connection.emuc.addUserIdToPresence(settings.uid);
38
+    }
39
+    if (settings.displayName) {
40
+        connection.emuc.addDisplayNameToPresence(settings.displayName);
41
+    }
42
+
30
     var anonymousConnectionFailed = false;
43
     var anonymousConnectionFailed = false;
31
     connection.connect(jid, password, function (status, msg) {
44
     connection.connect(jid, password, function (status, msg) {
32
         console.log('Strophe status changed to',
45
         console.log('Strophe status changed to',
371
                 break;
384
                 break;
372
             case "email":
385
             case "email":
373
                 connection.emuc.addEmailToPresence(value);
386
                 connection.emuc.addEmailToPresence(value);
387
+                break;
374
             default :
388
             default :
375
-                console.log("Unknown tag for presence.");
389
+                console.log("Unknown tag for presence: " + name);
376
                 return;
390
                 return;
377
         }
391
         }
378
-        if(!dontSend)
392
+        if (!dontSend)
379
             connection.emuc.sendPresence();
393
             connection.emuc.sendPresence();
380
     },
394
     },
381
     /**
395
     /**

Loading…
Cancel
Save