Merge pull request #385 from TimPeterson/case-insensitive-nicks

Fix case-sensitivity bug where some received private messages fail to display

diff --git a/client/assets/src/models/gateway.js b/client/assets/src/models/gateway.js
index 292c86a21e930902f92939945443d84fb720df85..0a010b7734d0d2b22006212a7b4a3cc9ed79b8ca 100644 (file)
--- a/client/assets/src/models/gateway.js
+++ b/client/assets/src/models/gateway.js
@@ -79,7 +79,7 @@ _kiwi.model.Gateway = function () {
         this.on('onmsg', function (event) {\r
             var source,\r
                 connection = _kiwi.app.connections.getByConnectionId(event.server),\r
-                is_pm = (event.channel == connection.get('nick'));\r
+                is_pm = (event.channel.toLowerCase() == connection.get('nick').toLowerCase());\r
 \r
             source = is_pm ? event.nick : event.channel;\r
 \r
@@ -105,7 +105,7 @@ _kiwi.model.Gateway = function () {
         this.on('onaction', function (event) {\r
             var source,\r
                 connection = _kiwi.app.connections.getByConnectionId(event.server),\r
-                is_pm = (event.channel == connection.get('nick'));\r
+                is_pm = (event.channel.toLowerCase() == connection.get('nick').toLowerCase());\r
 \r
             source = is_pm ? event.nick : event.channel;\r
 \r

diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js
index 08dd97f2f0a92ee78887064c18d5feec11d5747c..da6ed21c9385a648260a467c2def80a58453d2c1 100644 (file)
--- a/client/assets/src/models/network.js
+++ b/client/assets/src/models/network.js
@@ -353,7 +353,7 @@
 
     function onMsg(event) {
         var panel,
-            is_pm = (event.channel == this.get('nick'));
+            is_pm = (event.channel.toLowerCase() == this.get('nick').toLowerCase());
 
         // An ignored user? don't do anything with it
         if (_kiwi.gateway.isNickIgnored(event.nick)) {
@@ -466,7 +466,7 @@
 
     function onAction(event) {
         var panel,
-            is_pm = (event.channel == this.get('nick'));
+            is_pm = (event.channel.toLowerCase() == this.get('nick').toLowerCase());
 
         // An ignored user? don't do anything with it
         if (_kiwi.gateway.isNickIgnored(event.nick)) {

diff --git a/server/irc/commands.js b/server/irc/commands.js
index 96943a39992ea2342c3f89fa98ca0072b3fe645e..e8c08ea01e2da3f60236faf02f0960324d640298 100644 (file)
--- a/server/irc/commands.js
+++ b/server/irc/commands.js
@@ -390,7 +390,7 @@ handlers = {
 
         if ((command.trailing.charAt(0) === String.fromCharCode(1)) && (command.trailing.charAt(command.trailing.length - 1) === String.fromCharCode(1))) {
             // It's a CTCP response
-            namespace = (command.params[0] == this.irc_connection.nick) ? 'user' : 'channel';
+            namespace = (command.params[0].toLowerCase() == this.irc_connection.nick.toLowerCase()) ? 'user' : 'channel';
             this.irc_connection.emit(namespace + ' ' + command.params[0] + ' ctcp_response', {
                 nick: command.nick,
                 ident: command.ident,
@@ -399,7 +399,7 @@ handlers = {
                 msg: command.trailing.substr(1, command.trailing.length - 2)
             });
         } else {
-            namespace = (command.params[0] == this.irc_connection.nick || command.params[0] == '*') ?
+            namespace = (command.params[0].toLowerCase() == this.irc_connection.nick.toLowerCase() || command.params[0] == '*') ?
                 'user' :
                 'channel';
 
@@ -525,7 +525,7 @@ handlers = {
             }
         } else {
             // A message to a user (private message) or to a channel?
-            namespace = (command.params[0] === this.irc_connection.nick) ? 'user ' + command.nick : 'channel ' + command.params[0];
+            namespace = (command.params[0].toLowerCase() == this.irc_connection.nick.toLowerCase()) ? 'user ' + command.nick : 'channel ' + command.params[0];
             this.irc_connection.emit(namespace + ' privmsg', {
                 nick: command.nick,
                 ident: command.ident,
@@ -857,4 +857,4 @@ function genericNotice (command, msg, is_error) {
         msg: msg,
         numeric: parseInt(command.command, 10)
     });
-}
\ No newline at end of file
+}