- Made privmsg and notice make use of cprivmsg and cnotice.

- Made added rping, parsing needs a text event, but the data is "known".
- Fixed a bug in the plugin hook changes.


git-svn-id: svn://red.pomac.com/rage@36 55c13d69-e7e2-0310-b639-a4a306287c42

Author: pomac

trunk/src/common/outbound.c

@@ -2384,6 +2384,9 @@ cmd_msg (struct session *sess, char *cmd, char *buf)
 				if (strcasecmp (nick, "nickserv") == 0 &&
 					 strncasecmp (msg, "identify ", 9) == 0)
 					msg = "identify ****";
+				if (strcasecmp (nick, "authserv") == 0 &&
+						strncasecmp (msg, "auth ", 5) == 0)
+					msg = "auth ****";
 				EMIT_SIGNAL (XP_TE_MSGSEND, sess, nick, msg, NULL, NULL, 0);
 			}
 
@@ -2659,6 +2662,32 @@ cmd_recv (struct session *sess, char *msg, char *buf)
 	return FALSE;
 }
 
+static int
+cmd_rping (struct session *sess, char *msg, char *buf)
+{
+	char *parv[MAX_TOKENS];
+	int parc;
+	time_t tp;
+	char line[512];
+
+	split_cmd_parv(buf,&parc,parv);
+
+	if (parc == 0)
+		return FALSE;
+
+	tp = time(NULL);
+
+	if (parc > 1)
+		snprintf(line, 512, "RPING %s %s :%li\r\n", parv[1], parv[2], tp);
+	else
+		snprintf(line, 512, "RPING %s %s :%li\r\n", sess->server->servername,
+				parv[1], tp);
+	
+	sess->server->p_raw (sess->server, line);
+	
+	return TRUE;
+}
+
 static int
 cmd_say (struct session *sess, char *cmd, char *buf)
 {
@@ -3292,6 +3321,7 @@ static struct commands splay_reconnect = {"RECONNECT", cmd_reconnect, 0, 0,
 	 N_("RECONNECT [<host>] [<port>] [<password>], Can be called just as /RECONNECT to reconnect to the current server or with /RECONNECT ALL to reconnect to all the open servers")};
 #endif
 static struct commands splay_recv = {"RECV", cmd_recv, 1, 0, N_("RECV <text>, send raw data to xchat, as if it was received from the irc server")};
+static struct commands splay_rping = {"RPING", cmd_rping, 1, 0, N_("RPING <server> [server], ping between servers")};
 static struct commands splay_say = {"SAY", cmd_say, 0, 0,
 	 N_("SAY <text>, sends the text to the object in the current window")};
 #ifdef USE_OPENSSL
@@ -3401,6 +3431,7 @@ setup_commands(void)
 	add_command(&splay_quote);
 	add_command(&splay_reconnect);
 	add_command(&splay_recv);
+	add_command(&splay_rping);
 	add_command(&splay_say);
 	add_command(&splay_servchan);
 	add_command(&splay_server);

trunk/src/common/plugin.c

@@ -701,7 +701,7 @@ plugin_show_help (session *sess, char *cmd)
 		return 1;
 	}
 
-	list = plugin_hook_find (hook_list, HOOK_COMMAND, cmd);
+	list = plugin_hook_find (hook_list[HOOK_COMMAND], HOOK_COMMAND, cmd);
 	if (list)
 	{
 		hook = list->data;

trunk/src/common/proto-irc.c

@@ -196,7 +196,14 @@ irc_user_whois (server *serv, char *nicks)
 static void
 irc_message (server *serv, char *channel, char *text)
 {
-	tcp_sendf (serv, "PRIVMSG %s :%s\r\n", channel, text);
+	session *sess = NULL;
+	
+	if (is_channel(serv, channel))
+			sess = find_channel(serv, channel);
+	if (sess && sess->me->op && isupport(serv, "CPRIVMSG"))
+		tcp_sendf (serv, "CPRIVMSG %s :%s\r\n", channel, text);
+	else
+		tcp_sendf (serv, "PRIVMSG %s :%s\r\n", channel, text);
 }
 
 static void
@@ -208,7 +215,14 @@ irc_action (server *serv, char *channel, char *act)
 static void
 irc_notice (server *serv, char *channel, char *text)
 {
-	tcp_sendf (serv, "NOTICE %s :%s\r\n", channel, text);
+	session *sess = NULL;
+
+	if (is_channel(serv, channel))
+		sess = find_channel(serv, channel);
+	if (sess && sess->me->op && isupport(serv, "CNOTICE"))
+		tcp_sendf (serv, "CNOTICE %s :%s\r\n", channel, text);
+	else	
+		tcp_sendf (serv, "NOTICE %s :%s\r\n", channel, text);
 }
 
 static void
@@ -312,6 +326,7 @@ channel_date (session *sess, char *chan, char *timestr)
 #define M_WALL          MAKE4('W','A','L','L')
 #define M_PING          MAKE4('P','I','N','G')
 #define M_PONG          MAKE4('P','O','N','G')
+#define M_RPONG		MAKE4('R','P','O','N')
 #define M_INVITE        MAKE4('I','N','V','I')
 
 /* Splits "buf" up into parv/parc */
@@ -948,6 +963,14 @@ irc_server(session *sess, int parc, char *parv[])
 		case M_PING:
 			tcp_sendf(sess->server, "PONG %s\r\n", parv[2]);
 			break;
+		case M_RPONG:
+			/* XXX: needs a text event */
+			/* parv[0] == source server
+			 * parv[3] == dest server
+			 * parv[4] == miliseconds
+			 * parv[5] == user added time, ie from client.
+			 */
+			break;
 		case M_ERROR:
 			EMIT_SIGNAL(XP_TE_SERVERERROR, sess, parv[2], NULL,
 					NULL, NULL, 0);