X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=2c2178a187bce3c15bdd6ecc6ac3762635de2203;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=605423ae049f0bf8c0472965c4caefee386b8db2;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 605423ae0..2c2178a18 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -39,17 +39,21 @@ CAP END
  */
 class CommandCAP : public Command
 {
+	Events::ModuleEventProvider capevprov;
+
  public:
 	LocalIntExt reghold;
 	CommandCAP (Module* mod) : Command(mod, "CAP", 1),
-		reghold("CAP_REGHOLD", mod)
+		capevprov(mod, "event/cap"),
+		reghold("CAP_REGHOLD", ExtensionItem::EXT_USER, mod)
 	{
 		works_before_reg = true;
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		irc::string subcommand = parameters[0].c_str();
+		std::string subcommand(parameters[0].length(), ' ');
+		std::transform(parameters[0].begin(), parameters[0].end(), subcommand.begin(), ::toupper);
 
 		if (subcommand == "REQ")
 		{
@@ -69,18 +73,18 @@ class CommandCAP : public Command
 			}
 
 			reghold.set(user, 1);
-			Data.Send();
+			FOREACH_MOD_CUSTOM(capevprov, GenericCap, OnCapEvent, (Data));
 
 			if (Data.ack.size() > 0)
 			{
-				std::string AckResult = irc::stringjoiner(Data.ack).GetJoined();
-				user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), AckResult.c_str());
+				std::string AckResult = irc::stringjoiner(Data.ack);
+				user->WriteCommand("CAP", "ACK :" + AckResult);
 			}
 
 			if (Data.wanted.size() > 0)
 			{
-				std::string NakResult = irc::stringjoiner(Data.wanted).GetJoined();
-				user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), NakResult.c_str());
+				std::string NakResult = irc::stringjoiner(Data.wanted);
+				user->WriteCommand("CAP", "NAK :" + NakResult);
 			}
 		}
 		else if (subcommand == "END")
@@ -92,20 +96,20 @@ class CommandCAP : public Command
 			CapEvent Data(creator, user, subcommand == "LS" ? CapEvent::CAPEVENT_LS : CapEvent::CAPEVENT_LIST);
 
 			reghold.set(user, 1);
-			Data.Send();
+			FOREACH_MOD_CUSTOM(capevprov, GenericCap, OnCapEvent, (Data));
 
-			std::string Result = irc::stringjoiner(Data.wanted).GetJoined();
-			user->WriteServ("CAP %s %s :%s", user->nick.c_str(), subcommand.c_str(), Result.c_str());
+			std::string Result = irc::stringjoiner(Data.wanted);
+			user->WriteCommand("CAP", subcommand + " :" + Result);
 		}
 		else if (subcommand == "CLEAR")
 		{
 			CapEvent Data(creator, user, CapEvent::CAPEVENT_CLEAR);
 
 			reghold.set(user, 1);
-			Data.Send();
+			FOREACH_MOD_CUSTOM(capevprov, GenericCap, OnCapEvent, (Data));
 
-			std::string Result = irc::stringjoiner(Data.ack).GetJoined();
-			user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), Result.c_str());
+			std::string Result = irc::stringjoiner(Data.ack);
+			user->WriteCommand("CAP", "ACK :" + Result);
 		}
 		else
 		{