Made many of the functions in IRCDProto accept the relative object pointers instea of char* everywhere, and updated TODO

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2706 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 6 insertions, 8 deletions

diff --git a/src/botserv.c b/src/botserv.c
index 9a8229d6c..9dc7e3ed1 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -644,7 +644,7 @@ void bot_join(ChannelInfo * ci)
 		/* Should we be invited? */
 		if (ci->c->HasMode(CMODE_INVITE)
 			|| (limit && ci->c->usercount >= limit))
-			ircdproto->SendNoticeChanops(ci->bi, ci->c->name,
+			ircdproto->SendNoticeChanops(ci->bi, ci->c,
 				 "%s invited %s into the channel.",
 				 ci->bi->nick, ci->bi->nick);
 	}
@@ -708,7 +708,7 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...)
 	av[0] = ci->name;
 	av[1] = u->nick;
 	av[2] = buf;
-	ircdproto->SendKick(ci->bi, av[0], av[1], "%s", av[2]);
+	ircdproto->SendKick(ci->bi, ci->c, u, "%s", av[2]);
 	do_kick(ci->bi->nick, 3, av);
 	FOREACH_MOD(I_OnBotKick, OnBotKick(u, ci, buf));
 }
@@ -765,10 +765,9 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
 
 	/* Check if we need to do a signkick or not -GD */
 	if ((ci->HasFlag(CI_SIGNKICK) || ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(requester, ci, CA_SIGNKICK))
-		ircdproto->SendKick(ci->bi, kav[0], kav[1], "%s (%s)", kav[2],
-					   requester->nick);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", kav[2], requester->nick);
 	else
-		ircdproto->SendKick(ci->bi, kav[0], kav[1], "%s", kav[2]);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s", kav[2]);
 
 	do_kick(ci->bi->nick, 3, kav);
 	FOREACH_MOD(I_OnBotKick, OnBotKick(u, ci, kav[2]));
@@ -811,10 +810,9 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick,
 	}
 
 	if (ci->HasFlag(CI_SIGNKICK) || ((ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(requester, ci, CA_SIGNKICK)))
-		ircdproto->SendKick(ci->bi, av[0], av[1], "%s (%s)", av[2],
-					   requester->nick);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", av[2], requester->nick);
 	else
-		ircdproto->SendKick(ci->bi, av[0], av[1], "%s", av[2]);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s", av[2]);
 	do_kick(ci->bi->nick, 3, av);
 	FOREACH_MOD(I_OnBotKick, OnBotKick(u, ci, av[2]));
 }