From 3f4aa6a520f633d7f3bf194c826489f035a0a715 Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Sat, 30 Jul 2011 01:57:22 +0100
Subject: [PATCH] Fixed notices

---
 js/front.js  | 21 ++++++++++++---------
 node/kiwi.js |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/js/front.js b/js/front.js
index a43d314..d09087d 100644
--- a/js/front.js
+++ b/js/front.js
@@ -316,11 +316,13 @@ var front = {
 			if (msg.trim() === '') {
                 return;
             }
-			gateway.msg(front.cur_channel.name, msg);
-			var d = new Date();
-			d = d.getHours() + ":" + d.getMinutes();
-			//front.addMsg(d, gateway.nick, msg);
-			front.cur_channel.addMsg(null, gateway.nick, msg);
+            if (front.cur_channel.name !== 'server') {
+				gateway.msg(front.cur_channel.name, msg);
+				var d = new Date();
+				d = d.getHours() + ":" + d.getMinutes();
+				//front.addMsg(d, gateway.nick, msg);
+				front.cur_channel.addMsg(null, gateway.nick, msg);
+			}
 		}
 	},
 	
@@ -369,14 +371,14 @@ var front = {
 	},
 	
 	onNotice: function (e, data) {
-		var nick = (data.nick === "") ? "" : '[' + data.nick + ']';
+		var nick = (data.nick === undefined || data.nick === '') ? '' : '[' + data.nick + ']';
 		if (data.channel !== undefined) {
-			//alert('notice for '+data.channel);
 			if (front.tabviewExists(data.channel)) {
 				front.tabviews[data.channel.toLowerCase()].addMsg(null, nick, data.msg, 'notice');
+			} else {
+				front.tabviews.server.addMsg(null, nick, data.msg, 'notice');
 			}
 		} else {
-			//alert('direct notice');
 			front.tabviews.server.addMsg(null, nick, data.msg, 'notice');
 		}
 	},
@@ -568,7 +570,8 @@ var front = {
             front.tabviews.server.addMsg(null, ' ', '=== ' + data.nick + ': ' + data.reason, 'status'); 
             break;
         default:
-            front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');
+        	// We don't know what data contains, so don't do anything with it.
+            //front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');
         }
     },
     
diff --git a/node/kiwi.js b/node/kiwi.js
index 4183802..ae4d231 100644
--- a/node/kiwi.js
+++ b/node/kiwi.js
@@ -207,7 +207,7 @@ var parseIRCMessage = function (websocket, ircSocket, data) {
             websocket.emit('message', {event: 'channel_redirect', from: params[1], to: params[2]});
             break;
         case ircNumerics.ERR_NOSUCHNICK:
-			websocket.emit('message', {event: 'irc_error', error: 'no_suck_nick', nick: msg.params.split(" ")[1], reason: msg.trailing});
+			websocket.emit('message', {event: 'irc_error', error: 'no_such_nick', nick: msg.params.split(" ")[1], reason: msg.trailing});
 			break;
         case 'JOIN':
             websocket.emit('message', {event: 'join', nick: msg.nick, ident: msg.ident, hostname: msg.hostname, channel: msg.trailing});
-- 
2.25.1