From 25e9f24d8b4b794feb88e0727cf7fb23b4b0d4a4 Mon Sep 17 00:00:00 2001 From: fbm-static Date: Mon, 10 Nov 2014 00:01:22 +0800 Subject: [PATCH] fix commands not being removed --- src/client.js | 17 +++++++++-------- src/models/network.js | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/client.js b/src/client.js index 853e0e16..805c8a15 100644 --- a/src/client.js +++ b/src/client.js @@ -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, " "), diff --git a/src/models/network.js b/src/models/network.js index efd302c6..87556275 100644 --- a/src/models/network.js +++ b/src/models/network.js @@ -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(