Don't send empty messages

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index df592d0a8639fc939f419f08468456180cf053c5..7f3e8d1bfaaca05d536bbe3a1cfc9b0004b5bf11 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -443,16 +443,22 @@
 
        function rcinput(input) {
                var message;
 
        function rcinput(input) {
                var message;

-               var re = /^\/([a-z]+) (.*)/
+               var re = /^\/(\S+)(\s(.*))?/;

                var match = re.exec(input);
                if (match) {
                var match = re.exec(input);
                if (match) {

-                       if (match[1] == 'me') {
-                               message = "* " + rcnick() + "  " + match[2];
-                       } else if (match[1] == 'nick') {
-                               message = "*** " + rcnick() + " is now known as " + match[2];
-                               rcsetnick(match[2]);
+                       var command = match[1];
+                       var rest = match[3];
+                       if (command == 'me') {
+                               message = "* " + rcnick() + "  " + rest;
+                       } else if (command == 'nick') {
+                               if (rcnick() == rest) {
+                                       rcaddmessagetoUI({'Text': '-!- Your nick is already ' + rcnick(), 'ServerTimes': {}});
+                                       return;
+                               }
+                               message = "*** " + rcnick() + " is now known as " + rest;
+                               rcsetnick(rest);

                        } else {
                        } else {

-                               rcaddmessagetoUI({'Text': '-!- No such command: ' + match[1], 'ServerTimes': {}});
+                               rcaddmessagetoUI({'Text': '-!- No such command: ' + command, 'ServerTimes': {}});

                                return;
                        }
                } else {
                                return;
                        }
                } else {


@@ -466,7 +472,9 @@
 
        function rckeydown(event) {
                if (event.keyCode == 13) {
 
        function rckeydown(event) {
                if (event.keyCode == 13) {

-                       rcinput(document.input.say.value);
+                       if (document.input.say.value) {
+                               rcinput(document.input.say.value);
+                       }

                        document.input.say.value = "";
                        return false;
                }
                        document.input.say.value = "";
                        return false;
                }