From 54db5b5e0aa65eac64ca3ce783a7bdb400134656 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 31 Jan 2022 00:03:39 +0000 Subject: Fix the case of Membership::GetRank. --- src/modules/m_auditorium.cpp | 2 +- src/modules/m_channelban.cpp | 2 +- src/modules/m_hidelist.cpp | 2 +- src/modules/m_hidemode.cpp | 6 +++--- src/modules/m_ircv3_ctctags.cpp | 2 +- src/modules/m_ircv3_invitenotify.cpp | 2 +- src/modules/m_opmoderated.cpp | 2 +- src/modules/m_override.cpp | 4 ++-- src/modules/m_spanningtree/utils.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 979173d0b..0bb3a9478 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -101,7 +101,7 @@ public: return true; ModResult res = CheckExemption::Call(exemptionprov, memb->user, memb->chan, "auditorium-vis"); - return res.check(OpsVisible && memb->getRank() >= OP_VALUE); + return res.check(OpsVisible && memb->GetRank() >= OP_VALUE); } /* Can they see this specific membership? */ diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp index 0658edfdf..c2d396bcd 100644 --- a/src/modules/m_channelban.cpp +++ b/src/modules/m_channelban.cpp @@ -49,7 +49,7 @@ public: { if (!InspIRCd::Match(memb->chan->name, target)) continue; - if (!status || memb->getRank() >= mh->GetPrefixRank()) + if (!status || memb->GetRank() >= mh->GetPrefixRank()) return true; } return false; diff --git a/src/modules/m_hidelist.cpp b/src/modules/m_hidelist.cpp index a397264a7..7b2157382 100644 --- a/src/modules/m_hidelist.cpp +++ b/src/modules/m_hidelist.cpp @@ -43,7 +43,7 @@ public: // If the user requesting the list is a member of the channel see if they have the // rank required to view the list Membership* memb = chan->GetUser(user); - if ((memb) && (memb->getRank() >= minrank)) + if ((memb) && (memb->GetRank() >= minrank)) return true; if (user->HasPrivPermission("channels/auspex")) diff --git a/src/modules/m_hidemode.cpp b/src/modules/m_hidemode.cpp index b47b3a885..4c1200e96 100644 --- a/src/modules/m_hidemode.cpp +++ b/src/modules/m_hidemode.cpp @@ -140,12 +140,12 @@ class ModeHook final return MOD_RES_PASSTHRU; // Check cache first - const FilteredModeMap::const_iterator it = cache.find(memb->getRank()); + const FilteredModeMap::const_iterator it = cache.find(memb->GetRank()); if (it != cache.end()) return HandleResult(it->second, messagelist); // Message for this rank isn't cached, generate it now - const Modes::ChangeList* const filteredchangelist = FilterModeChangeList(mode, memb->getRank()); + const Modes::ChangeList* const filteredchangelist = FilterModeChangeList(mode, memb->GetRank()); // If no new change list was generated (above method returned NULL) it means the member and everyone else // with the same rank can see everything in the original change list. @@ -168,7 +168,7 @@ class ModeHook final } // Cache the result in all cases so it can be reused for further members with the same rank - cache.emplace(memb->getRank(), finalmsgplist); + cache.emplace(memb->GetRank(), finalmsgplist); return HandleResult(finalmsgplist, messagelist); } diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp index 3437ed865..b2b059a7a 100644 --- a/src/modules/m_ircv3_ctctags.cpp +++ b/src/modules/m_ircv3_ctctags.cpp @@ -95,7 +95,7 @@ private: continue; // Don't send to unprivileged or exempt users. - if (memb->getRank() < minrank || msgdetails.exemptions.count(luser)) + if (memb->GetRank() < minrank || msgdetails.exemptions.count(luser)) continue; // Send to users if they have the capability. diff --git a/src/modules/m_ircv3_invitenotify.cpp b/src/modules/m_ircv3_invitenotify.cpp index f2f23b069..916d6fa6f 100644 --- a/src/modules/m_ircv3_invitenotify.cpp +++ b/src/modules/m_ircv3_invitenotify.cpp @@ -44,7 +44,7 @@ public: continue; // Check whether the member has a high enough rank to see the notification - if (memb->getRank() < notifyrank) + if (memb->GetRank() < notifyrank) continue; // Caps are only set on local users diff --git a/src/modules/m_opmoderated.cpp b/src/modules/m_opmoderated.cpp index 1ec279f26..52977c2dc 100644 --- a/src/modules/m_opmoderated.cpp +++ b/src/modules/m_opmoderated.cpp @@ -58,7 +58,7 @@ private: // Add any unprivileged users to the exemption list. for (const auto& [u, memb] : chan->GetUsers()) { - if (memb->getRank() < OP_VALUE) + if (memb->GetRank() < OP_VALUE) exemptions.insert(u); } } diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 9a24b8966..3f47a3441 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -137,8 +137,8 @@ public: if (source->IsOper() && CanOverride(source,"KICK")) { // If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice - if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) || - (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE)) + if ((memb->chan->GetPrefixValue(source) < memb->GetRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) || + (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->GetRank() == HALFOP_VALUE)) { ServerInstance->SNO.WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")"); return MOD_RES_ALLOW; diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index c75d3cf0c..539dbe82f 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -151,7 +151,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet if (IS_LOCAL(user)) continue; - if (minrank && memb->getRank() < minrank) + if (minrank && memb->GetRank() < minrank) continue; if (exempt_list.find(user) == exempt_list.end()) -- cgit v1.3.1-10-gc9f91