type = "status";
} else if (/^\* /.test(message.Text)) {
type = "me";
+ } else if (/^-!- /.test(message.Text)) {
+ type = "local";
} else {
type = "text";
}
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 {
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;
}