summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-02 23:06:26 +0000
committerRobin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-02 23:06:26 +0000
commitb581b6d1693ae5965285dab6a50908878ee45ebd (patch)
tree9f4b2c7dd0d606bcb1e8e3da88928737b5ca7a63 /src
parent5ffdc4638d666af92068bb2e7e32e5290dd16abd (diff)
Make channels.c work.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1370 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/channels.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/channels.c b/src/channels.c
index ad1219293..599ce6585 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -49,7 +49,7 @@ void chan_deluser(User * user, Channel * c)
c->usercount--;
if (s_BotServ && c->ci && c->ci->bi && c->usercount == BSMinUsers - 1) {
- ircdproto->SendPart(c->ci->bi->nick, c->name, NULL);
+ ircdproto->SendPart(c->ci->bi, c->name, NULL);
}
if (!c->users)
@@ -225,7 +225,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, const char **av,
if ((cum->flags & CUF_PROTECT_BOTSERV) && !add) {
if ((bi = findbot(*av))) {
if (!botmode || botmode != mode) {
- ircdproto->SendMode(bi->nick, chan->name, "+%c %s",
+ ircdproto->SendMode(bi, chan->name, "+%c %s",
mode, bi->nick);
botmode = mode;
continue;
@@ -790,7 +790,7 @@ void do_sjoin(const char *source, int ac, const char **av)
}
if (c->ci && c->ci->bi) {
/* This is ugly, but it always works */
- ircdproto->SendPart(c->ci->bi->nick, c->name, "TS reop");
+ ircdproto->SendPart(c->ci->bi, c->name, "TS reop");
bot_join(c->ci);
}
/* XXX simple modes and bans */
@@ -872,7 +872,7 @@ void do_sjoin(const char *source, int ac, const char **av)
}
if (is_sqlined && !is_oper(user)) {
- ircdproto->SendKick(s_OperServ, av[1], s, "Q-Lined");
+ ircdproto->SendKick(findbot(s_OperServ), av[1], s, "Q-Lined");
} else {
if (!check_kick(user, av[1], ts)) {
send_event(EVENT_JOIN_CHANNEL, 3, EVENT_START,
@@ -957,7 +957,7 @@ void do_sjoin(const char *source, int ac, const char **av)
}
if (is_sqlined && !is_oper(user)) {
- ircdproto->SendKick(s_OperServ, av[1], s, "Q-Lined");
+ ircdproto->SendKick(findbot(s_OperServ), av[1], s, "Q-Lined");
} else {
if (!check_kick(user, av[1], ts)) {
send_event(EVENT_JOIN_CHANNEL, 3, EVENT_START,
@@ -1032,7 +1032,7 @@ void do_sjoin(const char *source, int ac, const char **av)
}
if (is_sqlined && !is_oper(user)) {
- ircdproto->SendKick(s_OperServ, av[1], s, "Q-Lined");
+ ircdproto->SendKick(findbot(s_OperServ), av[1], s, "Q-Lined");
} else {
if (!check_kick(user, av[1], ts)) {
send_event(EVENT_JOIN_CHANNEL, 3, EVENT_START,
@@ -1093,7 +1093,7 @@ void do_sjoin(const char *source, int ac, const char **av)
}
if (is_sqlined && !is_oper(user)) {
- ircdproto->SendKick(s_OperServ, av[1], user->nick, "Q-Lined");
+ ircdproto->SendKick(findbot(s_OperServ), av[1], user->nick, "Q-Lined");
} else {
send_event(EVENT_JOIN_CHANNEL, 3, EVENT_START, user->nick,
av[1]);
@@ -1285,7 +1285,7 @@ void add_ban(Channel * chan, const char *mask)
BotInfo *bi = chan->ci->bi;
if (entry_match(ban, bi->nick, bi->user, bi->host, 0)) {
- ircdproto->SendMode(bi->nick, chan->name, "-b %s", mask);
+ ircdproto->SendMode(bi, chan->name, "-b %s", mask);
entry_delete(chan->bans, ban);
return;
}
@@ -1569,7 +1569,7 @@ void chan_adduser2(User * user, Channel * c)
* recovers from a netsplit. -GD
*/
if (is_sync(user->server)) {
- ircdproto->SendPrivmsg(c->ci->bi->nick, c->name, "[%s] %s",
+ ircdproto->SendPrivmsg(c->ci->bi, c->name, "[%s] %s",
user->na->nick, user->na->nc->greet);
c->ci->bi->lastmsg = time(NULL);
}
@@ -1883,7 +1883,7 @@ void do_mass_mode(char *modes)
free(myModes);
return;
} else {
- ircdproto->SendMode(s_OperServ, c->name, "%s", modes);
+ ircdproto->SendMode(findbot(s_OperServ), c->name, "%s", modes);
chan_set_modes(s_OperServ, c, ac, av, 1);
}
}