From 321e75e27fe582d25d7b4cf3989c261204eeef4e Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 20 Jan 2026 16:49:15 +0000
Subject: Remove the u_ prefix from user modes.

---
 modules/account.cpp            | 2 +-
 modules/noctcp.cpp             | 2 +-
 modules/services.cpp           | 2 +-
 modules/spanningtree/capab.cpp | 8 +++++++-
 modules/stripcolor.cpp         | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/account.cpp b/modules/account.cpp
index f7cce63ed..de0ec646b 100644
--- a/modules/account.cpp
+++ b/modules/account.cpp
@@ -96,7 +96,7 @@ public:
 		, accountext(mod)
 		, accountidext(mod, "accountid", ExtensionType::USER, true)
 		, accountnicksext(mod, "accountnicks", ExtensionType::USER, true)
-		, identifiedmode(mod, "u_registered")
+		, identifiedmode(mod, "registered")
 	{
 	}
 
diff --git a/modules/noctcp.cpp b/modules/noctcp.cpp
index c80b49db8..31d69760f 100644
--- a/modules/noctcp.cpp
+++ b/modules/noctcp.cpp
@@ -46,7 +46,7 @@ public:
 		, exemptionprov(this)
 		, extban(this, "noctcp", 'C')
 		, nc(this, "noctcp", 'C')
-		, ncu(this, "u_noctcp", 'T')
+		, ncu(this, "noctcp", 'T')
 	{
 	}
 
diff --git a/modules/services.cpp b/modules/services.cpp
index dc8aacacc..1a184607e 100644
--- a/modules/services.cpp
+++ b/modules/services.cpp
@@ -133,7 +133,7 @@ class RegisteredUser final
 
 public:
 	RegisteredUser(Module* Creator)
-		: SimpleUserMode(Creator, "u_registered", 'r')
+		: SimpleUserMode(Creator, "registered", 'r')
 	{
 		if (ServerInstance->Config->ConfValue("servicesintegration")->getBool("disablemodes", true))
 			DisableAutoRegister();
diff --git a/modules/spanningtree/capab.cpp b/modules/spanningtree/capab.cpp
index c8edb00ff..302e77e02 100644
--- a/modules/spanningtree/capab.cpp
+++ b/modules/spanningtree/capab.cpp
@@ -273,8 +273,14 @@ std::string TreeSocket::BuildModeList(ModeType mtype)
 		{
 			if (mtype == MODETYPE_USER)
 			{
-				if (mh->name == "sslonly")
+				if (mh->name == "noctcp")
+					mname = "u_registered";
+				else if (mh->name == "registered")
+					mname = "u_registered";
+				else if (mh->name == "sslonly")
 					mname = "sslqueries";
+				else if (mh->name == "stripcolor")
+					mname = "u_stripcolor";
 			}
 		}
 		// END COMPATIBILITY CODE
diff --git a/modules/stripcolor.cpp b/modules/stripcolor.cpp
index 04c7b2c96..a485c0b60 100644
--- a/modules/stripcolor.cpp
+++ b/modules/stripcolor.cpp
@@ -42,7 +42,7 @@ public:
 		, exemptionprov(this)
 		, extban(this, "stripcolor", 'S')
 		, csc(this, "stripcolor", 'S')
-		, usc(this, "u_stripcolor", 'S')
+		, usc(this, "stripcolor", 'S')
 	{
 	}
 
-- 
cgit v1.3.1-10-gc9f91