Make MyClass private and move everything to GetClass.

5 files changed, 6 insertions, 14 deletions

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 99e7f7349..bdb65c142 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -33,7 +33,7 @@ class ModuleModesOnConnect : public Module
 
 	void OnUserConnect(LocalUser* user) override
 	{
-		const std::string modestr = user->MyClass->config->getString("modes");
+		const std::string modestr = user->GetClass()->config->getString("modes");
 		if (modestr.empty())
 			return;
 
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 98b121a0d..b58b8bdc2 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -372,23 +372,15 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 
 	void OnSetUserIP(LocalUser* user) override
 	{
-		if (user->exempt || user->quitting || !DNS)
+		if (user->exempt || user->quitting || !DNS || !user->GetClass())
 			return;
 
 		// Clients can't be in a DNSBL if they aren't connected via IPv4 or IPv6.
 		if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6)
 			return;
 
-		if (user->MyClass)
-		{
-			if (!user->MyClass->config->getBool("usednsbl", true))
-				return;
-		}
-		else
-		{
-			ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP");
+		if (!user->GetClass()->config->getBool("usednsbl", true))
 			return;
-		}
 
 		std::string reversedip;
 		if (user->client_sa.family() == AF_INET)
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 3e77d2bea..4275ac0ca 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -330,7 +330,7 @@ class ModuleIdent : public Module
 		if (user->registered == REG_ALL || user->quitting)
 			return;
 
-		std::shared_ptr<ConfigTag> tag = user->MyClass->config;
+		std::shared_ptr<ConfigTag> tag = user->GetClass()->config;
 		if (!tag->getBool("useident", true))
 		{
 			state.set(user, IDENT_SKIPPED);
diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index d141ff4d4..655f7cb4f 100644
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -86,7 +86,7 @@ class ModulePassForward : public Module
 			return;
 
 		// If the connect class requires a password, don't forward it
-		if (!user->MyClass->config->getString("password").empty())
+		if (!user->GetClass()->config->getString("password").empty())
 			return;
 
 		AccountExtItem* actext = GetAccountExtItem();
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 20e4a6a45..180f46b72 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -167,7 +167,7 @@ class ModuleSQLAuth : public Module
 	ModResult OnUserRegister(LocalUser* user) override
 	{
 		// Note this is their initial (unresolved) connect block
-		std::shared_ptr<ConfigTag> tag = user->MyClass->config;
+		std::shared_ptr<ConfigTag> tag = user->GetClass()->config;
 		if (!tag->getBool("usesqlauth", true))
 			return MOD_RES_PASSTHRU;