1 files changed, 56 insertions, 58 deletions

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index a8d52745..40ca306d 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -36,32 +36,8 @@
 
 #include "fe-queries.h"
 #include "window-items.h"
-
-static const char *skip_target(IRC_SERVER_REC *server, const char *target)
-{
-	int i = 0;
-	const char *val, *chars;
-
-	/* Quick check */
-	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
-		return target;
-
-	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
-	 * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
-	val = g_hash_table_lookup(server->isupport, "STATUSMSG");
-	if (val == NULL && *target != '@')
-		return target;
-	chars = val ? val : "@+";
-	for(i = 0; target[i] != '\0'; i++) {
-		if (strchr(chars, target[i]) == NULL)
-			break;
-	};
-
-	if(ischannel(target[i]))
-		target += i;
-
-	return target;
-}
+#include "fe-irc-channels.h"
+#include "fe-irc-server.h"
 
 static void sig_message_own_public(SERVER_REC *server, const char *msg,
 				   const char *target, const char *origtarget)
@@ -72,7 +48,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
 	if (!IS_IRC_SERVER(server))
 		return;
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 	if (target != oldtarget) {
 		/* Hybrid 6 / Bahamut feature, send msg to all
 		   ops / ops+voices in channel */
@@ -87,7 +63,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
 		g_free(nickmode);
                 signal_stop();
 	}
-	
+
 }
 
 /* received msg to all ops in channel */
@@ -95,18 +71,28 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 				      const char *nick, const char *address,
 				      const char *target)
 {
-	char *nickmode, *optarget;
+	char *nickmode, *optarget, *prefix;
+	const char *cleantarget;
 
-	nickmode = channel_get_nickmode(channel_find(server, target),
+	/* only skip here so the difference can be stored in prefix */
+	cleantarget = fe_channel_skip_prefix(IRC_SERVER(server), target);
+	prefix = g_strndup(target, cleantarget - target);
+
+	/* and clean the rest here */
+	cleantarget = get_visible_target(IRC_SERVER(server), cleantarget);
+
+	nickmode = channel_get_nickmode(channel_find(server, cleantarget),
 					nick);
 
-        optarget = g_strconcat("@", target, NULL);
-	printformat_module("fe-common/core", server, target,
+	optarget = g_strconcat(prefix, cleantarget, NULL);
+
+	printformat_module("fe-common/core", server, cleantarget,
 			   MSGLEVEL_PUBLIC,
 			   TXT_PUBMSG_CHANNEL,
 			   nick, optarget, msg, nickmode);
 	g_free(nickmode);
-        g_free(optarget);
+	g_free(optarget);
+	g_free(prefix);
 }
 
 static void sig_message_own_wall(SERVER_REC *server, const char *msg,
@@ -117,7 +103,8 @@ static void sig_message_own_wall(SERVER_REC *server, const char *msg,
 	nickmode = channel_get_nickmode(channel_find(server, target),
 					server->nick);
 
-        optarget = g_strconcat("@", target, NULL);
+	/* this is always @, skip_prefix is not needed here */
+	optarget = g_strconcat("@", target, NULL);
 	printformat_module("fe-common/core", server, target,
 			   MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT |
 			   MSGLEVEL_NO_ACT,
@@ -135,8 +122,8 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
         char *freemsg = NULL;
 
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
-        if (ischannel(*target))
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
+	if (server_ischannel(SERVER(server), target))
 		item = irc_channel_find(server, target);
 	else
 		item = irc_query_find(server, target);
@@ -146,7 +133,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 
 	printformat(server, target,
 		    MSGLEVEL_ACTIONS | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT |
-		    (ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS),
+		    (server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS),
 		    item != NULL && oldtarget == target ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
 		    server->nick, msg, oldtarget);
         g_free_not_null(freemsg);
@@ -160,12 +147,13 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	const char *oldtarget;
         char *freemsg = NULL;
 	int level;
+	int own = FALSE;
 
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 
 	level = MSGLEVEL_ACTIONS |
-		(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
+		(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
 
 	if (ignore_check(SERVER(server), nick, address, target, msg, level))
 		return;
@@ -174,15 +162,17 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 			 level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ischannel(*target))
+	if (server_ischannel(SERVER(server), target)) {
 		item = irc_channel_find(server, target);
-        else
-		item = privmsg_get_query(SERVER(server), nick, FALSE, level);
+	} else {
+		own = (!g_strcmp0(nick, server->nick));
+		item = privmsg_get_query(SERVER(server), own ? target : nick, FALSE, level);
+	}
 
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis(item, msg);
 
-	if (ischannel(*target)) {
+	if (server_ischannel(SERVER(server), target)) {
 		/* channel action */
 		if (window_item_is_active(item) && target == oldtarget) {
 			/* message to active channel in window */
@@ -195,20 +185,28 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 				    nick, oldtarget, msg);
 		}
 	} else {
-		/* private action */
-		printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
-			    item == NULL ? IRCTXT_ACTION_PRIVATE :
-			    IRCTXT_ACTION_PRIVATE_QUERY,
-			    nick, address == NULL ? "" : address, msg);
+		if (own) {
+			/* own action bounced */
+			printformat(server, target,
+				    MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
+				    item != NULL && oldtarget == target ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
+				    server->nick, msg, oldtarget);
+		} else {
+			/* private action */
+			printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
+				    item == NULL ? IRCTXT_ACTION_PRIVATE :
+				    IRCTXT_ACTION_PRIVATE_QUERY,
+				    nick, address == NULL ? "" : address, msg);
+		}
 	}
-	
+
 	g_free_not_null(freemsg);
 }
 
 static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
 				   const char *target)
 {
-	printformat(server, skip_target(server, target), MSGLEVEL_NOTICES |
+	printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_NOTICES |
 		    MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
 		    IRCTXT_OWN_NOTICE, target, msg);
 }
@@ -219,9 +217,9 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 {
 	const char *oldtarget;
 	int level = MSGLEVEL_NOTICES;
-	
+
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 
 	if (address == NULL || *address == '\0') {
 		/* notice from server */
@@ -234,16 +232,16 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 	}
 
 	if (ignore_check(server, nick, address,
-			 ischannel(*target) ? target : NULL,
+			 server_ischannel(SERVER(server), target) ? target : NULL,
 			 msg, level))
 		return;
 
 	if (ignore_check(server, nick, address,
-			 ischannel(*target) ? target : NULL,
+			 server_ischannel(SERVER(server), target) ? target : NULL,
 			 msg, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-        if (ischannel(*target)) {
+        if (server_ischannel(SERVER(server), target)) {
 		/* notice in some channel */
 		printformat(server, target, level,
 			    IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
@@ -259,7 +257,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd,
 				 const char *data, const char *target)
 {
-	printformat(server, skip_target(server, target), MSGLEVEL_CTCPS |
+	printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_CTCPS |
 		    MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
 		    IRCTXT_OWN_CTCP, target, cmd, data);
 }
@@ -271,8 +269,8 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
 	const char *oldtarget;
 
 	oldtarget = target;
-	target = skip_target(server, target);
-	printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
+	target = fe_channel_skip_prefix(server, target);
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
 		    IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
 }