Merge pull request #283 from fbm-static/patch/02

fix commands magically being removed
This commit is contained in:
Mattias Erming 2014-11-14 00:22:01 +01:00
commit c3c2b5487c
2 changed files with 12 additions and 9 deletions

View File

@ -135,9 +135,9 @@ Client.prototype.connect = function(args) {
server.socket = socket;
}
}
var stream = args.tls ? tls.connect(server) : net.connect(server);
stream.on("error", function(e) {
console.log("Client#connect():\n" + e);
stream.end();
@ -173,6 +173,7 @@ Client.prototype.connect = function(args) {
password: args.password,
username: username,
realname: realname,
commands: args.commands
});
network.irc = irc;
@ -329,7 +330,7 @@ Client.prototype.save = function(force) {
if(config.public) {
return;
}
if (!force) {
clearTimeout(timer);
timer = setTimeout(function() {
@ -337,24 +338,24 @@ Client.prototype.save = function(force) {
}, 1000);
return;
}
var name = this.name;
var path = Helper.HOME + "/users/" + name + ".json";
var networks = _.map(
this.networks,
function(n) {
return n.export();
}
);
var json = {};
fs.readFile(path, "utf-8", function(err, data) {
if (err) {
console.log(err);
return;
}
try {
json = JSON.parse(data);
json.networks = networks;
@ -362,7 +363,7 @@ Client.prototype.save = function(force) {
console.log(e);
return;
}
fs.writeFile(
path,
JSON.stringify(json, null, " "),

View File

@ -12,6 +12,7 @@ function Network(attr) {
port: 6667,
tls: false,
password: "",
commands: [],
username: "",
realname: "",
channels: [],
@ -41,7 +42,8 @@ Network.prototype.export = function() {
"tls",
"password",
"username",
"realname"
"realname",
"commands"
]);
network.nick = (this.irc || {}).me;
network.join = _.pluck(