mirror of
https://github.com/anope/anope.git
synced 2026-07-07 09:23:13 +02:00
Replaced anope_SendClientIntroduction() with direct call to SendClientIntroduction() in IRCDProto class.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1330 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
@@ -1130,7 +1130,6 @@ E void anope_SendBanDel(const char *name, const char *nick); /
|
||||
E void anope_SendBotOp(const char *nick, const char *chan); /* MODE BotServ */
|
||||
E void anope_cmd_netinfo(int ac, const char **av); /* NETINFO */
|
||||
E void anope_SendChangeBotNick(const char *oldnick, const char *newnick); /* NICK */
|
||||
E void anope_SendClientIntroduction(const char *nick, const char *user,const char *host,const char *real,const char *modes); /* NICK */
|
||||
E void anope_cmd_message(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */
|
||||
E void anope_SendNoticeChanops(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */
|
||||
E void anope_cmd_notice(const char *source, const char *dest, const char *msg); /* NOTICE */
|
||||
|
||||
+5
-5
@@ -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$
|
||||
*
|
||||
*/
|
||||
@@ -164,7 +164,7 @@ int do_bot(User * u)
|
||||
EnforceQlinedNick(nick, s_BotServ);
|
||||
|
||||
/* We make the bot online, ready to serve */
|
||||
anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
|
||||
ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
|
||||
ircd->botserv_bot_mode);
|
||||
|
||||
notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user,
|
||||
@@ -292,14 +292,14 @@ int do_bot(User * u)
|
||||
|
||||
/* If only the nick changes, we just make the bot change his nick,
|
||||
else we must make it quit and rejoin. We must not forget to set
|
||||
the Q:Line either (it's otherwise set in anope_SendClientIntroduction) */
|
||||
the Q:Line either (it's otherwise set in SendClientIntroduction) */
|
||||
if (!user) {
|
||||
anope_SendChangeBotNick(oldnick, bi->nick);
|
||||
anope_SendSQLine(bi->nick, "Reserved for services");
|
||||
} else {
|
||||
anope_SendQuit(oldnick, "Quit: Be right back");
|
||||
|
||||
anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
|
||||
ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
|
||||
ircd->botserv_bot_mode);
|
||||
bi->RejoinAll();
|
||||
}
|
||||
|
||||
+10
-10
@@ -34,39 +34,39 @@ void introduce_user(const char *user)
|
||||
#undef LTSIZE
|
||||
/* We make aliases go online */
|
||||
if (s_NickServAlias && (!user || stricmp(user, s_NickServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode);
|
||||
}
|
||||
|
||||
if (s_ChanServAlias && (!user || stricmp(user, s_ChanServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode);
|
||||
}
|
||||
|
||||
if (s_MemoServAlias && (!user || stricmp(user, s_MemoServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode);
|
||||
}
|
||||
|
||||
if (s_BotServAlias && (!user || stricmp(user, s_BotServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode);
|
||||
}
|
||||
|
||||
if (s_HelpServAlias && (!user || stricmp(user, s_HelpServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode);
|
||||
}
|
||||
|
||||
if (s_OperServAlias && (!user || stricmp(user, s_OperServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode);
|
||||
}
|
||||
|
||||
if (s_DevNullAlias && (!user || stricmp(user, s_DevNullAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode);
|
||||
}
|
||||
if (s_HostServAlias && ircd->vhost
|
||||
&& (!user || stricmp(user, s_HostServAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode);
|
||||
}
|
||||
if (s_GlobalNoticerAlias
|
||||
&& (!user || stricmp(user, s_GlobalNoticerAlias) == 0)) {
|
||||
anope_SendClientIntroduction(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode);
|
||||
ircdproto->SendClientIntroduction(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode);
|
||||
}
|
||||
|
||||
/* We make the bots go online */
|
||||
@@ -79,7 +79,7 @@ void introduce_user(const char *user)
|
||||
for (bi = botlists[i]; bi; bi = bi->next)
|
||||
{
|
||||
if (!user || !stricmp(user, bi->nick))
|
||||
anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode);
|
||||
ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,11 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av)
|
||||
ircdproto->ProcessUsermodes(user, ac, av);
|
||||
}
|
||||
|
||||
void anope_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
|
||||
{
|
||||
ircdproto->SendClientIntroduction(nick, user, host, real, modes);
|
||||
}
|
||||
|
||||
void anope_SendKick(const char *source, const char *chan, const char *user, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
Reference in New Issue
Block a user