]> git.scottworley.com Git - reliable-chat/blobdiff - webclient/rc.html
rcaddmessagetohistory() accepts a message object
[reliable-chat] / webclient / rc.html
index 632956b21b522e6b7cc92c3b06bc15a30fcf8d5e..8f69921f4241c678fc0d565045b6abb6699b882d 100644 (file)
@@ -79,9 +79,9 @@
   <script type="text/javascript"><!--//--><![CDATA[//><!--
        var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
 
   <script type="text/javascript"><!--//--><![CDATA[//><!--
        var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
 
-       var session = Math.random();
-       var since = {};
-       var seen = {};
+       var session = Math.random();  // For outgoing message IDs
+       var since = {};  // server -> time: For fetch?since=
+       var seen = {};  // seen_key -> true
 
        function rcnick() {
                var nick = localStorage.getItem("nick");
 
        function rcnick() {
                var nick = localStorage.getItem("nick");
 
        function rcaddmessagetohistory(message) {
                var d = document.createElement("div");
 
        function rcaddmessagetohistory(message) {
                var d = document.createElement("div");
-               d.appendChild(document.createTextNode(message));
+               d.appendChild(document.createTextNode(message.Text));
                var h = document.getElementById("history");
                h.appendChild(d);
                window.scrollTo(0, document.body.scrollHeight);
                var h = document.getElementById("history");
                h.appendChild(d);
                window.scrollTo(0, document.body.scrollHeight);
                        var seen_key = make_seen_key(messages[i]['ID'], messages[i]['Text']);
                        if (!(seen_key in seen)) {
                                seen[seen_key] = true;
                        var seen_key = make_seen_key(messages[i]['ID'], messages[i]['Text']);
                        if (!(seen_key in seen)) {
                                seen[seen_key] = true;
-                               rcaddmessagetohistory(messages[i]['Text']);
+                               rcaddmessagetohistory(messages[i]);
                                for (var i in servers) {
                                        rcchangeserverstatus(servers[i], "sad");
                                }
                                for (var i in servers) {
                                        rcchangeserverstatus(servers[i], "sad");
                                }
                }
        }
 
                }
        }
 
+       function rcinput(input) {
+               var message;
+               var re = /^\/([a-z]+) (.*)/
+               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]);
+               } else {
+                       message = "<" + rcnick() + "> " + input;
+               }
+
+               var d = rcaddmessagetohistory({'Text': message});
+               rcsend(d, message);
+       }
+
        function rckeydown(event) {
                if (event.keyCode == 13) {
        function rckeydown(event) {
                if (event.keyCode == 13) {
-                       var input = document.input.say.value;
+                       rcinput(document.input.say.value);
                        document.input.say.value = "";
                        
                        document.input.say.value = "";
                        
-                       // Check nick change
-                       var message;
-                       var re = /^\/nick (.*)/;
-                       var match = re.exec(input);
-                       if (match) {
-                               message = "*** " + rcnick() + " is now known as " + match[1];
-                               rcsetnick(match[1]);
-                       } else {
-                               message = "<" + rcnick() + "> " + input;
-                       }
-
-                       // /me support
-                       var message;
-                       var re = /^\/me (.*)/;
-                       var match = re.exec(input);
-                       var inputme = input.substring(4);
-                       if (match) {
-                               message = "* " + rcnick() + "  " + inputme;
-                       } else {
-                               message = "<" + rcnick() + "> " + input;
-                       }
-
-                       // Say the message
-                       var d = rcaddmessagetohistory(message);
-                       rcsend(d, message);
                }
        }
   //--><!]]></script>
                }
        }
   //--><!]]></script>