X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.h;h=809b0f4cf2eb3062f6537b9351a1ca3d124d1d64;hb=26cd5393c9308fabe73c41870f06f73a5b001cd7;hp=ce5aec8ba4b506c62128de18726aeb4904177280;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index ce5aec8ba..809b0f4cf 100644
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -17,7 +17,7 @@
 #include <map>
 #include <string>
 
-class CapData : public classbase
+class CapEvent : public Event
 {
  public:
 	irc::string type;
@@ -25,44 +25,51 @@ class CapData : public classbase
 	std::vector<std::string> ack;
 	User* user;
 	Module* creator;
+	CapEvent(Module* sender, const std::string& t) : Event(sender, t) {}
 };
 
-void GenericCapHandler(Event* ev, const std::string &extname, const std::string &cap)
+class GenericCap
 {
-	if (ev->GetEventID() == "cap_req")
-	{
-		CapData *data = (CapData *) ev->GetData();
-
-		std::vector<std::string>::iterator it;
-		if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end())
-		{
-			// we can handle this, so ACK it, and remove it from the wanted list
-			data->ack.push_back(*it);
-			data->wanted.erase(it);
-			data->user->Extend(extname);
-		}
-	}
-
-	if (ev->GetEventID() == "cap_ls")
+ public:
+	LocalIntExt ext;
+	const std::string cap;
+	GenericCap(Module* parent, const std::string &Cap) : ext("cap_" + Cap, parent), cap(Cap)
 	{
-		CapData *data = (CapData *) ev->GetData();
-		data->wanted.push_back(cap);
+		Extensible::Register(&ext);
 	}
 
-	if (ev->GetEventID() == "cap_list")
+	void HandleEvent(Event& ev)
 	{
-		CapData *data = (CapData *) ev->GetData();
+		CapEvent *data = static_cast<CapEvent*>(&ev);
+		if (ev.id == "cap_req")
+		{
+			std::vector<std::string>::iterator it;
+			if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end())
+			{
+				// 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 (data->user->GetExt(extname))
+		if (ev.id == "cap_ls")
+		{
 			data->wanted.push_back(cap);
-	}
+		}
 
-	if (ev->GetEventID() == "cap_clear")
-	{
-		CapData *data = (CapData *) ev->GetData();
-		data->ack.push_back("-" + cap);
-		data->user->Shrink(extname);
+		if (ev.id == "cap_list")
+		{
+			if (ext.get(data->user))
+				data->wanted.push_back(cap);
+		}
+
+		if (ev.id == "cap_clear")
+		{
+			data->ack.push_back("-" + cap);
+			ext.set(data->user, 0);
+		}
 	}
-}
+};
 
 #endif