mirror of
https://github.com/anope/anope.git
synced 2026-07-02 00:26:38 +02:00
Remove cmd_nick in favour of cmd_bot_nick.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1275 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
@@ -1178,7 +1178,6 @@ E void anope_cmd_tmode(const char *source, const char *dest, const char *fmt, ..
|
||||
E void anope_cmd_unban(const char *name, const char *nick); /* MODE -b */
|
||||
E void anope_cmd_bot_chan_mode(const char *nick, const char *chan); /* MODE BotServ */
|
||||
E void anope_cmd_netinfo(int ac, const char **av); /* NETINFO */
|
||||
E void anope_cmd_nick(const char *nick, const char *name, const char *mode); /* NICK */
|
||||
E void anope_cmd_chg_nick(const char *oldnick, const char *newnick); /* NICK */
|
||||
E void anope_cmd_bot_nick(const char *nick, const char *user,const char *host,const char *real,const char *modes); /* NICK */
|
||||
E void anope_cmd_guest_nick(const char *nick, const char *user,const char *host,const char *real,const char *modes); /* NICK */
|
||||
|
||||
@@ -1275,7 +1275,6 @@ class IRCDProtoNew {
|
||||
virtual void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
|
||||
virtual void cmd_svskill(const char *, const char *, const char *) = 0;
|
||||
virtual void cmd_svsmode(User *, int, const char **) = 0;
|
||||
virtual void cmd_nick(const char *, const char *, const char *) = 0;
|
||||
virtual void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *) { }
|
||||
virtual void cmd_mode(const char *, const char *, const char *) = 0;
|
||||
virtual void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *) = 0;
|
||||
|
||||
+9
-19
@@ -32,51 +32,41 @@ void introduce_user(const char *user)
|
||||
memmove(lasttimes, lasttimes + 1, sizeof(lasttimes) - sizeof(int));
|
||||
lasttimes[LTSIZE - 1] = time(NULL);
|
||||
#undef LTSIZE
|
||||
|
||||
/* We make aliases go online */
|
||||
if (s_NickServAlias && (!user || stricmp(user, s_NickServAlias) == 0)) {
|
||||
anope_cmd_nick(s_NickServAlias, desc_NickServAlias,
|
||||
ircd->nickservaliasmode);
|
||||
anope_cmd_bot_nick(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode);
|
||||
}
|
||||
|
||||
if (s_ChanServAlias && (!user || stricmp(user, s_ChanServAlias) == 0)) {
|
||||
anope_cmd_nick(s_ChanServAlias, desc_ChanServAlias,
|
||||
ircd->chanservaliasmode);
|
||||
anope_cmd_bot_nick(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode);
|
||||
}
|
||||
|
||||
if (s_MemoServAlias && (!user || stricmp(user, s_MemoServAlias) == 0)) {
|
||||
anope_cmd_nick(s_MemoServAlias, desc_MemoServAlias,
|
||||
ircd->memoservaliasmode);
|
||||
anope_cmd_bot_nick(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode);
|
||||
}
|
||||
|
||||
if (s_BotServAlias && (!user || stricmp(user, s_BotServAlias) == 0)) {
|
||||
anope_cmd_nick(s_BotServAlias, desc_BotServAlias,
|
||||
ircd->botservaliasmode);
|
||||
anope_cmd_bot_nick(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode);
|
||||
}
|
||||
|
||||
if (s_HelpServAlias && (!user || stricmp(user, s_HelpServAlias) == 0)) {
|
||||
anope_cmd_nick(s_HelpServAlias, desc_HelpServAlias,
|
||||
ircd->helpservaliasmode);
|
||||
anope_cmd_bot_nick(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode);
|
||||
}
|
||||
|
||||
if (s_OperServAlias && (!user || stricmp(user, s_OperServAlias) == 0)) {
|
||||
anope_cmd_nick(s_OperServAlias, desc_OperServAlias,
|
||||
ircd->operservaliasmode);
|
||||
anope_cmd_bot_nick(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode);
|
||||
}
|
||||
|
||||
if (s_DevNullAlias && (!user || stricmp(user, s_DevNullAlias) == 0)) {
|
||||
anope_cmd_nick(s_DevNullAlias, desc_DevNullAlias,
|
||||
ircd->devnullvaliasmode);
|
||||
anope_cmd_bot_nick(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode);
|
||||
}
|
||||
if (s_HostServAlias && ircd->vhost
|
||||
&& (!user || stricmp(user, s_HostServAlias) == 0)) {
|
||||
anope_cmd_nick(s_HostServAlias, desc_HostServAlias,
|
||||
ircd->hostservaliasmode);
|
||||
anope_cmd_bot_nick(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode);
|
||||
}
|
||||
if (s_GlobalNoticerAlias
|
||||
&& (!user || stricmp(user, s_GlobalNoticerAlias) == 0)) {
|
||||
anope_cmd_nick(s_GlobalNoticerAlias, desc_GlobalNoticerAlias,
|
||||
ircd->globalaliasmode);
|
||||
anope_cmd_bot_nick(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode);
|
||||
}
|
||||
|
||||
/* We make the bots go online */
|
||||
|
||||
@@ -146,11 +146,6 @@ void anope_cmd_376(const char *source)
|
||||
ircdproto.ircd_cmd_376(source);
|
||||
}
|
||||
|
||||
void anope_cmd_nick(const char *nick, const char *name, const char *modes)
|
||||
{
|
||||
ircdprotonew->cmd_nick(nick, name, modes);
|
||||
}
|
||||
|
||||
void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
|
||||
{
|
||||
ircdprotonew->cmd_guest_nick(nick, user, host, real, modes);
|
||||
|
||||
@@ -1106,13 +1106,6 @@ void bahamut_cmd_211(const char *buf)
|
||||
send_cmd(NULL, "211 %s", buf);
|
||||
}
|
||||
|
||||
void BahamutIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
|
||||
{
|
||||
EnforceQlinedNick(nick, NULL);
|
||||
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, ServiceUser, ServiceHost, ServerName, name);
|
||||
cmd_sqline(nick, "Reserved for services");
|
||||
}
|
||||
|
||||
void BahamutIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
|
||||
{
|
||||
if (buf) send_cmd(source, "KICK %s %s :%s", chan, user, buf);
|
||||
|
||||
@@ -87,7 +87,6 @@ class BahamutIRCdProto : public IRCDProtoNew {
|
||||
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
|
||||
void cmd_svskill(const char *, const char *, const char *);
|
||||
void cmd_svsmode(User *, int, const char **);
|
||||
void cmd_nick(const char *, const char *, const char *);
|
||||
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
void cmd_mode(const char *, const char *, const char *);
|
||||
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
|
||||
@@ -1256,18 +1256,6 @@ void charybdis_cmd_tmode(const char *source, const char *dest, const char *fmt,
|
||||
send_cmd(NULL, "MODE %s %s", dest, buf);
|
||||
}
|
||||
|
||||
void CharybdisProto::cmd_nick(const char *nick, const char *name, const char *mode)
|
||||
{
|
||||
EnforceQlinedNick(nick, NULL);
|
||||
if (UseTS6) {
|
||||
char *uidbuf = ts6_uid_retrieve();
|
||||
send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, uidbuf, name);
|
||||
new_uid(nick, uidbuf);
|
||||
}
|
||||
else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
|
||||
cmd_sqline(nick, "Reserved for services");
|
||||
}
|
||||
|
||||
void CharybdisProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
|
||||
{
|
||||
Uid *ud = find_uid(source);
|
||||
|
||||
@@ -75,7 +75,6 @@ class CharybdisProto : public IRCDProtoNew {
|
||||
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
|
||||
void cmd_svskill(const char *, const char *, const char *);
|
||||
void cmd_svsmode(User *, int, const char **);
|
||||
void cmd_nick(const char *, const char *, const char *);
|
||||
void cmd_mode(const char *, const char *, const char *);
|
||||
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
void cmd_kick(const char *, const char *, const char *, const char *);
|
||||
|
||||
@@ -603,14 +603,6 @@ void inspircd_cmd_376(const char *source)
|
||||
send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
|
||||
}
|
||||
|
||||
void InspIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
|
||||
{
|
||||
/* :test.chatspike.net NICK 1133519355 Brain synapse.brainbox.winbot.co.uk netadmin.chatspike.net ~brain +xwsioS 10.0.0.2 :Craig Edwards */
|
||||
send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, ServiceHost, ServiceHost, ServiceUser, modes, name);
|
||||
/* Don't send ServerName as the source here... -GD */
|
||||
send_cmd(nick, "OPERTYPE Service");
|
||||
}
|
||||
|
||||
void InspIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
|
||||
{
|
||||
send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
|
||||
@@ -765,7 +757,7 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
|
||||
void InspIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
|
||||
{
|
||||
send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
|
||||
send_cmd(nick, "OPERTYPE Bot");
|
||||
send_cmd(nick, "OPERTYPE Service");
|
||||
}
|
||||
|
||||
void InspIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
|
||||
|
||||
@@ -91,7 +91,6 @@ class InspIRCdProto : public IRCDProtoNew {
|
||||
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
|
||||
void cmd_svskill(const char *, const char *, const char *);
|
||||
void cmd_svsmode(User *, int, const char **);
|
||||
void cmd_nick(const char *, const char *, const char *);
|
||||
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
void cmd_mode(const char *, const char *, const char *);
|
||||
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
|
||||
@@ -1184,18 +1184,6 @@ void ratbox_cmd_tmode(const char *source, const char *dest, const char *fmt, ...
|
||||
send_cmd(NULL, "MODE %s %s", dest, buf);
|
||||
}
|
||||
|
||||
void RatboxProto::cmd_nick(const char *nick, const char *name, const char *mode)
|
||||
{
|
||||
EnforceQlinedNick(nick, NULL);
|
||||
if (UseTS6) {
|
||||
char *uidbuf = ts6_uid_retrieve();
|
||||
send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, uidbuf, name);
|
||||
new_uid(nick, uidbuf);
|
||||
}
|
||||
else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
|
||||
cmd_sqline(nick, "Reserved for services");
|
||||
}
|
||||
|
||||
void RatboxProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
|
||||
{
|
||||
Uid *ud = find_uid(source);
|
||||
|
||||
@@ -73,7 +73,6 @@ class RatboxProto : public IRCDProtoNew {
|
||||
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
|
||||
void cmd_svskill(const char *, const char *, const char *);
|
||||
void cmd_svsmode(User *, int, const char **);
|
||||
void cmd_nick(const char *, const char *, const char *);
|
||||
void cmd_mode(const char *, const char *, const char *);
|
||||
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
void cmd_kick(const char *, const char *, const char *, const char *);
|
||||
|
||||
@@ -589,14 +589,6 @@ void unreal_cmd_376(const char *source)
|
||||
send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
|
||||
}
|
||||
|
||||
void UnrealIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
|
||||
{
|
||||
EnforceQlinedNick(nick, NULL);
|
||||
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), ServiceUser, ServiceHost, ServerName, modes,
|
||||
ServiceHost, myIrcd->nickip ? " *" : " ", name);
|
||||
cmd_sqline(nick, "Reserved for services");
|
||||
}
|
||||
|
||||
void UnrealIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
|
||||
{
|
||||
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
|
||||
|
||||
@@ -110,7 +110,6 @@ class UnrealIRCdProto : public IRCDProtoNew {
|
||||
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
|
||||
void cmd_svskill(const char *, const char *, const char *);
|
||||
void cmd_svsmode(User *, int, const char **);
|
||||
void cmd_nick(const char *, const char *, const char *);
|
||||
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
void cmd_mode(const char *, const char *, const char *);
|
||||
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
|
||||
|
||||
Reference in New Issue
Block a user