X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/65fb54a3b32ff688adfa7c9e45ee1105e7ab658e..d7aa09ecdf7282d0f26d4b78f8c5e95c5330d40f:/webclient/rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 5d09dba..8f69921 100644
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -79,9 +79,9 @@
   <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");
@@ -116,7 +116,7 @@
 
 	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);
@@ -132,7 +132,7 @@
 			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");
 				}
@@ -179,9 +179,6 @@
 			status_indicator.setAttribute("class", "sad");
 			document.getElementById("status").appendChild(status_indicator);
 		}
-		if (rcnick() == 'anonymous') {
-			rcaddmessagetohistory("-!- Set your nick with /nick");
-		}
 	}
 
 	function rcsend(d, message) {
@@ -198,41 +195,28 @@
 		}
 	}
 
+	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) {
-			var input = document.input.say.value;
+			rcinput(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);
-
-			// Remind people to set their nick
-			if (rcnick() == 'anonymous') {
-				rcaddmessagetohistory("-!- Set your nick with /nick");
-			}
 		}
 	}
   //--><!]]></script>