IcyNetwork/teemant-old
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CRITICAL FIX: retarded config system

Browse Source
This commit is contained in:
Evert Prants 2016-09-24 16:24:55 +03:00
parent 01af0d83e9
commit 8b8a09ac97
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/irc.js
View File

@ -3,18 +3,6 @@ let net = require('net');
let configuration = require(__dirname+"/config"); let configuration = require(__dirname+"/config");
let parse = require(__dirname+"/parser"); let parse = require(__dirname+"/parser");
let defaultConfig = {
nickname: "teemant",
username: configuration.client.username,
realname: configuration.client.realname,
server: "localhost",
port: 6667,
autojoin: [],
secure: configuration.client.secure_by_default,
password: "",
address: "0.0.0.0"
}
if (!String.prototype.format) { if (!String.prototype.format) {
String.prototype.format = function() { String.prototype.format = function() {
var args = arguments; var args = arguments;
@ -24,20 +12,6 @@ if (!String.prototype.format) {
}; };
} }
class ConfigPatcher {
constructor(provided, defaults) {
this.result = defaults;
this.patches = provided;
}
patch() {
for(let a in this.patches) {
this.result[a] = this.patches[a];
}
return this.result;
}
}
class IRCConnectionHandler { class IRCConnectionHandler {
constructor(connection) { constructor(connection) {
this.conn = connection; this.conn = connection;
@ -224,9 +198,23 @@ class IRCConnectionHandler {
class IRCConnection extends EventEmitter { class IRCConnection extends EventEmitter {
constructor(providedInfo) { constructor(providedInfo) {
super(); super();
let config_u = new ConfigPatcher(providedInfo, defaultConfig);
this.config = config_u.patch(); this.config = {
nickname: "teemant",
username: configuration.client.username,
realname: configuration.client.realname,
server: "localhost",
port: 6667,
autojoin: [],
secure: configuration.client.secure_by_default,
password: "",
address: "0.0.0.0"
};
for(let a in providedInfo) {
this.config[a] = providedInfo[a];
}
this.socket = null; this.socket = null;
this.connected = false; this.connected = false;
this.authenticated = false; this.authenticated = false;