diff options
Diffstat (limited to 'src/modules')
41 files changed, 115 insertions, 115 deletions
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index 78a686073..8b99081ea 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -56,7 +56,7 @@ class GeolocationExtItem : public ExtensionItem old->refcount_dec(); } - Geolocation::Location* get(const Extensible* item) const + Geolocation::Location* Get(const Extensible* item) const { return static_cast<Geolocation::Location*>(GetRaw(item)); } @@ -91,7 +91,7 @@ class GeolocationAPIImpl : public Geolocation::APIBase Geolocation::Location* GetLocation(User* user) override { // If we have the location cached then use that instead. - Geolocation::Location* location = ext.get(user); + Geolocation::Location* location = ext.Get(user); if (location) return location; diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp index ef961c69d..b0532e610 100644 --- a/src/modules/m_anticaps.cpp +++ b/src/modules/m_anticaps.cpp @@ -235,7 +235,7 @@ class ModuleAntiCaps : public Module // Retrieve the anticaps config. This should never be // null but its better to be safe than sorry. - AntiCapsSettings* config = mode.ext.get(channel); + AntiCapsSettings* config = mode.ext.Get(channel); if (!config) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 5b8dbee97..b51d1c354 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -183,7 +183,7 @@ class BanRedirect : public ModeWatcher if(adding) { /* It's a properly valid redirecting ban, and we're adding it */ - redirects = extItem.get(channel); + redirects = extItem.Get(channel); if (!redirects) { redirects = new BanRedirectList; @@ -214,7 +214,7 @@ class BanRedirect : public ModeWatcher else { /* Removing a ban, if there's no extensible there are no redirecting bans and we're fine. */ - redirects = extItem.get(channel); + redirects = extItem.Get(channel); if (redirects) { /* But there were, so we need to remove the matching one if there is one */ @@ -267,7 +267,7 @@ class ModuleBanRedirect : public Module if (type == ExtensionItem::EXT_CHANNEL) { Channel* chan = static_cast<Channel*>(item); - BanRedirectList* redirects = re.extItem.get(chan); + BanRedirectList* redirects = re.extItem.Get(chan); if(redirects) { @@ -289,7 +289,7 @@ class ModuleBanRedirect : public Module { if (chan) { - BanRedirectList* redirects = re.extItem.get(chan); + BanRedirectList* redirects = re.extItem.Get(chan); if (redirects) { diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index ae9a46926..80118b569 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -102,7 +102,7 @@ class ModuleBlockAmsg : public Module return MOD_RES_PASSTHRU; // Check that this message wasn't already sent within a few seconds. - BlockedMessage* m = blockamsg.get(user); + BlockedMessage* m = blockamsg.Get(user); // If the message is identical and within the time. // We check the target is *not* identical, that'd straying into the realms of flood control. Which isn't what we're doing... diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index dae75dae9..efaec68d3 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -114,14 +114,14 @@ struct CallerIDExtInfo : public ExtensionItem { if (dat->accepting.insert(u).second) { - callerid_data* other = this->get(u, true); + callerid_data* other = this->Get(u, true); other->wholistsme.push_back(dat); } } } } - callerid_data* get(User* user, bool create) + callerid_data* Get(User* user, bool create) { callerid_data* dat = static_cast<callerid_data*>(GetRaw(user)); if (create && !dat) @@ -139,7 +139,7 @@ struct CallerIDExtInfo : public ExtensionItem // We need to walk the list of users on our accept list, and remove ourselves from their wholistsme. for (callerid_data::UserSet::iterator it = dat->accepting.begin(); it != dat->accepting.end(); ++it) { - callerid_data *targ = this->get(*it, false); + callerid_data *targ = this->Get(*it, false); if (!targ) { @@ -266,7 +266,7 @@ public: void ListAccept(User* user) { - callerid_data* dat = extInfo.get(user, false); + callerid_data* dat = extInfo.Get(user, false); if (dat) { for (callerid_data::UserSet::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i) @@ -278,7 +278,7 @@ public: bool AddAccept(User* user, User* whotoadd) { // Add this user to my accept list first, so look me up.. - callerid_data* dat = extInfo.get(user, true); + callerid_data* dat = extInfo.Get(user, true); if (dat->accepting.size() >= maxaccepts) { user->WriteNumeric(ERR_ACCEPTFULL, InspIRCd::Format("Accept list is full (limit is %d)", maxaccepts)); @@ -291,7 +291,7 @@ public: } // Now, look them up, and add me to their list - callerid_data *targ = extInfo.get(whotoadd, true); + callerid_data *targ = extInfo.Get(whotoadd, true); targ->wholistsme.push_back(dat); user->WriteNotice(whotoadd->nick + " is now on your accept list"); @@ -301,7 +301,7 @@ public: bool RemoveAccept(User* user, User* whotoremove) { // Remove them from my list, so look up my list.. - callerid_data* dat = extInfo.get(user, false); + callerid_data* dat = extInfo.Get(user, false); if (!dat) { user->WriteNumeric(ERR_ACCEPTNOT, whotoremove->nick, "is not on your accept list"); @@ -314,7 +314,7 @@ public: } // Look up their list to remove me. - callerid_data *dat2 = extInfo.get(whotoremove, false); + callerid_data *dat2 = extInfo.Get(whotoremove, false); if (!dat2) { // How the fuck is this possible. @@ -345,7 +345,7 @@ class CallerIDAPIImpl : public CallerID::APIBase bool IsOnAcceptList(User* source, User* target) override { - callerid_data* dat = ext.get(target, true); + callerid_data* dat = ext.Get(target, true); return dat->accepting.count(source); } }; @@ -371,7 +371,7 @@ class ModuleCallerID void RemoveFromAllAccepts(User* who) { // First, find the list of people who have me on accept - callerid_data *userdata = cmd.extInfo.get(who, false); + callerid_data *userdata = cmd.extInfo.Get(who, false); if (!userdata) return; @@ -417,7 +417,7 @@ public: if (user->HasPrivPermission("users/ignore-callerid")) return MOD_RES_PASSTHRU; - callerid_data* dat = cmd.extInfo.get(dest, true); + callerid_data* dat = cmd.extInfo.Get(dest, true); if (!dat->accepting.count(user)) { time_t now = ServerInstance->Time(); diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 7a08f42c6..0f8e1de1c 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -223,17 +223,17 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener Protocol GetProtocol(LocalUser* user) const { - return ((capext.get(user) & CAP_302_BIT) ? CAP_302 : CAP_LEGACY); + return ((capext.Get(user) & CAP_302_BIT) ? CAP_302 : CAP_LEGACY); } void Set302Protocol(LocalUser* user) { - capext.set(user, capext.get(user) | CAP_302_BIT); + capext.set(user, capext.Get(user) | CAP_302_BIT); } bool HandleReq(LocalUser* user, const std::string& reqlist) { - Ext usercaps = capext.get(user); + Ext usercaps = capext.Get(user); irc::spacesepstream ss(reqlist); for (std::string capname; ss.GetToken(capname); ) { @@ -257,7 +257,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener void HandleList(std::vector<std::string>& out, LocalUser* user, bool show_all, bool show_values, bool minus_prefix = false) const { - Ext show_caps = (show_all ? ~0 : capext.get(user)); + Ext show_caps = (show_all ? ~0 : capext.Get(user)); for (CapMap::const_iterator i = caps.begin(); i != caps.end(); ++i) { @@ -503,7 +503,7 @@ class ModuleCap : public Module ModResult OnCheckReady(LocalUser* user) override { - return (cmd.holdext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU); + return (cmd.holdext.Get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU); } }; diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 3b1013691..566a44b28 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -228,7 +228,7 @@ class CommandWebIRC : public SplitCommand CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { - if (user->registered == REG_ALL || realhost.get(user)) + if (user->registered == REG_ALL || realhost.Get(user)) return CmdResult::FAILURE; for (std::vector<WebIRCHost>::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) @@ -399,7 +399,7 @@ class ModuleCgiIRC // If the user is not connecting via a WebIRC gateway then they // cannot match this connect class. - const std::string* gateway = cmdwebirc.gateway.get(user); + const std::string* gateway = cmdwebirc.gateway.Get(user); if (!gateway) { ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a connection via a WebIRC gateway", @@ -422,7 +422,7 @@ class ModuleCgiIRC ModResult OnUserRegister(LocalUser* user) override { // There is no need to check for gateways if one is already being used. - if (cmdwebirc.realhost.get(user)) + if (cmdwebirc.realhost.Get(user)) return MOD_RES_PASSTHRU; for (std::vector<IdentHost>::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) @@ -518,12 +518,12 @@ class ModuleCgiIRC return; // If these fields are not set then the client is not using a gateway. - const std::string* realhost = cmdwebirc.realhost.get(whois.GetTarget()); - const std::string* realip = cmdwebirc.realip.get(whois.GetTarget()); + const std::string* realhost = cmdwebirc.realhost.Get(whois.GetTarget()); + const std::string* realip = cmdwebirc.realip.Get(whois.GetTarget()); if (!realhost || !realip) return; - const std::string* gateway = cmdwebirc.gateway.get(whois.GetTarget()); + const std::string* gateway = cmdwebirc.gateway.Get(whois.GetTarget()); if (gateway) whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via the " + *gateway + " WebIRC gateway"); else diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index 62b275f36..ac9e27e61 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -99,7 +99,7 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> > if (len > maxlines) len = maxlines; - HistoryList* history = ext.get(channel); + HistoryList* history = ext.Get(channel); if (history) { // Shrink the list if the new line number limit is lower than the old one @@ -218,7 +218,7 @@ class ModuleChanHistory if (details.IsCTCP(ctcpname) && !irc::equals(ctcpname, "ACTION")) return; - HistoryList* list = historymode.ext.get(target.Get<Channel>()); + HistoryList* list = historymode.ext.Get(target.Get<Channel>()); if (!list) return; @@ -239,7 +239,7 @@ class ModuleChanHistory if (memb->user->IsModeSet(nohistorymode)) return; - HistoryList* list = historymode.ext.get(memb->chan); + HistoryList* list = historymode.ext.Get(memb->chan); if (!list) return; diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 657f05721..c9247b2d0 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -152,14 +152,14 @@ class CloakUser : public ModeHandler if (user->registered != REG_ALL && user->GetRealHost() != user->GetDisplayedHost()) return MODEACTION_DENY; - CloakList* cloaks = ext.get(user); + CloakList* cloaks = ext.Get(user); if (!cloaks) { /* Force creation of missing cloak */ try { creator->OnUserConnect(user); - cloaks = ext.get(user); + cloaks = ext.Get(user); } catch (CoreException& modexcept) { @@ -368,7 +368,7 @@ class ModuleCloaking : public Module OnUserConnect(lu); // If the user has no cloaks (i.e. UNIX socket) then we do nothing here. - CloakList* cloaklist = cu.ext.get(user); + CloakList* cloaklist = cu.ext.Get(user); if (!cloaklist || cloaklist->empty()) return MOD_RES_PASSTHRU; @@ -513,14 +513,14 @@ class ModuleCloaking : public Module // If a user is using a cloak then update it. if (user->IsModeSet(cu)) { - CloakList* cloaklist = cu.ext.get(user); + CloakList* cloaklist = cu.ext.Get(user); user->ChangeDisplayedHost(cloaklist->front()); } } void OnUserConnect(LocalUser* dest) override { - if (cu.ext.get(dest)) + if (cu.ext.Get(dest)) return; // TODO: decide how we are going to cloak AF_UNIX hostnames. diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index 5455c04ed..b8d2f22e3 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -65,7 +65,7 @@ class ModuleWaitPong : public Module { if (command == "PONG") { - std::string* pingrpl = ext.get(user); + std::string* pingrpl = ext.Get(user); if (pingrpl) { @@ -87,7 +87,7 @@ class ModuleWaitPong : public Module ModResult OnCheckReady(LocalUser* user) override { - return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU; + return ext.Get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } }; diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 05120f930..11f245d2b 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -156,7 +156,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener if (numeric.GetNumeric() == 312) { /* Insert our numeric before 312 */ - const std::string* ctitle = cmd.ctitle.get(whois.GetTarget()); + const std::string* ctitle = cmd.ctitle.Get(whois.GetTarget()); if (ctitle) { whois.SendLine(RPL_WHOISSPECIAL, ctitle); diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 663bacf88..d7a2c67b2 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -236,7 +236,7 @@ class CommandDccallow : public Command if (action == '-') { // check if it contains any entries - dl = ext.get(user); + dl = ext.Get(user); if (dl) { for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i) @@ -259,7 +259,7 @@ class CommandDccallow : public Command return CmdResult::FAILURE; } - dl = ext.get(user); + dl = ext.Get(user); if (!dl) { dl = new dccallowlist; @@ -355,7 +355,7 @@ class CommandDccallow : public Command // display current DCCALLOW list user->WriteNumeric(RPL_DCCALLOWSTART, "Users on your DCCALLOW list:"); - dl = ext.get(user); + dl = ext.Get(user); if (dl) { for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c) @@ -387,7 +387,7 @@ class ModuleDCCAllow : public Module void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) override { - dccallowlist* udl = ext.get(user); + dccallowlist* udl = ext.Get(user); // remove their DCCALLOW list if they have one if (udl) @@ -427,7 +427,7 @@ class ModuleDCCAllow : public Module if (irc::equals(ctcpname, "DCC") && !ctcpbody.empty()) { - dl = ext.get(u); + dl = ext.Get(u); if (dl && dl->size()) { for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter) @@ -511,7 +511,7 @@ class ModuleDCCAllow : public Module for (userlist::iterator iter = ul.begin(); iter != ul.end();) { User* u = (User*)(*iter); - dl = ext.get(u); + dl = ext.Get(u); if (dl) { if (dl->size()) @@ -546,7 +546,7 @@ class ModuleDCCAllow : public Module for (userlist::iterator iter = ul.begin(); iter != ul.end();) { User *u = (User*)(*iter); - dl = ext.get(u); + dl = ext.Get(u); if (dl) { if (dl->size()) diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 27ff1e2e7..116cf1720 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -70,7 +70,7 @@ class JoinHook : public ClientProtocol::EventHook const ClientProtocol::Events::Join& join = static_cast<const ClientProtocol::Events::Join&>(ev); const Membership* const memb = join.GetMember(); const User* const u = memb->user; - if ((unjoined.get(memb)) && (u != user)) + if ((unjoined.Get(memb)) && (u != user)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } @@ -136,7 +136,7 @@ ModResult ModuleDelayJoin::OnNamesListItem(LocalUser* issuer, Membership* memb, return MOD_RES_PASSTHRU; /* If the user is hidden by delayed join, hide them from the NAMES list */ - if (unjoined.get(memb)) + if (unjoined.Get(memb)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; @@ -161,7 +161,7 @@ void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CULi void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except) { - if (unjoined.get(memb)) + if (unjoined.Get(memb)) { unjoined.unset(memb); populate(except, memb); @@ -170,7 +170,7 @@ void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUL void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except) { - if (unjoined.get(memb)) + if (unjoined.Get(memb)) { unjoined.unset(memb); populate(except, memb); @@ -182,7 +182,7 @@ void ModuleDelayJoin::OnBuildNeighborList(User* source, IncludeChanList& include for (IncludeChanList::iterator i = include.begin(); i != include.end(); ) { Membership* memb = *i; - if (unjoined.get(memb)) + if (unjoined.Get(memb)) i = include.erase(i); else ++i; @@ -210,7 +210,7 @@ void ModuleDelayJoin::OnUserMessage(User* user, const MessageTarget& target, con void DelayJoinMode::RevealUser(User* user, Channel* chan) { Membership* memb = chan->GetUser(user); - if (!memb || !unjoined.get(memb)) + if (!memb || !unjoined.Get(memb)) { return; } diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index b49f82beb..21dd85f9d 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -125,12 +125,12 @@ ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target, if (!memb) return MOD_RES_PASSTHRU; - time_t ts = djm.jointime.get(memb); + time_t ts = djm.jointime.Get(memb); if (ts == 0) return MOD_RES_PASSTHRU; - int len = djm.ext.get(channel); + int len = djm.ext.Get(channel); if ((ts + len) > ServerInstance->Time()) { diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 28a09034b..f5697c199 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -89,7 +89,7 @@ class DNSBLResolver : public DNS::Request return; } - int i = countExt.get(them); + int i = countExt.Get(them); if (i) countExt.set(them, i - 1); @@ -263,7 +263,7 @@ class DNSBLResolver : public DNS::Request if (!them || them->client_sa != theirsa) return; - int i = countExt.get(them); + int i = countExt.Get(them); if (i) countExt.set(them, i - 1); @@ -454,7 +454,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener if (!myclass->config->readString("dnsbl", dnsbl)) return MOD_RES_PASSTHRU; - std::string* match = nameExt.get(user); + std::string* match = nameExt.Get(user); if (!match) { ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a DNSBL mark", @@ -474,7 +474,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener ModResult OnCheckReady(LocalUser *user) override { - if (countExt.get(user)) + if (countExt.Get(user)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index ae9ef2431..7cd7d0345 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -336,7 +336,7 @@ bool ModuleFilter::AppliesToMe(User* user, FilterResult* filter, int iflags) if ((filter->flag_no_opers) && user->IsOper()) return false; - if ((filter->flag_no_registered) && accountext && accountext->get(user)) + if ((filter->flag_no_registered) && accountext && accountext->Get(user)) return false; if ((iflags & FLAG_PRIVMSG) && (!filter->flag_privmsg)) return false; diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index c191a4290..e739dd17a 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -200,7 +200,7 @@ private: { // Retrieve the account name. const AccountExtItem* accountext = GetAccountExtItem(); - const std::string* accountptr = accountext ? accountext->get(user) : NULL; + const std::string* accountptr = accountext ? accountext->Get(user) : NULL; if (!accountptr) continue; diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index cb215a48e..e98ad935b 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -314,7 +314,7 @@ class ModuleIdent : public Module void OnSetUserIP(LocalUser* user) override { - IdentRequestSocket* isock = socket.get(user); + IdentRequestSocket* isock = socket.Get(user); if (isock) { // If an ident lookup request was in progress then cancel it. @@ -357,10 +357,10 @@ class ModuleIdent : public Module ModResult OnCheckReady(LocalUser *user) override { /* Does user have an ident socket attached at all? */ - IdentRequestSocket* isock = socket.get(user); + IdentRequestSocket* isock = socket.Get(user); if (!isock) { - if (prefixunqueried && state.get(user) == IDENT_SKIPPED) + if (prefixunqueried && state.Get(user) == IDENT_SKIPPED) { PrefixIdent(user); state.set(user, IDENT_PREFIXED); @@ -405,7 +405,7 @@ class ModuleIdent : public Module ModResult OnSetConnectClass(LocalUser* user, std::shared_ptr<ConnectClass> myclass) override { - if (myclass->config->getBool("requireident") && state.get(user) != IDENT_FOUND) + if (myclass->config->getBool("requireident") && state.Get(user) != IDENT_FOUND) { ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires an identd response", myclass->GetName().c_str()); diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index eb9c6b236..d9af0f04f 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -79,7 +79,7 @@ class JoinHook : public ClientProtocol::EventHook const AccountExtItem* const accountext = GetAccountExtItem(); if (accountext) { - const std::string* accountname = accountext->get(memb->user); + const std::string* accountname = accountext->Get(memb->user); if (accountname) account = accountname; } diff --git a/src/modules/m_ircv3_accounttag.cpp b/src/modules/m_ircv3_accounttag.cpp index ddf4a34c5..5e47b64b0 100644 --- a/src/modules/m_ircv3_accounttag.cpp +++ b/src/modules/m_ircv3_accounttag.cpp @@ -35,7 +35,7 @@ class AccountTag : public IRCv3::CapTag<AccountTag> if (!accextitem) return NULL; - return accextitem->get(user); + return accextitem->Get(user); } AccountTag(Module* mod) diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp index 01d3384e9..2677b24ad 100644 --- a/src/modules/m_ircv3_batch.cpp +++ b/src/modules/m_ircv3_batch.cpp @@ -74,7 +74,7 @@ class IRCv3::Batch::ManagerImpl : public Manager Batch& batch = *static_cast<Batch*>(tagdata.provdata); // Check if this is the first message the user is getting that is part of the batch - const intptr_t bits = batchbits.get(user); + const intptr_t bits = batchbits.Get(user); if (!(bits & batch.GetBit())) { // Send the start batch command ("BATCH +reftag TYPE"), remember the user so we can send them a @@ -125,7 +125,7 @@ class IRCv3::Batch::ManagerImpl : public Manager void RemoveFromAll(LocalUser* user) { - const intptr_t bits = batchbits.get(user); + const intptr_t bits = batchbits.Get(user); // User is quitting, remove them from all lists for (BatchList::iterator i = active_batches.begin(); i != active_batches.end(); ++i) @@ -173,7 +173,7 @@ class IRCv3::Batch::ManagerImpl : public Manager { LocalUser* const user = *i; user->Send(batchinfo.endevent); - batchbits.set(user, batchbits.get(user) & ~batch.GetBit()); + batchbits.set(user, batchbits.Get(user) & ~batch.GetBit()); } // erase() not swaperase because the reftag generation logic depends on the order of the elements diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 348567c1e..cd2ed834a 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -172,7 +172,7 @@ class ModuleJoinFlood { if (chan) { - joinfloodsettings *f = jf.ext.get(chan); + joinfloodsettings *f = jf.ext.Get(chan); if (f && f->islocked()) { user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later."); @@ -188,7 +188,7 @@ class ModuleJoinFlood if (sync || ignoreuntil > ServerInstance->Time()) return; - joinfloodsettings *f = jf.ext.get(memb->chan); + joinfloodsettings *f = jf.ext.Get(memb->chan); /* But all others are OK */ if ((f) && (!f->islocked())) diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 7406f8463..49b59bee0 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -146,7 +146,7 @@ public: { if (chan) { - const KickRejoinData* data = kr.ext.get(chan); + const KickRejoinData* data = kr.ext.Get(chan); if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user))) { user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J is set)", data->delay)); @@ -161,7 +161,7 @@ public: if ((!IS_LOCAL(memb->user)) || (source == memb->user)) return; - KickRejoinData* data = kr.ext.get(memb->chan); + KickRejoinData* data = kr.ext.Get(memb->chan); if (data) { data->add(memb->user); diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 2a5e40b7b..17bf2e72b 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -365,7 +365,7 @@ public: void OnUserConnect(LocalUser *user) override { - std::string* cc = ldapVhost.get(user); + std::string* cc = ldapVhost.Get(user); if (cc) { user->ChangeDisplayedHost(*cc); @@ -438,7 +438,7 @@ public: ModResult OnCheckReady(LocalUser* user) override { - return ldapAuthed.get(user) ? MOD_RES_PASSTHRU : MOD_RES_DENY; + return ldapAuthed.Get(user) ? MOD_RES_PASSTHRU : MOD_RES_DENY; } }; diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 199ead1a5..99911b8ee 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -150,7 +150,7 @@ private: if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; - floodsettings *f = mf.ext.get(dest); + floodsettings *f = mf.ext.Get(dest); if (f) { if (f->addmessage(user, weight)) diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 75892bced..adc37b686 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -47,7 +47,7 @@ class ModuleMLock : public Module if (!IS_LOCAL(source)) return MOD_RES_PASSTHRU; - std::string *mlock_str = mlock.get(channel); + std::string *mlock_str = mlock.Get(channel); if (!mlock_str) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index 13d8a6d1b..7e9129c0c 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -69,7 +69,7 @@ class IRCv3::Monitor::Manager { } - ExtData* get(Extensible* container, bool create = false) + ExtData* Get(Extensible* container, bool create = false) { ExtData* extdata = static_cast<ExtData*>(GetRaw(container)); if ((!extdata) && (create)) @@ -234,7 +234,7 @@ class IRCv3::Monitor::Manager WatchedList* GetWatchedPriv(LocalUser* user, bool create = false) { - ExtData* extdata = ext.get(user, create); + ExtData* extdata = ext.Get(user, create); if (!extdata) return NULL; return &extdata->list; diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp index c1d4202bb..c892a21fe 100644 --- a/src/modules/m_nickflood.cpp +++ b/src/modules/m_nickflood.cpp @@ -149,7 +149,7 @@ class ModuleNickFlood : public Module Channel* channel = (*i)->chan; ModResult res; - nickfloodsettings *f = nf.ext.get(channel); + nickfloodsettings *f = nf.ext.Get(channel); if (f) { res = CheckExemption::Call(exemptionprov, user, channel, "nickflood"); @@ -188,7 +188,7 @@ class ModuleNickFlood : public Module Channel* channel = (*i)->chan; ModResult res; - nickfloodsettings *f = nf.ext.get(channel); + nickfloodsettings *f = nf.ext.Get(channel); if (f) { res = CheckExemption::Call(exemptionprov, user, channel, "nickflood"); diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 986586f46..4cc37229c 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -120,7 +120,7 @@ class CommandNickunlock : public Command if (IS_LOCAL(target)) { - if (locked.get(target)) + if (locked.Get(target)) { locked.unset(target); ServerInstance->SNO.WriteGlobalSno('a', user->nick+" used NICKUNLOCK on "+target->nick); @@ -160,7 +160,7 @@ class ModuleNickLock : public Module ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { - if (locked.get(user)) + if (locked.Get(user)) { user->WriteNumeric(ERR_CANTCHANGENICK, "You cannot change your nickname (your nick is locked)"); return MOD_RES_DENY; diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp index 16e0c59cf..f6af38201 100644 --- a/src/modules/m_passforward.cpp +++ b/src/modules/m_passforward.cpp @@ -90,7 +90,7 @@ class ModulePassForward : public Module return; AccountExtItem* actext = GetAccountExtItem(); - if (actext && actext->get(user)) + if (actext && actext->Get(user)) { // User is logged in already (probably via SASL) don't forward the password return; diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 2268628d7..b4b825a04 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -103,7 +103,7 @@ class ModuleRedirect : public Module { if (chan->GetUserCounter() >= ConvToNum<size_t>(chan->GetModeParameter(limitmode))) { - const std::string& channel = *re.ext.get(chan); + const std::string& channel = *re.ext.Get(chan); /* sometimes broken services can make circular or chained +L, avoid this */ Channel* destchan = ServerInstance->FindChan(channel); diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index 0f78821cc..7f99a851c 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -175,7 +175,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > if (message.size() > ms.MaxMessageSize) message.erase(ms.MaxMessageSize); - MemberInfo* rp = MemberInfoExt.get(memb); + MemberInfo* rp = MemberInfoExt.Get(memb); if (!rp) { rp = new MemberInfo; @@ -384,7 +384,7 @@ class RepeatModule : public Module return MOD_RES_PASSTHRU; Channel* chan = target.Get<Channel>(); - ChannelSettings* settings = rm.ext.get(chan); + ChannelSettings* settings = rm.ext.Get(chan); if (!settings) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp index 1c5b426fb..649135273 100644 --- a/src/modules/m_restrictchans.cpp +++ b/src/modules/m_restrictchans.cpp @@ -37,7 +37,7 @@ class ModuleRestrictChans : public Module bool CanCreateChannel(LocalUser* user, const std::string& name) { const AccountExtItem* accountext = GetAccountExtItem(); - if (allowregistered && accountext && accountext->get(user)) + if (allowregistered && accountext && accountext->Get(user)) return true; if (user->HasPrivPermission("channels/restricted-create")) diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index e78d7f1db..f1a32f5a0 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -350,7 +350,7 @@ class CommandAuthenticate : public SplitCommand return CmdResult::FAILURE; } - SaslAuthenticator *sasl = authExt.get(user); + SaslAuthenticator *sasl = authExt.Get(user); if (!sasl) authExt.set(user, new SaslAuthenticator(user, parameters[0], sslapi)); else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod @@ -381,7 +381,7 @@ class CommandSASL : public Command return CmdResult::FAILURE; } - SaslAuthenticator *sasl = authExt.get(target); + SaslAuthenticator *sasl = authExt.Get(target); if (!sasl) return CmdResult::FAILURE; diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp index 8c7f1e545..d11867a83 100644 --- a/src/modules/m_securelist.cpp +++ b/src/modules/m_securelist.cpp @@ -81,7 +81,7 @@ class ModuleSecureList return MOD_RES_PASSTHRU; const AccountExtItem* ext = GetAccountExtItem(); - if (exemptregistered && ext && ext->get(user)) + if (exemptregistered && ext && ext->Get(user)) return MOD_RES_PASSTHRU; if (showmsg) diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index a4b188e31..c172460bd 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -157,7 +157,7 @@ private: bool IsMatch(User* user, Channel* channel, const std::string& text) override { - const std::string* account = accountext.get(user); + const std::string* account = accountext.Get(user); return account && InspIRCd::Match(*account, text); } }; @@ -177,7 +177,7 @@ private: bool IsMatch(User* user, Channel* channel, const std::string& text) override { - const std::string* account = accountext.get(user); + const std::string* account = accountext.Get(user); return !account && channel->CheckBan(user, text); } }; @@ -220,7 +220,7 @@ class ModuleServicesAccount /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ void OnWhois(Whois::Context& whois) override { - std::string* account = accountname.get(whois.GetTarget()); + std::string* account = accountname.Get(whois.GetTarget()); if (account) { @@ -246,7 +246,7 @@ class ModuleServicesAccount if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; - std::string *account = accountname.get(user); + std::string *account = accountname.Get(user); bool is_registered = account && !account->empty(); switch (target.type) @@ -298,7 +298,7 @@ class ModuleServicesAccount ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { - std::string *account = accountname.get(user); + std::string *account = accountname.Get(user); bool is_registered = account && !account->empty(); if (chan) @@ -318,7 +318,7 @@ class ModuleServicesAccount ModResult OnSetConnectClass(LocalUser* user, std::shared_ptr<ConnectClass> myclass) override { - if (myclass->config->getBool("requireaccount") && !accountname.get(user)) + if (myclass->config->getBool("requireaccount") && !accountname.Get(user)) { ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires the user to be logged into an account", myclass->GetName().c_str()); diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 600572a90..6a5b67146 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -280,7 +280,7 @@ class CommandSilence : public SplitCommand CmdResult AddSilence(LocalUser* user, const std::string& mask, uint32_t flags) { - SilenceList* list = ext.get(user); + SilenceList* list = ext.Get(user); if (list && list->size() > ext.maxsilence) { user->WriteNumeric(ERR_SILELISTFULL, mask, SilenceEntry::BitsToFlags(flags), "Your SILENCE list is full"); @@ -306,7 +306,7 @@ class CommandSilence : public SplitCommand CmdResult RemoveSilence(LocalUser* user, const std::string& mask, uint32_t flags) { - SilenceList* list = ext.get(user); + SilenceList* list = ext.Get(user); if (list) { for (SilenceList::iterator iter = list->begin(); iter != list->end(); ++iter) @@ -327,7 +327,7 @@ class CommandSilence : public SplitCommand CmdResult ShowSilenceList(LocalUser* user) { - SilenceList* list = ext.get(user); + SilenceList* list = ext.Get(user); if (list) { for (SilenceList::const_iterator iter = list->begin(); iter != list->end(); ++iter) @@ -419,7 +419,7 @@ class ModuleSilence if (exemptservice && source->server->IsService()) return true; - SilenceList* list = cmd.ext.get(target); + SilenceList* list = cmd.ext.Get(target); if (!list) return true; diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index f0042585c..6f41913a7 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -174,7 +174,7 @@ class ModuleSQLAuth : public Module if (!allowpattern.empty() && InspIRCd::Match(user->nick,allowpattern)) return MOD_RES_PASSTHRU; - if (pendingExt.get(user)) + if (pendingExt.Get(user)) return MOD_RES_PASSTHRU; if (!SQL) @@ -205,7 +205,7 @@ class ModuleSQLAuth : public Module ModResult OnCheckReady(LocalUser* user) override { - switch (pendingExt.get(user)) + switch (pendingExt.Get(user)) { case AUTH_STATE_NONE: return MOD_RES_PASSTHRU; diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 3f43e146b..3baa6720b 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -48,7 +48,7 @@ class SSLCertExt : public ExtensionItem { } - ssl_cert* get(const Extensible* item) const + ssl_cert* Get(const Extensible* item) const { return static_cast<ssl_cert*>(GetRaw(item)); } @@ -119,12 +119,12 @@ class UserCertificateAPIImpl : public UserCertificateAPIBase ssl_cert* GetCertificate(User* user) override { - ssl_cert* cert = sslext.get(user); + ssl_cert* cert = sslext.Get(user); if (cert) return cert; LocalUser* luser = IS_LOCAL(user); - if (!luser || nosslext.get(luser)) + if (!luser || nosslext.Get(luser)) return NULL; cert = SSLClientCert::GetCertificate(&luser->eh); @@ -343,7 +343,7 @@ class ModuleSSLInfo return; const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(&localuser->eh); - if (!ssliohook || cmd.sslapi.nosslext.get(localuser)) + if (!ssliohook || cmd.sslapi.nosslext.Get(localuser)) return; ssl_cert* const cert = ssliohook->GetCertificate(); diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 8a46c8c5c..3f441c07d 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -60,7 +60,7 @@ class CommandSwhois : public Command return CmdResult::FAILURE; } - std::string* text = swhois.get(dest); + std::string* text = swhois.Get(dest); if (text) { // We already had it set... @@ -115,7 +115,7 @@ class ModuleSWhois if (numeric.GetNumeric() == 312) { /* Insert our numeric before 312 */ - std::string* swhois = cmd.swhois.get(whois.GetTarget()); + std::string* swhois = cmd.swhois.Get(whois.GetTarget()); if (swhois) { whois.SendLine(RPL_WHOISSPECIAL, *swhois); @@ -143,11 +143,11 @@ class ModuleSWhois void OnPostDeoper(User* user) override { - std::string* swhois = cmd.swhois.get(user); + std::string* swhois = cmd.swhois.Get(user); if (!swhois) return; - if (!cmd.operblock.get(user)) + if (!cmd.operblock.Get(user)) return; cmd.operblock.unset(user); diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp index c5018ecd7..281e3d74e 100644 --- a/src/modules/m_topiclock.cpp +++ b/src/modules/m_topiclock.cpp @@ -83,7 +83,7 @@ class FlagExtItem : public ExtensionItem { } - bool get(const Extensible* container) const + bool Get(const Extensible* container) const { return (GetRaw(container) != NULL); } @@ -143,7 +143,7 @@ class ModuleTopicLock : public Module ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) override { // Only fired for local users currently, but added a check anyway - if ((IS_LOCAL(user)) && (topiclock.get(chan))) + if ((IS_LOCAL(user)) && (topiclock.Get(chan))) { user->WriteNumeric(ERR_TOPICLOCK, chan->name, "TOPIC cannot be changed due to topic lock being active on the channel"); return MOD_RES_DENY; |