Correctly using /quit command without reconnecting #567

diff --git a/client/src/app.js b/client/src/app.js
index c759d994cf2801a282c185d46d408cbf1c2036f0..add00f143c212178f4c1b2f7b6d60512dae0d163 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -106,7 +106,7 @@ _kiwi.global = {
                 part: 'part', join: 'join', action: 'action', ctcp: 'ctcp',\r
                 ctcpRequest: 'ctcpRequest', ctcpResponse: 'ctcpResponse',\r
                 notice: 'notice', msg: 'privmsg', changeNick: 'changeNick',\r
-                channelInfo: 'channelInfo', mode: 'mode'\r
+                channelInfo: 'channelInfo', mode: 'mode', quit: 'quit'\r
             };\r
 \r
             // Proxy each gateway method\r

diff --git a/client/src/misc/clientuicommands.js b/client/src/misc/clientuicommands.js
index eff0dcf2f8b68b027ea9026ccdc3ac40265bc92d..e20b387bb7ede259f6cfb8c17a6c981dd3b69efc 100644 (file)
--- a/client/src/misc/clientuicommands.js
+++ b/client/src/misc/clientuicommands.js
@@ -75,6 +75,7 @@
         'command:kick':        kickCommand,
         'command:clear':       clearCommand,
         'command:ctcp':        ctcpCommand,
+        'command:quit':        quitCommand,
         'command:server':      serverCommand,
         'command:whois':       whoisCommand,
         'command:whowas':      whowasCommand,
@@ -517,6 +518,16 @@
     }
 
 
+    function quitCommand (ev) {
+        var network = this.app.connections.active_connection;
+
+        if (!network)
+            return;
+
+        network.gateway.quit(ev.params.join(' '));
+    }
+
+
     function serverCommand (ev) {
         var that = this,
             server, port, ssl, password, nick,

diff --git a/server/clientcommands.js b/server/clientcommands.js
index a60a6e64cebda42eb3c262b0a7c7f4ee35a9aa05..e8abdb587a531e5e3624595b577dc19003348715 100644 (file)
--- a/server/clientcommands.js
+++ b/server/clientcommands.js
@@ -183,10 +183,7 @@ var listeners = {
 \r
 \r
     quit: function (irc_connection, callback, args) {\r
-        websocket.ircConnection.end('QUIT :' + args.message + '\r\n');\r
-        websocket.sentQUIT = true;\r
-        websocket.ircConnection.destroySoon();\r
-        websocket.disconnect();\r
+        irc_connection.end('QUIT :' + (args.message||''));\r
     },\r
 \r
 \r