Move FindUUID to the UserManager class.

9 files changed, 10 insertions, 10 deletions

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index ce93ea507..d6349fb6e 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -310,7 +310,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 						return;
 
 					// The nick of the target is necessary for building the PUSH message
-					User* const target = ServerInstance->FindUUID(line.substr(13, UIDGenerator::UUID_LENGTH));
+					User* const target = ServerInstance->Users.FindUUID(line.substr(13, UIDGenerator::UUID_LENGTH));
 					if (!target)
 						return;
 
@@ -481,7 +481,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, Comm
 		// Translate user mode changes with timestamp to MODE
 		if (params[0][0] != '#')
 		{
-			User* user = ServerInstance->FindUUID(params[0]);
+			User* user = ServerInstance->Users.FindUUID(params[0]);
 			if (!user)
 				return false;
 
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index f98b69414..794555d91 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -206,7 +206,7 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour
 	// Comma not required anymore if the user has no modes
 	const std::string::size_type ubegin = (comma == std::string::npos ? 0 : comma+1);
 	std::string uuid(item, ubegin, UIDGenerator::UUID_LENGTH);
-	User* who = ServerInstance->FindUUID(uuid);
+	User* who = ServerInstance->Users.FindUUID(uuid);
 	if (!who)
 	{
 		// Probably KILLed, ignore
diff --git a/src/modules/m_spanningtree/idle.cpp b/src/modules/m_spanningtree/idle.cpp
index 8e075e312..49a8b7cd7 100644
--- a/src/modules/m_spanningtree/idle.cpp
+++ b/src/modules/m_spanningtree/idle.cpp
@@ -39,7 +39,7 @@ CmdResult CommandIdle::HandleRemote(RemoteUser* issuer, Params& params)
 	 * the number of seconds 'issuer' has been idle.
 	 */
 
-	User* target = ServerInstance->FindUUID(params[0]);
+	User* target = ServerInstance->Users.FindUUID(params[0]);
 	if ((!target) || (target->registered != REG_ALL))
 		return CMD_FAILURE;
 
diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index ec89c1d7e..aa2d041d7 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -60,7 +60,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 	}
 	else
 	{
-		User* u = ServerInstance->FindUUID(params[0]);
+		User* u = ServerInstance->Users.FindUUID(params[0]);
 		if (u)
 		{
 			ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
diff --git a/src/modules/m_spanningtree/num.cpp b/src/modules/m_spanningtree/num.cpp
index 2d7c484e1..d85faa373 100644
--- a/src/modules/m_spanningtree/num.cpp
+++ b/src/modules/m_spanningtree/num.cpp
@@ -26,7 +26,7 @@
 
 CmdResult CommandNum::HandleServer(TreeServer* server, CommandBase::Params& params)
 {
-	User* const target = ServerInstance->FindUUID(params[1]);
+	User* const target = ServerInstance->Users.FindUUID(params[1]);
 	if (!target)
 		return CMD_FAILURE;
 
diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index f9af52a9f..3063ea50a 100644
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -32,7 +32,7 @@
  */
 CmdResult CommandSave::Handle(User* user, Params& params)
 {
-	User* u = ServerInstance->FindUUID(params[0]);
+	User* u = ServerInstance->Users.FindUUID(params[0]);
 	if (!u)
 		return CMD_FAILURE;
 
diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 9598a6348..0d3881f43 100644
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -33,7 +33,7 @@ CmdResult CommandSVSJoin::Handle(User* user, Params& parameters)
 		return CMD_FAILURE;
 
 	// Check target exists
-	User* u = ServerInstance->FindUUID(parameters[0]);
+	User* u = ServerInstance->Users.FindUUID(parameters[0]);
 	if (!u)
 		return CMD_FAILURE;
 
diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 11172f607..6e5f9eb55 100644
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -28,7 +28,7 @@
 
 CmdResult CommandSVSPart::Handle(User* user, Params& parameters)
 {
-	User* u = ServerInstance->FindUUID(parameters[0]);
+	User* u = ServerInstance->Users.FindUUID(parameters[0]);
 	if (!u)
 		return CMD_FAILURE;
 
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 084da63ff..5dd7f8dd4 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -242,7 +242,7 @@ User* TreeSocket::FindSource(const std::string& prefix, const std::string& comma
 	else
 	{
 		// If the prefix string is a uuid FindUUID() returns the appropriate User object
-		User* user = ServerInstance->FindUUID(prefix);
+		User* user = ServerInstance->Users.FindUUID(prefix);
 		if (user)
 			return user;
 	}