From d8568ae27a743b6ecc97dd090c40611c8dea4903 Mon Sep 17 00:00:00 2001
From: root <darren@darrenwhitlen.com>
Date: Fri, 22 Jul 2011 23:55:22 +0000
Subject: [PATCH] CTCP PING/VERSION fix

---
 img/Thumbs.db               | Bin 0 -> 3072 bytes
 js/front.js                 |   1 +
 node/client/index.html.jade |   2 +-
 node/kiwi.js                |   3 +--
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 img/Thumbs.db

diff --git a/img/Thumbs.db b/img/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..5ffc0f10823e3dcc37d9477f965a0e98a1c2b1b4
GIT binary patch
literal 3072
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW`V}#5OV&gQz;CAAclM(EMZV!aAn8?(nSoFu&hiJEylnK&-3uI0f){7
zg1YmLd7NQn2Ff1*5kO$XV9H>|5YJ%AkOstw3`q<r3>FNjV73W^F;Lb7EDBMLNop}L
zF@nk=STJC!z%KG1qzMRM_8WoiHv_sQmBAe73KO6^l7M0$`$2BP1%UR$?FP94mpWu|
z9w4V1S%5+|%<sh7k8B+%&Oku{iVjfzX9Z$Vna>Wy96-zo#9Tnk4aA@_f)_~hLD|Um
zj<Sbl2uJ|q5)}8(q4~jVll`}%${p;T0e<ehTvDK@=k@e(2?ElfXy@YqB@THH-HSkq
zu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbsz(m9}(bL5-#KJ!|DB5FkqD0-l!_UloHShQ=
z^(~(ENHfqnR;4u9yiNRJ?uDnjx^|sa;j(H-vD$udf0u`%=NF~PA`34Bcn44KP`hcg
z(I&;R{Kx;?`}h9&ep$qRuls%Nz30E>?!9LeRE)c?qW*Qdtm1m_p#Ix?=SEGDF^MRc
zQ|IAdW+|sNZPxqA>(_I;=f@s+rER`%*Bp`e$2ThM%vii#wzWKa!<E}@H?KWoIlgy)
zUHg_|W(~_=mi_5$ZI^;-Ud?s-b+cGNqwT=#@)PS!mCfF^YF_6$|3D_l?`qR)O|1o9
z(WXwt^B1Noo>;_K&F!DGshUMoiQn5-R7tqGgOkgp(f!jxBc3fhjh{WrxNb-%YWcRe
z-FNX>-5TfFx@?t<qONmFg^<#5MYVh<LzTq38d275(hnYS&nPvyRP>oSLi^Ie6a5_P
z86Wc|C^>Ihq@eRc!Nv8@tSIMWs?wj<$2=A~WU+6@+$Xga!qfhkyyy&fRdNcH%+z{&
zUEtaBT8(X2m7j0w?LM!*P0HQkkmH@r{QEcrKCp&l2eu@)=!!Kzn!fOU{-J4ZcO>tN
z`Q40t^7f_6y_ZE9PYog_b(r4dw_I^+is;v0A`$&l6E?2qHNJGY#r5GH%gJF@^B3;8
z)6{!0@N4S=t1}A}dA9^!-E`=H6VJc<uTQMhIdbUrc8=f5ymvky{uvSy-k5OTV2e)A
ziW81g6Q4e}nsGq!c1BBsfQ0ggT_G=4`zO3P%CTc%U*4~}uS%PYT|OjnaJ<^^BfNjj
zE~^eJ#?$>)3FrPWyZ&{K4dH)p)xYN#o60APi?^KeHcxC@qn2f#u%zGbdY+nXUT0j|
zvcP&zJ=<+FGS<9|Yr4(*spqh-uN!x5K=H5o6USrucFirFa4hQW?mPB#OjE?RR2Xgo
zCRPSdS3j3^P6<s6u=HOH5(R=E7FAOUKW-MmlKw$?feW1edyUTT1#<AEe+F4l`qv0f
sPDx0(!E=O#QP@#5fORp~$2O6R2bmdk`x%bk(Mh-rvJ&nV5Qp9X0E_W6lmGw#

literal 0
HcmV?d00001

diff --git a/js/front.js b/js/front.js
index dc7c187..9f96d3a 100644
--- a/js/front.js
+++ b/js/front.js
@@ -325,6 +325,7 @@ var front = {
         var msg = data.msg.split(" ", 2);
         switch (msg[0]) {
         case 'PING':
+        	if(typeof msg[1] === 'undefined') msg[1] = '';
             gateway.notice(data.nick, '\001PING ' + msg[1] + '\001');
             break;
         case 'TIME':
diff --git a/node/client/index.html.jade b/node/client/index.html.jade
index 3633cd6..77e9dbe 100644
--- a/node/client/index.html.jade
+++ b/node/client/index.html.jade
@@ -62,7 +62,7 @@ html(xmlns="http://www.w3.org/1999/xhtml", lang="en-gb")
                     return false;
                 });
                 $('a.connect').click(function(){ $('.formconnectwindow').submit(); return false; });
-                $('a.chan').live('dblclick', function() {
+                $('a.chan').live('click', function() {
                     front.joinChannel($(this).text());
                     return false;
                 });
diff --git a/node/kiwi.js b/node/kiwi.js
index d7457c4..9cd6563 100644
--- a/node/kiwi.js
+++ b/node/kiwi.js
@@ -197,8 +197,7 @@ var parseIRCMessage = function (websocket, ircSocket, data) {
                 if (msg.trailing.substr(1, 6) === 'ACTION') {
                     websocket.emit('message', {event: 'action', nick: msg.nick, ident: msg.ident, hostname: msg.hostname, channel: msg.params.trim(), msg: msg.trailing.substr(1, msg.trailing.length - 2)});
                 } else if (msg.trailing.substr(1, 7) === 'VERSION') {
-                    console.log('NOTICE ' + msg.nick + ':\001VERSION KiwiIRC\001\r\n');
-                    ircSocket.write('NOTICE ' + msg.nick + ':\001VERSION KiwiIRC\001\r\n');
+                    ircSocket.write('NOTICE ' + msg.nick + ' :\001VERSION KiwiIRC\001\r\n');
                 } else {
                     websocket.emit('message', {event: 'ctcp_request', nick: msg.nick, ident: msg.ident, hostname: msg.hostname, channel: msg.params.trim(), msg: msg.trailing.substr(1, msg.trailing.length - 2)});
                 }
-- 
2.25.1