Fix /me and /nick

2 files changed, 16 insertions, 5 deletions

diff --git a/src/cmd.c b/src/cmd.c
index 9d38c31..cdd7dd7 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -194,7 +194,7 @@ static void do_me(void) {
 		return;
 	}
 
-	txbuf_set_str3("PRIVMSG ", target, " :" " \x01" "ACTION ");
+	txbuf_set_str3("PRIVMSG ", target, " :" "\x01" "ACTION ");
 	txbuf_append_str2(arg1, "\x01");
 	txbuf_send();
 }
@@ -265,9 +265,11 @@ static void do_msg(void) {
 static int cmd_local(void) {
 	arg1 = nextarg(command);
 
+	/*
 	scr_print_current("command: ");
 	scr_print_current(command);
 	scr_print_current("\n");
+	*/
 
 	for(cmd_def = &command_defs[0]; cmd_def->cmd; cmd_def++) {
 		if(streq_i(command, cmd_def->cmd)) {
@@ -276,12 +278,12 @@ static int cmd_local(void) {
 			} else {
 				(*(cmd_def->func))();
 			}
-			scr_print_current("(did local command)\n");
+			// scr_print_current("(did local command)\n");
 			return 1;
 		}
 	}
 
-	scr_print_current("(not a local command)\n");
+	// scr_print_current("(not a local command)\n");
 	return 0;
 }
 
diff --git a/src/irc.c b/src/irc.c
index e48ef6d..0c1e4cd 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -115,7 +115,7 @@ static void do_nick(void) {
 		scr_print_active(msg_src);
 		scr_print_active(" is ");
 	}
-	scr_print_active(" now known as ");
+	scr_print_active("now known as ");
 	scr_print_active(msg_dest);
 	scr_eol_active();
 }
@@ -355,6 +355,12 @@ static void parse_msg(void) {
 	/* ignore empty message */
 	if(!*msg) return;
 
+	/*
+	scr_print_active("RAW: ");
+	scr_print_active(msg);
+	scr_print_active("\n");
+	*/
+
 	/* if there's a final multiword arg... */
 	/* FIXME: channel names can have colons, which breaks this... */
 	p = strstr(msg + 1, " :"); /* +1 to skip leading colon in msg source */
@@ -399,7 +405,10 @@ static void parse_msg(void) {
 			}
 		}
 	}
-	if(msg_argcount) msg_dest = msg_args[0];
+	if(msg_argcount)
+		msg_dest = msg_args[0];
+	else if(msg_text)
+		msg_dest = msg_text;
 
 	if(msg_src) {
 		if((p = strstr(msg_src, "!"))) {