Fixed notices

diff --git a/js/front.js b/js/front.js
index a43d31416966e9a4be9d36575962b14da538a126..d09087d70cafcbbd708a41031231e1909ce0a5b5 100644 (file)
--- 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 4183802607c5a28deaf7e162fca4e13025f1bd8b..ae4d23158064c9d8284b21b11c80c24d07c854a9 100644 (file)
--- 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});