2 files changed, 39 insertions, 38 deletions

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 36674b9c5..662e128a4 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_))
 			{
@@ -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;
 	}
 };
 
diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index 604fdb0ef..ce7e7f394 100644
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -21,18 +21,22 @@
 #ifndef M_CAP_H
 #define M_CAP_H
 
-#include <map>
-#include <string>
-
 class CapEvent : public Event
 {
  public:
-	irc::string type;
+	enum CapEventType
+	{
+		CAPEVENT_REQ,
+		CAPEVENT_LS,
+		CAPEVENT_LIST,
+		CAPEVENT_CLEAR
+	};
+
+	CapEventType type;
 	std::vector<std::string> wanted;
 	std::vector<std::string> ack;
 	User* user;
-	Module* creator;
-	CapEvent(Module* sender, const std::string& t) : Event(sender, t) {}
+	CapEvent(Module* sender, User* u, CapEventType capevtype) : Event(sender, "cap_request"), type(capevtype), user(u) {}
 };
 
 class GenericCap
@@ -47,28 +51,37 @@ class GenericCap
 
 	void HandleEvent(Event& ev)
 	{
+		if (ev.id != "cap_request")
+			return;
+
 		CapEvent *data = static_cast<CapEvent*>(&ev);
-		if (ev.id == "cap_req")
+		if (data->type == CapEvent::CAPEVENT_REQ)
 		{
-			std::vector<std::string>::iterator it;
-			if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end())
+			for (std::vector<std::string>::iterator it = data->wanted.begin(); it != data->wanted.end(); ++it)
 			{
-				// we can handle this, so ACK it, and remove it from the wanted list
-				data->ack.push_back(*it);
-				data->wanted.erase(it);
-				ext.set(data->user, 1);
+				if (it->empty())
+					continue;
+				bool enablecap = ((*it)[0] != '-');
+				if (((enablecap) && (*it == cap)) || (*it == "-" + cap))
+				{
+					// we can handle this, so ACK it, and remove it from the wanted list
+					data->ack.push_back(*it);
+					data->wanted.erase(it);
+					ext.set(data->user, enablecap ? 1 : 0);
+					break;
+				}
 			}
 		}
-		else if (ev.id == "cap_ls")
+		else if (data->type == CapEvent::CAPEVENT_LS)
 		{
 			data->wanted.push_back(cap);
 		}
-		else if (ev.id == "cap_list")
+		else if (data->type == CapEvent::CAPEVENT_LIST)
 		{
 			if (ext.get(data->user))
 				data->wanted.push_back(cap);
 		}
-		else if (ev.id == "cap_clear")
+		else if (data->type == CapEvent::CAPEVENT_CLEAR)
 		{
 			data->ack.push_back("-" + cap);
 			ext.set(data->user, 0);