summaryrefslogtreecommitdiff
path: root/modules/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'modules/protocol')
-rw-r--r--modules/protocol/bahamut.cpp8
-rw-r--r--modules/protocol/charybdis.cpp14
-rw-r--r--modules/protocol/hybrid.cpp6
-rw-r--r--modules/protocol/inspircd20.cpp20
-rw-r--r--modules/protocol/ngircd.cpp8
-rw-r--r--modules/protocol/plexus.cpp12
-rw-r--r--modules/protocol/ratbox.cpp4
-rw-r--r--modules/protocol/unreal.cpp26
8 files changed, 49 insertions, 49 deletions
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 5c1a23426..3b829d336 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -282,7 +282,7 @@ class BahamutIRCdProto : public IRCDProto
UplinkSocket::Message() << "SJOIN " << c->creation_time << " " << c->name << " " << modes << " :";
}
- void SendLogin(User *u, NickAlias *) override
+ void SendLogin(User *u, NickServ::Nick *) override
{
IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %d", u->signon);
}
@@ -373,11 +373,11 @@ struct IRCDMessageNick : IRCDMessage
return;
}
- NickAlias *na = NULL;
+ NickServ::Nick *na = NULL;
time_t signon = params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0,
stamp = params[7].is_pos_number_only() ? convertTo<time_t>(params[7]) : 0;
- if (signon && signon == stamp)
- na = NickAlias::Find(params[0]);
+ if (signon && signon == stamp && NickServ::service)
+ na = NickServ::service->FindNick(params[0]);
User::OnIntroduce(params[0], params[4], params[5], "", params[8], s, params[9], signon, params[3], "", na ? *na->nc : NULL);
}
diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp
index 68bf31e76..e69de2b12 100644
--- a/modules/protocol/charybdis.cpp
+++ b/modules/protocol/charybdis.cpp
@@ -60,7 +60,7 @@ class CharybdisProto : public IRCDProto
void SendChannel(Channel *c) override { ratbox->SendChannel(c); }
void SendTopic(const MessageSource &source, Channel *c) override { ratbox->SendTopic(source, c); }
bool IsIdentValid(const Anope::string &ident) override { return ratbox->IsIdentValid(ident); }
- void SendLogin(User *u, NickAlias *na) override { ratbox->SendLogin(u, na); }
+ void SendLogin(User *u, NickServ::Nick *na) override { ratbox->SendLogin(u, na); }
void SendLogout(User *u) override { ratbox->SendLogout(u); }
void SendSQLine(User *, const XLine *x) override
@@ -166,7 +166,7 @@ struct IRCDMessageEncap : IRCDMessage
// In a burst, states that the source user is logged in as the account.
if (params[1] == "LOGIN" || params[1] == "SU")
{
- NickCore *nc = NickCore::Find(params[2]);
+ NickServ::Account *nc = NickServ::FindAccount(params[2]);
if (!nc)
return;
u->Login(nc);
@@ -221,9 +221,9 @@ struct IRCDMessageEUID : IRCDMessage
*/
void Run(MessageSource &source, const std::vector<Anope::string> &params) override
{
- NickAlias *na = NULL;
+ NickServ::Nick *na = NULL;
if (params[9] != "*")
- na = NickAlias::Find(params[9]);
+ na = NickServ::FindNick(params[9]);
User::OnIntroduce(params[0], params[4], params[8], params[5], params[6], source.GetServer(), params[10], params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : Anope::CurTime, params[3], params[7], na ? *na->nc : NULL);
}
@@ -304,7 +304,7 @@ class ProtoCharybdis : public Module
ModeManager::AddUserMode(new UserMode("NOFORWARD", 'Q'));
ModeManager::AddUserMode(new UserMode("REGPRIV", 'R'));
ModeManager::AddUserMode(new UserModeOperOnly("OPERWALLS", 'z'));
- ModeManager::AddUserMode(new UserModeNoone("SSL", 'Z'));
+ ModeManager::AddUserMode(new UserModeNoone("SSL", 'Z'));
/* b/e/I */
ModeManager::AddChannelMode(new ChannelModeList("QUIET", 'q'));
@@ -400,7 +400,7 @@ class ProtoCharybdis : public Module
}
}
- EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) override
+ EventReturn OnMLock(ChanServ::Channel *ci, ModeLock *lock) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
ChannelMode *cm = ModeManager::FindChannelModeByName(lock->name);
@@ -413,7 +413,7 @@ class ProtoCharybdis : public Module
return EVENT_CONTINUE;
}
- EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) override
+ EventReturn OnUnMLock(ChanServ::Channel *ci, ModeLock *lock) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
ChannelMode *cm = ModeManager::FindChannelModeByName(lock->name);
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index d2b5b935a..9dd906387 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -224,7 +224,7 @@ class HybridProto : public IRCDProto
UplinkSocket::Message(source) << "SVSMODE " << u->GetUID() << " " << u->timestamp << " " << buf;
}
- void SendLogin(User *u, NickAlias *na) override
+ void SendLogin(User *u, NickServ::Nick *na) override
{
IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %s", na->nc->display.c_str());
}
@@ -535,9 +535,9 @@ struct IRCDMessageUID : IRCDMessage
if (ip == "0") /* Can be 0 for spoofed clients */
ip.clear();
- NickAlias *na = NULL;
+ NickServ::Nick *na = NULL;
if (params[8] != "0")
- na = NickAlias::Find(params[8]);
+ na = NickServ::FindNick(params[8]);
/* Source is always the server */
User::OnIntroduce(params[0], params[4], params[5], "",
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 77ebb2fe6..1981b3cc5 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -361,7 +361,7 @@ class InspIRCd20Proto : public IRCDProto
UplinkSocket::Message(source) << "SNONOTICE A :" << buf;
}
- void SendLogin(User *u, NickAlias *na) override
+ void SendLogin(User *u, NickServ::Nick *na) override
{
/* InspIRCd uses an account to bypass chmode +R, not umode +r, so we can't send this here */
if (na->nc->HasExt("UNCONFIRMED"))
@@ -1166,7 +1166,7 @@ struct IRCDMessageMetadata : IRCDMessage
if (params[1].equals_cs("accountname"))
{
User *u = User::Find(params[0]);
- NickCore *nc = NickCore::Find(params[2]);
+ NickServ::Account *nc = NickServ::FindAccount(params[2]);
if (u && nc)
u->Login(nc);
}
@@ -1347,7 +1347,7 @@ struct IRCDMessageServer : IRCDMessage
struct IRCDMessageSQuit : Message::SQuit
{
IRCDMessageSQuit(Module *creator) : Message::SQuit(creator) { }
-
+
void Run(MessageSource &source, const std::vector<Anope::string> &params) override
{
if (params[0] == rsquit_id || params[0] == rsquit_server)
@@ -1401,7 +1401,7 @@ struct IRCDMessageUID : IRCDMessage
for (unsigned i = 9; i < params.size() - 1; ++i)
modes += " " + params[i];
- NickAlias *na = NULL;
+ NickServ::Nick *na = NULL;
if (SASL::sasl)
for (std::list<SASLUser>::iterator it = saslusers.begin(); it != saslusers.end();)
{
@@ -1411,7 +1411,7 @@ struct IRCDMessageUID : IRCDMessage
it = saslusers.erase(it);
else if (u.uid == params[0])
{
- na = NickAlias::Find(u.acc);
+ na = NickServ::FindNick(u.acc);
it = saslusers.erase(it);
}
else
@@ -1541,7 +1541,7 @@ class ProtoInspIRCd20 : public Module
this->OnChanRegistered(c->ci);
}
- void OnChanRegistered(ChannelInfo *ci) override
+ void OnChanRegistered(ChanServ::Channel *ci) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
if (use_server_side_mlock && ci->c && modelocks && !modelocks->GetMLockAsString(false).empty())
@@ -1557,7 +1557,7 @@ class ProtoInspIRCd20 : public Module
}
}
- void OnDelChan(ChannelInfo *ci) override
+ void OnDelChan(ChanServ::Channel *ci) override
{
if (use_server_side_mlock && ci->c)
SendChannelMetadata(ci->c, "mlock", "");
@@ -1566,7 +1566,7 @@ class ProtoInspIRCd20 : public Module
SendChannelMetadata(ci->c, "topiclock", "");
}
- EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) override
+ EventReturn OnMLock(ChanServ::Channel *ci, ModeLock *lock) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
ChannelMode *cm = ModeManager::FindChannelModeByName(lock->name);
@@ -1579,7 +1579,7 @@ class ProtoInspIRCd20 : public Module
return EVENT_CONTINUE;
}
- EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) override
+ EventReturn OnUnMLock(ChanServ::Channel *ci, ModeLock *lock) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
ChannelMode *cm = ModeManager::FindChannelModeByName(lock->name);
@@ -1592,7 +1592,7 @@ class ProtoInspIRCd20 : public Module
return EVENT_CONTINUE;
}
- EventReturn OnSetChannelOption(CommandSource &source, Command *cmd, ChannelInfo *ci, const Anope::string &setting) override
+ EventReturn OnSetChannelOption(CommandSource &source, Command *cmd, ChanServ::Channel *ci, const Anope::string &setting) override
{
if (cmd->name == "chanserv/topic" && ci->c)
{
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 06790b2af..a18f8f770 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -118,7 +118,7 @@ class ngIRCdProto : public IRCDProto
UplinkSocket::Message(source) << "KICK " << chan->name << " " << user->nick;
}
- void SendLogin(User *u, NickAlias *na) override
+ void SendLogin(User *u, NickServ::Nick *na) override
{
UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :" << na->nc->display;
}
@@ -126,7 +126,7 @@ class ngIRCdProto : public IRCDProto
void SendLogout(User *u) override
{
UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :";
- }
+ }
void SendModeInternal(const MessageSource &source, const Channel *dest, const Anope::string &buf) override
{
@@ -345,7 +345,7 @@ struct IRCDMessageMetadata : IRCDMessage
}
if (params[1].equals_cs("accountname"))
{
- NickCore *nc = NickCore::Find(params[2]);
+ NickServ::Account *nc = NickServ::FindAccount(params[2]);
if (nc)
u->Login(nc);
}
@@ -492,7 +492,7 @@ struct IRCDMessageNJoin : IRCDMessage
continue;
}
users.push_back(sju);
- }
+ }
Message::Join::SJoin(source, params[0], 0, "", users);
}
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index e4cc26e6a..0e22ba6c0 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -142,7 +142,7 @@ class PlexusProto : public IRCDProto
UplinkSocket::Message(source) << "ENCAP * SVSMODE " << u->GetUID() << " " << u->timestamp << " " << buf;
}
- void SendLogin(User *u, NickAlias *na) override
+ void SendLogin(User *u, NickServ::Nick *na) override
{
UplinkSocket::Message(Me) << "ENCAP * SU " << u->GetUID() << " " << na->nc->display;
}
@@ -184,7 +184,7 @@ struct IRCDMessageEncap : IRCDMessage
if (params[1].equals_cs("SU"))
{
User *u = User::Find(params[2]);
- NickCore *nc = NickCore::Find(params[3]);
+ NickServ::Account *nc = NickServ::FindAccount(params[3]);
if (u && nc)
{
u->Login(nc);
@@ -272,15 +272,15 @@ struct IRCDMessageUID : IRCDMessage
ts = Anope::CurTime;
}
- NickAlias *na = NULL;
+ NickServ::Nick *na = NULL;
try
{
if (params[8].is_pos_number_only() && convertTo<time_t>(params[8]) == ts)
- na = NickAlias::Find(params[0]);
+ na = NickServ::FindNick(params[0]);
}
catch (const ConvertException &) { }
if (params[8] != "0" && !na)
- na = NickAlias::Find(params[8]);
+ na = NickServ::FindNick(params[8]);
User::OnIntroduce(params[0], params[4], params[9], params[5], ip, source.GetServer(), params[10], ts, params[3], params[7], na ? *na->nc : NULL);
}
@@ -312,7 +312,7 @@ class ProtoPlexus : public Module
Message::Topic message_topic;
Message::Version message_version;
Message::Whois message_whois;
-
+
/* Hybrid message handlers */
ServiceAlias message_bmask, message_eob, message_join, message_nick, message_sid, message_sjoin,
message_tburst, message_tmode;
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 5cc80742f..ec946c391 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -81,7 +81,7 @@ class RatboxProto : public IRCDProto
UplinkSocket::Message(Me) << "UID " << u->nick << " 1 " << u->timestamp << " " << modes << " " << u->GetIdent() << " " << u->host << " 0 " << u->GetUID() << " :" << u->realname;
}
- void SendLogin(User *u, NickAlias *na) override
+ void SendLogin(User *u, NickServ::Nick *na) override
{
if (na->nc->HasExt("UNCONFIRMED"))
return;
@@ -125,7 +125,7 @@ struct IRCDMessageEncap : IRCDMessage
{
User *u = source.GetUser();
- NickCore *nc = NickCore::Find(params[2]);
+ NickServ::Account *nc = NickServ::FindAccount(params[2]);
if (!nc)
return;
u->Login(nc);
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index eec4601ce..606f22270 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -343,7 +343,7 @@ class UnrealIRCdProto : public IRCDProto
return mask.length() >= 4 && mask[0] == '~' && mask[2] == ':';
}
- void SendLogin(User *u, NickAlias *na) override
+ void SendLogin(User *u, NickServ::Nick *na) override
{
if (Servers::Capab.count("ESVID") > 0)
IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %s", na->nc->display.c_str());
@@ -474,7 +474,7 @@ class UnrealExtBan : public ChannelModeList
if (u->Account() && Anope::Match(u->Account()->display, real_mask))
return true;
}
-
+
return false;
}
};
@@ -496,7 +496,7 @@ class ChannelModeFlood : public ChannelModeParam
return true;
}
catch (const ConvertException &) { }
-
+
/* '['<number><1 letter>[optional: '#'+1 letter],[next..]']'':'<number> */
size_t end_bracket = value.find(']', 1);
if (end_bracket == Anope::string::npos)
@@ -840,19 +840,19 @@ struct IRCDMessageNick : IRCDMessage
Log(LOG_DEBUG) << "User " << params[0] << " introduced from nonexistant server " << params[5] << "?";
return;
}
-
- NickAlias *na = NULL;
+
+ NickServ::Nick *na = NULL;
if (params[6] == "0")
;
else if (params[6].is_pos_number_only())
{
if (convertTo<time_t>(params[6]) == user_ts)
- na = NickAlias::Find(params[0]);
+ na = NickServ::FindNick(params[0]);
}
else
{
- na = NickAlias::Find(params[6]);
+ na = NickServ::FindNick(params[6]);
}
User::OnIntroduce(params[0], params[3], params[4], vhost, ip, s, params[10], user_ts, params[7], "", na ? *na->nc : NULL);
@@ -889,7 +889,7 @@ struct IRCDMessageSASL : IRCDMessage
void Run(MessageSource &source, const std::vector<Anope::string> &params) override
{
size_t p = params[1].find('!');
- if (!SASL::sasl || p == Anope::string::npos)
+ if (!SASL::sasl || p == Anope::string::npos)
return;
SASL::Message m;
@@ -1032,7 +1032,7 @@ struct IRCDMessageSJoin : IRCDMessage
users.push_back(sju);
}
}
-
+
time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : Anope::CurTime;
Message::Join::SJoin(source, params[1], ts, modes, users);
@@ -1252,7 +1252,7 @@ class ProtoUnreal : public Module
}
}
- void OnChanRegistered(ChannelInfo *ci) override
+ void OnChanRegistered(ChanServ::Channel *ci) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
if (!ci->c || !use_server_side_mlock || !modelocks || !Servers::Capab.count("MLOCK"))
@@ -1261,14 +1261,14 @@ class ProtoUnreal : public Module
UplinkSocket::Message(Me) << "MLOCK " << static_cast<long>(ci->c->creation_time) << " " << ci->name << " " << modes;
}
- void OnDelChan(ChannelInfo *ci) override
+ void OnDelChan(ChanServ::Channel *ci) override
{
if (!ci->c || !use_server_side_mlock || !Servers::Capab.count("MLOCK"))
return;
UplinkSocket::Message(Me) << "MLOCK " << static_cast<long>(ci->c->creation_time) << " " << ci->name << " :";
}
- EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) override
+ EventReturn OnMLock(ChanServ::Channel *ci, ModeLock *lock) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
ChannelMode *cm = ModeManager::FindChannelModeByName(lock->name);
@@ -1281,7 +1281,7 @@ class ProtoUnreal : public Module
return EVENT_CONTINUE;
}
- EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) override
+ EventReturn OnUnMLock(ChanServ::Channel *ci, ModeLock *lock) override
{
ModeLocks *modelocks = ci->GetExt<ModeLocks>("modelocks");
ChannelMode *cm = ModeManager::FindChannelModeByName(lock->name);
generated by cgit (git 2.34.1) at 2026-09-28 02:45:22 +0000