1 files changed, 14 insertions, 19 deletions
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 01c6ebf4a..5a208ec8a 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -73,35 +73,30 @@ public:
 	}
 };
 
+class TREFactory : public RegexFactory {
+ public:
+	TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
+	Regex* Create(const std::string& expr)
+	{
+		return new TRERegex(expr);
+	}
+};
+
 class ModuleRegexTRE : public Module
 {
+	TREFactory trf;
 public:
-	ModuleRegexTRE() 	{
-		ServerInstance->Modules->PublishInterface("RegularExpression", this);
+	ModuleRegexTRE() : trf(this) {
+		ServerInstance->Modules->AddService(trf);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
 		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR);
 	}
 
-	virtual ~ModuleRegexTRE()
+	~ModuleRegexTRE()
 	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
-	}
-
-	void OnRequest(Request& request)
-	{
-		if (strcmp("REGEX-NAME", request.id) == 0)
-		{
-			static_cast<RegexNameRequest&>(request).result = "tre";
-		}
-		else if (strcmp("REGEX", request.id) == 0)
-		{
-			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-			std::string rx = rfr.GetRegex();
-			rfr.result = new TRERegex(rx);
-		}
 	}
 };