deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-28 10:10:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #970 from thelounge/xpaw/fix-ident

Browse source 
Fix variable shuffling around ident handler
This commit is contained in:
Jérémie Astori 2017-03-17 20:56:59 -04:00 committed by GitHub
parent ff72ebbb74 c409328ddf
commit 52cc3ee909
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/identification.js
View file

@ -30,10 +30,10 @@ class Identification {
var address = server.address();
log.info(`Identd server available on ${colors.green(address.address + ":" + address.port)}`);
startedCallback();
startedCallback(this);
});
} else {
startedCallback();
startedCallback(this);
}
}

5
src/plugins/irc-events/connection.js
View file

@ -6,7 +6,6 @@ var Helper = require("../../helper");
module.exports = function(irc, network) {
var client = this;
var identHandler = this.manager.identHandler;
network.channels[0].pushMessage(client, new Msg({
text: "Network created, connecting to " + network.host + ":" + network.port + "..."
@ -65,12 +64,12 @@ module.exports = function(irc, network) {
let identSocketId;
irc.on("raw socket connected", function(socket) {
identSocketId = identHandler.addSocket(socket, client.name || network.username);
identSocketId = client.manager.identHandler.addSocket(socket, client.name || network.username);
});
irc.on("socket close", function() {
if (identSocketId > 0) {
identHandler.removeSocket(identSocketId);
client.manager.identHandler.removeSocket(identSocketId);
identSocketId = 0;
}
});

3
src/server.js
View file

@ -13,7 +13,6 @@ var ldap = require("ldapjs");
var colors = require("colors/safe");
const Identification = require("./identification");
let identHandler = null;
var manager = null;
var authFunction = localAuth;
@ -89,7 +88,7 @@ in ${config.public ? "public" : "private"} mode`);
manager = new ClientManager();
identHandler = new Identification(() => {
new Identification((identHandler) => {
manager.init(identHandler, sockets);
});
};