X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=db5d85f0f09dc92f001d9cfb962176a6965470a1;hb=8c71a2a6304f0d77aa7738e04a44f366a158cadd;hp=35c24fd23c4aca0b84233452ccd33da46c101477;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 35c24fd23..db5d85f0f 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -42,14 +42,15 @@ class CommandCAP : public Command
  public:
 	LocalIntExt reghold;
 	CommandCAP (Module* mod) : Command(mod, "CAP", 1),
-		reghold("CAP_REGHOLD", mod)
+		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")
 		{
@@ -64,6 +65,7 @@ class CommandCAP : public Command
 
 			while (cap_stream.GetToken(cap_))
 			{
+				std::transform(cap_.begin(), cap_.end(), cap_.begin(), ::tolower);
 				Data.wanted.push_back(cap_);
 			}
 
@@ -72,14 +74,14 @@ class CommandCAP : public Command
 
 			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")
@@ -93,8 +95,8 @@ class CommandCAP : public Command
 			reghold.set(user, 1);
 			Data.Send();
 
-			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")
 		{
@@ -103,12 +105,12 @@ class CommandCAP : public Command
 			reghold.set(user, 1);
 			Data.Send();
 
-			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
 		{
-			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s %s :Invalid CAP subcommand", user->nick.c_str(), subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s :Invalid CAP subcommand", subcommand.c_str());
 			return CMD_FAILURE;
 		}
 
@@ -125,12 +127,6 @@ class ModuleCAP : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(cmd.reghold);
-	}
-
 	ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
 	{
 		/* Users in CAP state get held until CAP END */