From cdbf2b6f0a63bc9a9a1e2af1383fa51bf1403ae4 Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 2 May 2013 11:36:57 +0100 Subject: [PATCH] /server command --- client/assets/dev/model_application.js | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js index 2b65e37..142b30a 100644 --- a/client/assets/dev/model_application.js +++ b/client/assets/dev/model_application.js @@ -410,6 +410,8 @@ _kiwi.model.Application = function () { controlbox.on('command:ctcp', ctcpCommand); + controlbox.on('command:server', serverCommand); + controlbox.on('command:css', function (ev) { var queryString = '?reload=' + new Date().getTime(); @@ -711,6 +713,57 @@ _kiwi.model.Application = function () { } + function serverCommand (ev) { + var server, port, ssl, password, nick, + tmp; + + if (!ev.params[0]) return; + + // Port given in 'host:port' format and no specific port given after a space + if (ev.params[0].indexOf(':') > 0) { + tmp = ev.params[0].split(':'); + server = tmp[0]; + port = tmp[1]; + + password = ev.params[1] || undefined; + + } else { + // Server + port given as 'host port' + server = ev.params[0]; + port = ev.params[1] || 6667; + + password = ev.params[2] || undefined; + } + + // + in the port means SSL + if (port.toString()[0] === '+') { + ssl = true; + port = parseInt(port.substring(1), 10); + } else { + ssl = false; + } + + // Default port if one wasn't found + port = port || 6667; + + // Use the same nick as we currently have + nick = _kiwi.app.connections.active_connection.get('nick'); + + _kiwi.app.panels().active.addMsg('', 'Connecting to ' + server + ':' + port.toString() + '..'); + + _kiwi.gateway.newConnection({ + nick: nick, + host: server, + port: port, + ssl: ssl, + password: password + }, function(err, new_connection) { + if (err) + _kiwi.app.panels().active.addMsg('', 'Error connecting to ' + server + ':' + port.toString() + ' (' + err.toString() + ')'); + }); + } + + -- 2.25.1