haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes uid, email and displayName advertisement in MUC presence.

This commit is contained in:
paweldomas 2015-03-25 12:39:22 +01:00
parent dbcfc92dc4
commit f98621173f
3 changed files with 18339 additions and 18311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

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

36630
libs/app.bundle.js
View File

File diff suppressed because it is too large Load Diff

18
modules/xmpp/xmpp.js
View File

@ -3,6 +3,7 @@ var Moderator = require("./moderator");
var EventEmitter = require("events");
var Recording = require("./recording");
var SDP = require("./SDP");
var Settings = require("../settings/Settings");
var Pako = require("pako");
var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
var UIEvents = require("../../service/UI/UIEvents");
@ -27,6 +28,18 @@ function connect(jid, password) {
connection.jingle.pc_constraints.optional.push({googIPv6: true});
}
// Include user info in MUC presence
var settings = Settings.getSettings();
if (settings.email) {
connection.emuc.addEmailToPresence(settings.email);
}
if (settings.uid) {
connection.emuc.addUserIdToPresence(settings.uid);
}
if (settings.displayName) {
connection.emuc.addDisplayNameToPresence(settings.displayName);
}
var anonymousConnectionFailed = false;
connection.connect(jid, password, function (status, msg) {
console.log('Strophe status changed to',
@ -371,11 +384,12 @@ var XMPP = {
break;
case "email":
connection.emuc.addEmailToPresence(value);
break;
default :
console.log("Unknown tag for presence.");
console.log("Unknown tag for presence: " + name);
return;
}
if(!dontSend)
if (!dontSend)
connection.emuc.sendPresence();
},
/**