From 50030e07fa51d3e8970ca044bf745f513501bfee Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sat, 10 May 2025 14:15:27 +0100
Subject: Make CTCP support more modular.

---
 src/messages.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/messages.cpp')

diff --git a/src/messages.cpp b/src/messages.cpp
index 2ed52b3e7..ec2b255f8 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -340,16 +340,9 @@ void Privmsg::Run(MessageSource &source, const std::vector<Anope::string> &param
 			Anope::string ctcpname, ctcpbody;
 			if (Anope::ParseCTCP(message, ctcpname, ctcpbody))
 			{
-				if (ctcpname.equals_ci("PING"))
-				{
-					IRCD->SendNotice(bi, u->nick, Anope::FormatCTCP("PING", ctcpbody));
-				}
-				else if (ctcpname.equals_ci("VERSION"))
-				{
-					Module *enc = ModuleManager::FindFirstOf(ENCRYPTION);
-					IRCD->SendNotice(bi, u->nick, Anope::FormatCTCP("VERSION", Anope::printf("Anope-%s %s -- %s -- %s", Anope::Version().c_str(),
-						Anope::VersionBuildString().c_str(), IRCD->GetProtocolName().c_str(), enc ? enc->name.c_str() : "(none)")));
-				}
+				auto ctcpit = bi->ctcps.find(ctcpname);
+				if (ctcpit != bi->ctcps.end())
+					ctcpit->second(bi, u, ctcpbody);
 				return;
 			}
 
-- 
cgit