X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/16f7340b1fdda0273a3a28656b5c4cba99583371..7310ffeebfda8540d2113fc8c846971a0f913d57:/webclient/rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index df592d0..c1d36b2 100644
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -61,6 +61,18 @@
 		font-size: 85%;
 		text-align: right;
 	}
+	.status {
+		color: #dd8;
+	}
+	.local.self {
+		color: #d8d;
+	}
+	.self {
+		color: #8d8;
+	}
+	.me {
+		color: #bbd;
+	}
 	.servercount {
 		margin-right: -0.5em;
 		font-size: 70%;
@@ -258,6 +270,8 @@
 			type = "status";
 		} else if (/^\* /.test(message.Text)) {
 			type = "me";
+		} else if (/^-!- /.test(message.Text)) {
+			type = "local";
 		} else {
 			type = "text";
 		}
@@ -434,25 +448,30 @@
 			"?id=" + encodeURIComponent(message.ID) +
 			"&text=" + encodeURIComponent(message.Text);
 		for (var i in servers) {
-			var uri = rcserverbase(servers[i]) + path;
-			var img = document.createElement("img");
-			img.setAttribute("src", uri);
-			d.appendChild(img);
+			var xhr = new XMLHttpRequest();
+			xhr.open("POST", rcserverbase(servers[i]) + path);
+			xhr.send();
 		}
 	}
 
 	function rcinput(input) {
 		var message;
-		var re = /^\/([a-z]+) (.*)/
+		var re = /^\/(\S+)(\s(.*))?/;
 		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 {
-				rcaddmessagetoUI({'Text': '-!- No such command: ' + match[1], 'ServerTimes': {}});
+				rcaddmessagetoUI({'Text': '-!- No such command: ' + command, 'ServerTimes': {}});
 				return;
 			}
 		} else {
@@ -466,7 +485,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;
 		}