Don't send empty messages

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index d9b02a8986d6234728b054c20d44072a026dbd15..7f3e8d1bfaaca05d536bbe3a1cfc9b0004b5bf11 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -147,7 +147,7 @@
 
   /*]]>*/--></style>
   <script type="text/javascript"><!--//--><![CDATA[//><!--
-       var servers = ['chkno.net', 'rc2.chkno.net', 'reliablechat-chk.rhcloud.com:80', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
+       var servers = ['chkno.net', 'rc2.chkno.net', 'reliablechat-chk.rhcloud.com:80', 'intense-basin-3395.herokuapp.com:80', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
 
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
@@ -303,13 +303,20 @@
                        history.push(message);
                        message_i = history.length-1;
                }
+               if (message_i + 1 < history.length) {
+                       rcaddmessagetoUI(message, history[message_i + 1].UI);
+               } else {
+                       rcaddmessagetoUI(message, null);
+               }
+       }
 
+       function rcaddmessagetoUI(message, before) {
                if (!message.UI) {
                        rcmakemessageUI(message);
                }
                var h = document.getElementById("history");
-               if (message_i + 1 < history.length) {
-                       h.insertBefore(message.UI, history[message_i + 1].UI);
+               if (before) {
+                       h.insertBefore(message.UI, before);
                } else {
                        h.appendChild(message.UI);
                }
@@ -436,13 +443,24 @@
 
        function rcinput(input) {
                var message;
-               var re = /^\/([a-z]+) (.*)/
+               var re = /^\/(\S+)(\s(.*))?/;
                var match = re.exec(input);
-               if (match && match[1] == 'me') {
-                       message = "* " + rcnick() + "  " + match[2];
-               } else if (match && match[1] == 'nick') {
-                       message = "*** " + rcnick() + " is now known as " + match[2];
-                       rcsetnick(match[2]);
+               if (match) {
+                       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 {
+                               rcaddmessagetoUI({'Text': '-!- No such command: ' + command, 'ServerTimes': {}});
+                               return;
+                       }
                } else {
                        message = "<" + rcnick() + "> " + input;
                }
@@ -454,7 +472,9 @@
 
        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;
                }