X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=37478243faff19eb27cc3eb9264c9ed7859fa329;hb=be0d7ab72ab276f63eacc5c6600ea13e9dc0666c;hp=36674b9c5a41c41f5f88629e65d3a2cadcaca470;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 36674b9c5..37478243f 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -55,19 +55,14 @@ class CommandCAP : public Command
 
 		if (subcommand == "REQ")
 		{
-			CapEvent Data(creator, "cap_req");
-
-			Data.type = subcommand;
-			Data.user = user;
-			Data.creator = this->creator;
-
 			if (parameters.size() < 2)
 				return CMD_FAILURE;
 
+			CapEvent Data(creator, user, CapEvent::CAPEVENT_REQ);
+
 			// tokenize the input into a nice list of requested caps
-			std::string param = parameters[1];
 			std::string cap_;
-			irc::spacesepstream cap_stream(param);
+			irc::spacesepstream cap_stream(parameters[1]);
 
 			while (cap_stream.GetToken(cap_))
 			{
@@ -77,17 +72,17 @@ class CommandCAP : public Command
 			reghold.set(user, 1);
 			Data.Send();
 
-			if (Data.ack.size() > 0)
+			if (Data.wanted.empty())
 			{
-				std::string AckResult = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
-				user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), AckResult.c_str());
+				user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), parameters[1].c_str());
+				return CMD_SUCCESS;
 			}
 
-			if (Data.wanted.size() > 0)
-			{
-				std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
-				user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), NakResult.c_str());
-			}
+			// HACK: reset all of the caps which were enabled on this user because a cap request is atomic.
+			for (std::vector<std::pair<GenericCap*, int> >::iterator iter = Data.changed.begin(); iter != Data.changed.end(); ++iter)
+				iter->first->ext.set(user, iter->second);
+
+			user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), parameters[1].c_str());
 		}
 		else if (subcommand == "END")
 		{
@@ -95,11 +90,7 @@ class CommandCAP : public Command
 		}
 		else if ((subcommand == "LS") || (subcommand == "LIST"))
 		{
-			CapEvent Data(creator, subcommand == "LS" ? "cap_ls" : "cap_list");
-
-			Data.type = subcommand;
-			Data.user = user;
-			Data.creator = this->creator;
+			CapEvent Data(creator, user, subcommand == "LS" ? CapEvent::CAPEVENT_LS : CapEvent::CAPEVENT_LIST);
 
 			reghold.set(user, 1);
 			Data.Send();
@@ -107,31 +98,28 @@ class CommandCAP : public Command
 			std::string Result;
 			if (Data.wanted.size() > 0)
 				Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
-			else
-				Result = "";
 
 			user->WriteServ("CAP %s %s :%s", user->nick.c_str(), subcommand.c_str(), Result.c_str());
 		}
 		else if (subcommand == "CLEAR")
 		{
-			CapEvent Data(creator, "cap_clear");
-
-			Data.type = subcommand;
-			Data.user = user;
-			Data.creator = this->creator;
+			CapEvent Data(creator, user, CapEvent::CAPEVENT_CLEAR);
 
 			reghold.set(user, 1);
 			Data.Send();
 
-			std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+			std::string Result;
+			if (!Data.ack.empty())
+				Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
 			user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), Result.c_str());
 		}
 		else
 		{
 			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s %s :Invalid CAP subcommand", user->nick.c_str(), subcommand.c_str());
+			return CMD_FAILURE;
 		}
 
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -142,11 +130,15 @@ class ModuleCAP : public Module
 	ModuleCAP()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Extensions.Register(&cmd.reghold);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->AddService(cmd.reghold);
 
 		Implementation eventlist[] = { I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	ModResult OnCheckReady(LocalUser* user)