diff options
| author | 2020-07-20 12:16:48 +0100 | |
|---|---|---|
| committer | 2020-07-20 12:16:48 +0100 | |
| commit | 4e3d97546a5884b38a48303075a91c7485a6fae5 (patch) | |
| tree | cff0d17e3243ed600e6a6b3c72a1041202262f6d | |
| parent | Pascalize ExtensionItem::{get,set,unset}_raw. (diff) | |
Pascalize Cap::set and rename Cap::get to IsEnabled.
| -rw-r--r-- | include/modules/cap.h | 8 | ||||
| -rw-r--r-- | include/modules/ircv3.h | 4 | ||||
| -rw-r--r-- | include/modules/ircv3_replies.h | 12 | ||||
| -rw-r--r-- | src/modules/m_botmode.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_cap.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_chanhistory.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_hostcycle.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_ircv3.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_ircv3_batch.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_ircv3_capnotify.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_ircv3_ctctags.cpp | 12 | ||||
| -rw-r--r-- | src/modules/m_ircv3_echomessage.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_ircv3_invitenotify.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_ircv3_labeledresponse.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_ircv3_msgid.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_namesx.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_sasl.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/tags.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_uhnames.cpp | 4 |
19 files changed, 43 insertions, 43 deletions
diff --git a/include/modules/cap.h b/include/modules/cap.h index d5119b10f..ebcec651f 100644 --- a/include/modules/cap.h +++ b/include/modules/cap.h @@ -193,7 +193,7 @@ namespace Cap * @param user User to check * @return True if the user is using this capability, false otherwise */ - bool get(User* user) const + bool IsEnabled(User* user) const { if (!IsRegistered()) return false; @@ -205,7 +205,7 @@ namespace Cap * @param user User to turn the cap on/off for * @param val True to turn the cap on, false to turn it off */ - void set(User* user, bool val) + void Set(User* user, bool val) { if (!IsRegistered()) return; @@ -307,10 +307,10 @@ namespace Cap * @param user User to check * @return True if the user is using the referenced capability, false otherwise */ - bool get(LocalUser* user) + bool IsEnabled(LocalUser* user) { if (ref) - return ref->get(user); + return ref->IsEnabled(user); return false; } }; diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h index 6f95ac20f..e00821a70 100644 --- a/include/modules/ircv3.h +++ b/include/modules/ircv3.h @@ -36,7 +36,7 @@ class IRCv3::WriteNeighborsWithCap : public User::ForEachNeighborHandler void Execute(LocalUser* user) override { - if (cap.get(user)) + if (cap.IsEnabled(user)) user->Send(protoev); } @@ -74,7 +74,7 @@ class IRCv3::CapTag : public ClientProtocol::MessageTagProvider bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override { - return cap.get(user); + return cap.IsEnabled(user); } void OnPopulateTags(ClientProtocol::Message& msg) override diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h index 4666f002a..15b23c74a 100644 --- a/include/modules/ircv3_replies.h +++ b/include/modules/ircv3_replies.h @@ -180,7 +180,7 @@ class IRCv3::Replies::Reply void SendIfCap(LocalUser* user, const Cap::Capability& cap, Command* command, const std::string& code, const std::string& description) { - if (cap.get(user)) + if (cap.IsEnabled(user)) Send(user, command, code, description); else SendNoticeInternal(user, command, description); @@ -190,7 +190,7 @@ class IRCv3::Replies::Reply void SendIfCap(LocalUser* user, const Cap::Capability& cap, Command* command, const std::string& code, const T1& p1, const std::string& description) { - if (cap.get(user)) + if (cap.IsEnabled(user)) Send(user, command, code, p1, description); else SendNoticeInternal(user, command, description); @@ -200,7 +200,7 @@ class IRCv3::Replies::Reply void SendIfCap(LocalUser* user, const Cap::Capability& cap, Command* command, const std::string& code, const T1& p1, const T2& p2, const std::string& description) { - if (cap.get(user)) + if (cap.IsEnabled(user)) Send(user, command, code, p1, p2, description); else SendNoticeInternal(user, command, description); @@ -210,7 +210,7 @@ class IRCv3::Replies::Reply void SendIfCap(LocalUser* user, const Cap::Capability& cap, Command* command, const std::string& code, const T1& p1, const T2& p2, const T3& p3, const std::string& description) { - if (cap.get(user)) + if (cap.IsEnabled(user)) Send(user, command, code, p1, p2, p3, description); else SendNoticeInternal(user, command, description); @@ -220,7 +220,7 @@ class IRCv3::Replies::Reply void SendIfCap(LocalUser* user, const Cap::Capability& cap, Command* command, const std::string& code, const T1& p1, const T2& p2, const T3& p3, const T4& p4, const std::string& description) { - if (cap.get(user)) + if (cap.IsEnabled(user)) Send(user, command, code, p1, p2, p3, p4, description); else SendNoticeInternal(user, command, description); @@ -230,7 +230,7 @@ class IRCv3::Replies::Reply void SendIfCap(LocalUser* user, const Cap::Capability& cap, Command* command, const std::string& code, const T1& p1, const T2& p2, const T3& p3, const T4& p4, const T5& p5, const std::string& description) { - if (cap.get(user)) + if (cap.IsEnabled(user)) Send(user, command, code, p1, p2, p3, p4, p5, description); else SendNoticeInternal(user, command, description); diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 85ab3cdd8..6a766db4a 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -58,7 +58,7 @@ class BotTag : public ClientProtocol::MessageTagProvider bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override { - return ctctagcap.get(user); + return ctctagcap.IsEnabled(user); } }; diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 95f6cd519..5fb9a8b1a 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -112,7 +112,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); ++j) { LocalUser* user = *j; - if (cap->get(user)) + if (cap->IsEnabled(user)) capdata.users.push_back(user->uuid); } } @@ -142,7 +142,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener continue; } - cap->set(user, true); + cap->Set(user, true); } } delete capmoddata; @@ -199,7 +199,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i) { LocalUser* user = *i; - cap->set(user, false); + cap->Set(user, false); } ServerInstance->Modules.DelReferent(cap); diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index eb1635634..bff2d924c 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -236,7 +236,7 @@ class ModuleChanHistory if (!list) return; - if ((prefixmsg) && (!batchcap.get(localuser))) + if ((prefixmsg) && (!batchcap.IsEnabled(localuser))) { std::string message("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history"); if (list->maxtime > 0) diff --git a/src/modules/m_hostcycle.cpp b/src/modules/m_hostcycle.cpp index 0230886fc..bee5cbb71 100644 --- a/src/modules/m_hostcycle.cpp +++ b/src/modules/m_hostcycle.cpp @@ -48,7 +48,7 @@ class ModuleHostCycle : public Module for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { LocalUser* u = IS_LOCAL(i->first); - if ((u) && (!u->quitting) && (!chghostcap.get(u))) + if ((u) && (!u->quitting) && (!chghostcap.IsEnabled(u))) { if (i->second) { @@ -79,7 +79,7 @@ class ModuleHostCycle : public Module continue; if (u->already_sent == silent_id) continue; - if (chghostcap.get(u)) + if (chghostcap.IsEnabled(u)) continue; if (u->already_sent != seen_id) diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index 605a4d0f9..4d6f97a7a 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -100,10 +100,10 @@ class JoinHook : public ClientProtocol::EventHook ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override { - if (extendedjoincap.get(user)) + if (extendedjoincap.IsEnabled(user)) messagelist.front() = &extendedjoinmsg; - if ((!awaymsg.GetParams().empty()) && (awaycap.get(user))) + if ((!awaymsg.GetParams().empty()) && (awaycap.IsEnabled(user))) messagelist.push_back(&awaymsg); return MOD_RES_PASSTHRU; diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp index 8379f88be..1ff677206 100644 --- a/src/modules/m_ircv3_batch.cpp +++ b/src/modules/m_ircv3_batch.cpp @@ -69,7 +69,7 @@ class IRCv3::Batch::ManagerImpl : public Manager bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override { - if (!cap.get(user)) + if (!cap.IsEnabled(user)) return false; Batch& batch = *static_cast<Batch*>(tagdata.provdata); diff --git a/src/modules/m_ircv3_capnotify.cpp b/src/modules/m_ircv3_capnotify.cpp index 5c7c68449..41b61299d 100644 --- a/src/modules/m_ircv3_capnotify.cpp +++ b/src/modules/m_ircv3_capnotify.cpp @@ -36,7 +36,7 @@ class CapNotify : public Cap::Capability { // If the client supports 3.2 enable cap-notify for them if (GetProtocol(user) != Cap::CAP_LEGACY) - set(user, true); + Set(user, true); return true; } @@ -99,7 +99,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i) { LocalUser* user = *i; - if (!capnotify.get(user)) + if (!capnotify.IsEnabled(user)) continue; // Check that this user can actually see the cap. diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp index fff38140a..fa838f54f 100644 --- a/src/modules/m_ircv3_ctctags.cpp +++ b/src/modules/m_ircv3_ctctags.cpp @@ -99,7 +99,7 @@ class CommandTagMsg : public Command continue; // Send to users if they have the capability. - if (cap.get(luser)) + if (cap.IsEnabled(luser)) luser->Send(msgevprov, message); } return FirePostEvent(source, msgtarget, msgdetails); @@ -141,7 +141,7 @@ class CommandTagMsg : public Command continue; // Send to users if they have the capability. - if (cap.get(luser)) + if (cap.IsEnabled(luser)) luser->Send(msgevprov, message); } } @@ -190,7 +190,7 @@ class CommandTagMsg : public Command return CMD_FAILURE; LocalUser* const localtarget = IS_LOCAL(target); - if (localtarget && cap.get(localtarget)) + if (localtarget && cap.IsEnabled(localtarget)) { // Send to the target if they have the capability and are a local user. CTCTags::TagMessage message(source, localtarget, msgdetails.tags_out); @@ -218,7 +218,7 @@ class CommandTagMsg : public Command return CMD_SUCCESS; // Check that the source has the message tags capability. - if (IS_LOCAL(user) && !cap.get(user)) + if (IS_LOCAL(user) && !cap.IsEnabled(user)) return CMD_FAILURE; // The specified message tags were empty. @@ -279,7 +279,7 @@ class C2CTags : public ClientProtocol::MessageTagProvider // If the user is local then we check whether they have the message-tags cap // enabled. If not then we reject all client-only tags originating from them. LocalUser* lu = IS_LOCAL(user); - if (lu && !cap.get(lu)) + if (lu && !cap.IsEnabled(lu)) return MOD_RES_DENY; // Remote users have their client-only tags checked by their local server. @@ -288,7 +288,7 @@ class C2CTags : public ClientProtocol::MessageTagProvider bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override { - return cap.get(user); + return cap.IsEnabled(user); } }; diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp index 180a7b6c3..bf15a84a8 100644 --- a/src/modules/m_ircv3_echomessage.cpp +++ b/src/modules/m_ircv3_echomessage.cpp @@ -42,7 +42,7 @@ class ModuleIRCv3EchoMessage void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { - if (!cap.get(user) || !details.echo) + if (!cap.IsEnabled(user) || !details.echo) return; // Caps are only set on local users @@ -81,7 +81,7 @@ class ModuleIRCv3EchoMessage void OnUserPostTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) override { - if (!cap.get(user) || !details.echo) + if (!cap.IsEnabled(user) || !details.echo) return; // Caps are only set on local users diff --git a/src/modules/m_ircv3_invitenotify.cpp b/src/modules/m_ircv3_invitenotify.cpp index 23e56d364..ad2815dd7 100644 --- a/src/modules/m_ircv3_invitenotify.cpp +++ b/src/modules/m_ircv3_invitenotify.cpp @@ -41,7 +41,7 @@ class ModuleIRCv3InviteNotify : public Module { User* user = i->first; // Skip members who don't use this extension or were excluded by other modules - if ((!cap.get(user)) || (notifyexcepts.count(user))) + if ((!cap.IsEnabled(user)) || (notifyexcepts.count(user))) continue; Membership* memb = i->second; diff --git a/src/modules/m_ircv3_labeledresponse.cpp b/src/modules/m_ircv3_labeledresponse.cpp index 5f3b4b874..da57378d2 100644 --- a/src/modules/m_ircv3_labeledresponse.cpp +++ b/src/modules/m_ircv3_labeledresponse.cpp @@ -50,7 +50,7 @@ class LabeledResponseTag : public ClientProtocol::MessageTagProvider // If the user is local then we check whether they have the labeled-response // cap enabled. If not then we reject the label tag originating from them. LocalUser* lu = IS_LOCAL(user); - if (lu && !cap.get(lu)) + if (lu && !cap.IsEnabled(lu)) return MOD_RES_DENY; // Remote users have their label tag checked by their local server. @@ -105,7 +105,7 @@ class ModuleIRCv3LabeledResponse : public Module return MOD_RES_PASSTHRU; // We only care about registered users with the labeled-response and batch caps. - if (user->registered != REG_ALL || !cap.get(user) || !batchcap.get(user)) + if (user->registered != REG_ALL || !cap.IsEnabled(user) || !batchcap.IsEnabled(user)) return MOD_RES_PASSTHRU; const ClientProtocol::TagMap& tagmap = parameters.GetTags(); diff --git a/src/modules/m_ircv3_msgid.cpp b/src/modules/m_ircv3_msgid.cpp index 6033bb888..df9ec26bd 100644 --- a/src/modules/m_ircv3_msgid.cpp +++ b/src/modules/m_ircv3_msgid.cpp @@ -43,7 +43,7 @@ class MsgIdTag : public ClientProtocol::MessageTagProvider bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override { - return ctctagcap.get(user); + return ctctagcap.IsEnabled(user); } }; diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index f0d5ae4d8..cc025ca27 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -67,7 +67,7 @@ class ModuleNamesX { if (!parameters.empty() && irc::equals(parameters[0], "NAMESX")) { - cap.set(user, true); + cap.Set(user, true); return MOD_RES_DENY; } } @@ -76,7 +76,7 @@ class ModuleNamesX ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) override { - if (cap.get(issuer)) + if (cap.IsEnabled(issuer)) prefixes = memb->GetAllPrefixChars(); return MOD_RES_PASSTHRU; @@ -84,7 +84,7 @@ class ModuleNamesX ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) override { - if ((!memb) || (!cap.get(source))) + if ((!memb) || (!cap.IsEnabled(source))) return MOD_RES_PASSTHRU; // Don't do anything if the user has only one prefix diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 5b7ef0fb8..3fdf8c24e 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -338,7 +338,7 @@ class CommandAuthenticate : public SplitCommand CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { { - if (!cap.get(user)) + if (!cap.IsEnabled(user)) return CMD_FAILURE; if (parameters[0].find(' ') != std::string::npos || parameters[0][0] == ':') diff --git a/src/modules/m_spanningtree/tags.cpp b/src/modules/m_spanningtree/tags.cpp index 4accf53bd..e4eca54c8 100644 --- a/src/modules/m_spanningtree/tags.cpp +++ b/src/modules/m_spanningtree/tags.cpp @@ -34,5 +34,5 @@ void ServiceTag::OnPopulateTags(ClientProtocol::Message& msg) bool ServiceTag::ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) { - return ctctagcap.get(user); + return ctctagcap.IsEnabled(user); } diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp index f9e3ffae3..8c2ab9a51 100644 --- a/src/modules/m_uhnames.cpp +++ b/src/modules/m_uhnames.cpp @@ -64,7 +64,7 @@ class ModuleUHNames { if (!parameters.empty() && irc::equals(parameters[0], "UHNAMES")) { - cap.set(user, true); + cap.Set(user, true); return MOD_RES_DENY; } } @@ -73,7 +73,7 @@ class ModuleUHNames ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) override { - if (cap.get(issuer)) + if (cap.IsEnabled(issuer)) nick = memb->user->GetFullHost(); return MOD_RES_PASSTHRU; |
