From 056d0b43831857c7258fa734d0ecac05858fa449 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 27 Mar 2022 07:57:50 +0100
Subject: Pack the mode set more efficiently and add support for numeric modes.

---
 src/users.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index 529d25807..c99682e31 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -57,10 +57,9 @@ std::string User::GetModeLetters(bool includeparams) const
 	std::string ret(1, '+');
 	std::string params;
 
-	for (unsigned char i = 'A'; i <= 'z'; i++)
+	for (const auto& [_, mh] : ServerInstance->Modes.GetModes(MODETYPE_USER))
 	{
-		const ModeHandler* const mh = ServerInstance->Modes.FindMode(i, MODETYPE_USER);
-		if ((!mh) || (!IsModeSet(mh)))
+		if (!IsModeSet(mh))
 			continue;
 
 		ret.push_back(mh->GetModeChar());
@@ -176,7 +175,7 @@ bool LocalUser::HasModePermission(const ModeHandler* mh) const
 	if (!ModeParser::IsModeChar(mode))
 		return false;
 
-	return ((mh->GetModeType() == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')];
+	return ((mh->GetModeType() == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[ModeParser::GetModeIndex(mode)];
 
 }
 /*
@@ -417,7 +416,7 @@ namespace
 			if (chr == '*')
 				modeset.set();
 			else if (ModeParser::IsModeChar(chr))
-				modeset.set(chr - 'A');
+				modeset.set(ModeParser::GetModeIndex(chr));
 			else
 				ServerInstance->Logs.Log("CONFIG", LOG_DEFAULT, "'%c' is not a valid value for <class:%s>, ignoring...", chr, field.c_str());
 		}
@@ -431,7 +430,6 @@ void OperInfo::init()
 	AllowedUserModes.reset();
 	AllowedChanModes.reset();
 	AllowedSnomasks.reset();
-	AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
 	for (const auto& tag : class_blocks)
 	{
-- 
cgit v1.3.1-10-gc9f91