From: Scott Worley <sworley@chkno.net>
Date: Fri, 3 Aug 2012 01:38:31 +0000 (-0700)
Subject: Merge skitch's changes.
X-Git-Url: http://git.scottworley.com/reliable-chat/commitdiff_plain/99c1f307f81cc3d92541e41bab1df1f79d83517e?ds=sidebyside

Merge skitch's changes.

Conflicts:
	webclient/rc.html
---

99c1f307f81cc3d92541e41bab1df1f79d83517e
diff --cc webclient/rc.html
index 8aeae37,9460159..b3109a9
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@@ -154,10 -185,17 +198,21 @@@
  				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");