diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/botserv.c | 2 | ||||
| -rw-r--r-- | src/chanserv.c | 6 | ||||
| -rw-r--r-- | src/core/cs_topic.c | 2 | ||||
| -rw-r--r-- | src/core/os_set.c | 6 | ||||
| -rw-r--r-- | src/init.c | 2 | ||||
| -rw-r--r-- | src/ircd.c | 5 | ||||
| -rw-r--r-- | src/modules/cs_appendtopic.c | 2 |
7 files changed, 10 insertions, 15 deletions
diff --git a/src/botserv.c b/src/botserv.c index 7cb1b535c..a473d20db 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -750,7 +750,7 @@ void bot_join(ChannelInfo * ci) "%s invited %s into the channel.", ci->bi->nick, ci->bi->nick); } - anope_SendJoin(ci->bi->nick, ci->c->name, ci->c->creation_time); + ircdproto->SendJoin(ci->bi->nick, ci->c->name, ci->c->creation_time); ircdproto->SendBotOp(ci->bi->nick, ci->c->name); send_event(EVENT_BOT_JOIN, 2, ci->name, ci->bi->nick); } diff --git a/src/chanserv.c b/src/chanserv.c index 9df64be41..d5296ec43 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1352,7 +1352,7 @@ int check_kick(User * user, const char *chan, time_t chants) * c may be NULL even if it exists */ if ((!(c = findchan(chan)) || c->usercount == 0) && !(ci->flags & CI_INHABIT)) { - anope_SendJoin(s_ChanServ, chan, (c ? c->creation_time : chants)); + ircdproto->SendJoin(s_ChanServ, chan, (c ? c->creation_time : chants)); /* Lets hide the channel from /list just incase someone does /list * while we are here. - katsklaw */ @@ -1448,7 +1448,7 @@ void restore_topic(const char *chan) } if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendJoin(s_ChanServ, chan, c->creation_time); + ircdproto->SendJoin(s_ChanServ, chan, c->creation_time); ircdproto->SendMode(NULL, chan, "+o %s", s_ChanServ); } } @@ -1510,7 +1510,7 @@ int check_topiclock(Channel * c, time_t topic_time) if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendJoin(s_ChanServ, c->name, c->creation_time); + ircdproto->SendJoin(s_ChanServ, c->name, c->creation_time); ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); } } diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index c352f52d9..6a89945bb 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -103,7 +103,7 @@ int do_cs_topic(User * u) s_ChanServ, u->nick, u->username, u->host, c->name); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendJoin(s_ChanServ, c->name, c->creation_time); + ircdproto->SendJoin(s_ChanServ, c->name, c->creation_time); ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); } } diff --git a/src/core/os_set.c b/src/core/os_set.c index 5e3b8793c..9b9001d83 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -187,7 +187,7 @@ int do_set(User * u) if (LogChannel && (stricmp(setting, "on") == 0)) { if (ircd->join2msg) { c = findchan(LogChannel); - anope_SendJoin(s_GlobalNoticer, LogChannel, c ? c->creation_time : time(NULL)); + ircdproto->SendJoin(s_GlobalNoticer, LogChannel, c ? c->creation_time : time(NULL)); } logchan = 1; alog("Now sending log messages to %s", LogChannel); diff --git a/src/init.c b/src/init.c index 83e0f4b25..861b7cd38 100644 --- a/src/init.c +++ b/src/init.c @@ -736,7 +736,7 @@ int init_secondary(int ac, char **av) /* And hybrid needs Global joined in the logchan */ if (logchan && ircd->join2msg) { /* XXX might desync */ - anope_SendJoin(s_GlobalNoticer, LogChannel, time(NULL)); + ircdproto->SendJoin(s_GlobalNoticer, LogChannel, time(NULL)); } anope_SendEOB(); diff --git a/src/ircd.c b/src/ircd.c index 0c03c22ac..c0f66c7d5 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -43,11 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av) ircdproto->ProcessUsermodes(user, ac, av); } -void anope_SendJoin(const char *user, const char *channel, time_t chantime) -{ - ircdproto->SendJoin(user, channel, chantime); -} - void anope_SendSQLineDel(const char *user) { ircdproto->SendSQLineDel(user); diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 7756cf49b..ff84c6330 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -147,7 +147,7 @@ int my_cs_appendtopic(User * u) s_ChanServ, u->nick, u->username, u->host, c->name); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendJoin(s_ChanServ, c->name, c->creation_time); + ircdproto->SendJoin(s_ChanServ, c->name, c->creation_time); ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); } } |