Przeglądaj źródła

Fixes uid, email and displayName advertisement in MUC presence.

j8
paweldomas 10 lat temu
rodzic
commit
f98621173f
3 zmienionych plików z 26095 dodań i 26067 usunięć
  1. 1
    1
      index.html
  2. 26078
    26064
      libs/app.bundle.js
  3. 16
    2
      modules/xmpp/xmpp.js

+ 1
- 1
index.html Wyświetl plik

@@ -19,7 +19,7 @@
19 19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
20 20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
21 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 23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24 24
     <link rel="stylesheet" href="css/font.css?v=6"/>
25 25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 26078
- 26064
libs/app.bundle.js
Plik diff jest za duży
Wyświetl plik


+ 16
- 2
modules/xmpp/xmpp.js Wyświetl plik

@@ -3,6 +3,7 @@ var Moderator = require("./moderator");
3 3
 var EventEmitter = require("events");
4 4
 var Recording = require("./recording");
5 5
 var SDP = require("./SDP");
6
+var Settings = require("../settings/Settings");
6 7
 var Pako = require("pako");
7 8
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
8 9
 var UIEvents = require("../../service/UI/UIEvents");
@@ -27,6 +28,18 @@ function connect(jid, password) {
27 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 43
     var anonymousConnectionFailed = false;
31 44
     connection.connect(jid, password, function (status, msg) {
32 45
         console.log('Strophe status changed to',
@@ -371,11 +384,12 @@ var XMPP = {
371 384
                 break;
372 385
             case "email":
373 386
                 connection.emuc.addEmailToPresence(value);
387
+                break;
374 388
             default :
375
-                console.log("Unknown tag for presence.");
389
+                console.log("Unknown tag for presence: " + name);
376 390
                 return;
377 391
         }
378
-        if(!dontSend)
392
+        if (!dontSend)
379 393
             connection.emuc.sendPresence();
380 394
     },
381 395
     /**

Ładowanie…
Anuluj
Zapisz