Move DefaultIsNick/DefaultIsUser/IsNick/IsUser to UserManager.

10 files changed, 13 insertions, 13 deletions

diff --git a/modules/chgident.cpp b/modules/chgident.cpp
index 06bdda768..593ceaae1 100644
--- a/modules/chgident.cpp
+++ b/modules/chgident.cpp
@@ -53,7 +53,7 @@ public:
 			return CmdResult::FAILURE;
 		}
 
-		if (!ServerInstance->IsUser(parameters[1]))
+		if (!ServerInstance->Users.IsUser(parameters[1]))
 		{
 			user->WriteNotice("*** CHGIDENT: Invalid characters in username");
 			return CmdResult::FAILURE;
diff --git a/modules/codepage.cpp b/modules/codepage.cpp
index f39aba5be..7a8c27e47 100644
--- a/modules/codepage.cpp
+++ b/modules/codepage.cpp
@@ -311,7 +311,7 @@ private:
 	{
 		for (auto* user : ServerInstance->Users.GetLocalUsers())
 		{
-			if (user->nick != user->uuid && !ServerInstance->IsNick(user->nick))
+			if (user->nick != user->uuid && !ServerInstance->Users.IsNick(user->nick))
 				ChangeNick(user, "Your nickname is no longer valid.");
 		}
 	}
@@ -340,13 +340,13 @@ public:
 		, ISupport::EventListener(this)
 		, origcasemap(national_case_insensitive_map)
 		, origcasemapname(ServerInstance->Config->CaseMapping)
-		, origisnick(ServerInstance->IsNick)
+		, origisnick(ServerInstance->Users.IsNick)
 	{
 	}
 
 	~ModuleCodepage() override
 	{
-		ServerInstance->IsNick = origisnick;
+		ServerInstance->Users.IsNick = origisnick;
 		CheckInvalidNick();
 
 		ServerInstance->Config->CaseMapping = origcasemapname;
@@ -416,7 +416,7 @@ public:
 
 		charset = codepagetag->getString("charset");
 		std::swap(codepage, newcodepage);
-		ServerInstance->IsNick = [this](const std::string_view& nick) { return codepage->IsValidNick(nick); };
+		ServerInstance->Users.IsNick = [this](const std::string_view& nick) { return codepage->IsValidNick(nick); };
 		CheckInvalidNick();
 
 		ServerInstance->Config->CaseMapping = name;
diff --git a/modules/core/core_user/cmd_nick.cpp b/modules/core/core_user/cmd_nick.cpp
index 03d280bb0..028a02f86 100644
--- a/modules/core/core_user/cmd_nick.cpp
+++ b/modules/core/core_user/cmd_nick.cpp
@@ -58,7 +58,7 @@ CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 	{
 		newnick = user->uuid;
 	}
-	else if (!ServerInstance->IsNick(newnick))
+	else if (!ServerInstance->Users.IsNick(newnick))
 	{
 		user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, "Erroneous Nickname");
 		return CmdResult::FAILURE;
diff --git a/modules/core/core_user/cmd_user.cpp b/modules/core/core_user/cmd_user.cpp
index 37761e9a0..2cd87b9b5 100644
--- a/modules/core/core_user/cmd_user.cpp
+++ b/modules/core/core_user/cmd_user.cpp
@@ -45,7 +45,7 @@ CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)
 	/* A user may only send the USER command once */
 	if (!(user->connected & User::CONN_USER))
 	{
-		if (!ServerInstance->IsUser(parameters[0]))
+		if (!ServerInstance->Users.IsUser(parameters[0]))
 		{
 			user->WriteNumeric(ERR_INVALIDUSERNAME, name, "Your username is not valid");
 			return CmdResult::FAILURE;
diff --git a/modules/gateway.cpp b/modules/gateway.cpp
index 53d8d7e47..4daee3816 100644
--- a/modules/gateway.cpp
+++ b/modules/gateway.cpp
@@ -386,7 +386,7 @@ public:
 			if (insp::equalsci(type, "username") || insp::equalsci(type, "ident"))
 			{
 				// The IP address should be looked up from the hex IP address.
-				const std::string newuser = tag->getString("newusername", "gateway", ServerInstance->IsUser);
+				const std::string newuser = tag->getString("newusername", "gateway", ServerInstance->Users.IsUser);
 				userhosts.emplace_back(masks, newuser);
 			}
 			else if (insp::equalsci(type, "webirc"))
diff --git a/modules/ident.cpp b/modules/ident.cpp
index 50de7865c..97e504e83 100644
--- a/modules/ident.cpp
+++ b/modules/ident.cpp
@@ -251,7 +251,7 @@ public:
 			 * we're done.
 			 */
 			result += chr;
-			if (!ServerInstance->IsUser(result))
+			if (!ServerInstance->Users.IsUser(result))
 			{
 				result.pop_back();
 				break;
diff --git a/modules/monitor.cpp b/modules/monitor.cpp
index 832c55aa4..5c41018ab 100644
--- a/modules/monitor.cpp
+++ b/modules/monitor.cpp
@@ -122,7 +122,7 @@ public:
 
 	WatchResult Watch(LocalUser* user, const std::string& nick, unsigned long maxwatch)
 	{
-		if (!ServerInstance->IsNick(nick))
+		if (!ServerInstance->Users.IsNick(nick))
 			return WR_INVALIDNICK;
 
 		WatchedList* watched = GetWatchedPriv(user, true);
diff --git a/modules/nicklock.cpp b/modules/nicklock.cpp
index 8b36e449d..ba4c6d9c7 100644
--- a/modules/nicklock.cpp
+++ b/modules/nicklock.cpp
@@ -61,7 +61,7 @@ public:
 		/* Do local sanity checks and bails */
 		if (IS_LOCAL(user))
 		{
-			if (!ServerInstance->IsNick(parameters[1]))
+			if (!ServerInstance->Users.IsNick(parameters[1]))
 			{
 				user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
 				return CmdResult::FAILURE;
diff --git a/modules/sanick.cpp b/modules/sanick.cpp
index 7b1d8a11b..580c405ce 100644
--- a/modules/sanick.cpp
+++ b/modules/sanick.cpp
@@ -59,7 +59,7 @@ public:
 				return CmdResult::FAILURE;
 			}
 
-			if (!ServerInstance->IsNick(parameters[1]))
+			if (!ServerInstance->Users.IsNick(parameters[1]))
 			{
 				user->WriteNotice("*** Invalid nickname: '" + parameters[1] + "'");
 				return CmdResult::FAILURE;
diff --git a/modules/setident.cpp b/modules/setident.cpp
index ef8607d0a..744250ba4 100644
--- a/modules/setident.cpp
+++ b/modules/setident.cpp
@@ -43,7 +43,7 @@ public:
 			return CmdResult::FAILURE;
 		}
 
-		if (!ServerInstance->IsUser(parameters[0]))
+		if (!ServerInstance->Users.IsUser(parameters[0]))
 		{
 			user->WriteNotice("*** SETIDENT: Invalid characters in username");
 			return CmdResult::FAILURE;