Allow specifying a module name in SetPriority.

9 files changed, 10 insertions, 21 deletions

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 816765a9e..a52523943 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -403,8 +403,7 @@ public:
 	void Prioritize() override
 	{
 		// Prioritise after spanningtree so that channel aliases show the alias before the effects.
-		Module* linkmod = ServerInstance->Modules.Find("spanningtree");
-		ServerInstance->Modules.SetPriority(this, I_OnUserPostMessage, PRIORITY_AFTER, linkmod);
+		ServerInstance->Modules.SetPriority(this, I_OnUserPostMessage, PRIORITY_AFTER, "spanningtree");
 	}
 };
 
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 1c4eff783..d59d02796 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -93,8 +93,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module* corexline = ServerInstance->Modules.Find("core_xline");
-		ServerInstance->Modules.SetPriority(this, I_OnChangeRemoteAddress, PRIORITY_AFTER, corexline);
+		ServerInstance->Modules.SetPriority(this, I_OnChangeRemoteAddress, PRIORITY_AFTER, "core_xline");
 	}
 
 	void ReadConfig(ConfigStatus& status) override
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 85a91d7d3..63cc574b6 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -592,8 +592,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module* corexline = ServerInstance->Modules.Find("core_xline");
-		ServerInstance->Modules.SetPriority(this, I_OnChangeRemoteAddress, PRIORITY_AFTER, corexline);
+		ServerInstance->Modules.SetPriority(this, I_OnChangeRemoteAddress, PRIORITY_AFTER, "core_xline");
 	}
 
 	void ReadConfig(ConfigStatus& status) override
diff --git a/src/modules/m_ircv3_labeledresponse.cpp b/src/modules/m_ircv3_labeledresponse.cpp
index 8b1e8d04f..8fe54dc4e 100644
--- a/src/modules/m_ircv3_labeledresponse.cpp
+++ b/src/modules/m_ircv3_labeledresponse.cpp
@@ -228,8 +228,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module* alias = ServerInstance->Modules.Find("alias");
-		ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias);
+		ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, "alias");
 	}
 };
 
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 0a09466c8..699f109bc 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -171,8 +171,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module* nflood = ServerInstance->Modules.Find("nickflood");
-		ServerInstance->Modules.SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood);
+		ServerInstance->Modules.SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, "nickflood");
 	}
 };
 
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 896967f5c..d0c16492f 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -113,8 +113,7 @@ public:
 	void Prioritize() override
 	{
 		// m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
-		Module* opermodes = ServerInstance->Modules.Find("opermodes");
-		ServerInstance->Modules.SetPriority(this, I_OnPostOperLogin, PRIORITY_AFTER, opermodes);
+		ServerInstance->Modules.SetPriority(this, I_OnPostOperLogin, PRIORITY_AFTER, "opermodes");
 	}
 };
 
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index a7c4d397b..cfd3b0434 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -358,8 +358,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module* mod = ServerInstance->Modules.Find("gateway");
-		ServerInstance->Modules.SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, mod);
+		ServerInstance->Modules.SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, "gateway");
 	}
 };
 
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 8fb2b6710..9ec55e9d7 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -130,11 +130,8 @@ public:
 
 	void Prioritize() override
 	{
-		Module* disable = ServerInstance->Modules.Find("disable");
-		ServerInstance->Modules.SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
-
-		Module* override = ServerInstance->Modules.Find("override");
-		ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
+		ServerInstance->Modules.SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, "disable");
+		ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, "override");
 	}
 };
 
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index af2a4dbf9..ec0ccae9d 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -191,8 +191,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module* alias = ServerInstance->Modules.Find("alias");
-		ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias);
+		ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, "alias");
 	}
 
 	ModResult OnStats(Stats::Context& stats) override