Update Event and Request APIs

[user/henk/code/inspircd.git] / src / modules / m_cap.cpp

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 626b4c23c33169ee728300424f6998e62588a3a5..3373f7c3f762ea0c3e63f66deaf60bec12fb6bee 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -35,8 +35,11 @@ CAP END
 class CommandCAP : public Command
 {
  public:
-       CommandCAP (InspIRCd* Instance, Module* mod) : Command(Instance, mod, "CAP", 0, 1, true)
+       LocalIntExt reghold;
+       CommandCAP (Module* mod) : Command(mod, "CAP", 1),
+               reghold("CAP_REGHOLD", mod)
        {
+               works_before_reg = true;
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -45,7 +48,7 @@ class CommandCAP : public Command
 
                if (subcommand == "REQ")
                {
-                       CapData Data;
+                       CapEvent Data(creator, "cap_req");
 
                        Data.type = subcommand;
                        Data.user = user;
@@ -64,9 +67,8 @@ class CommandCAP : public Command
                                Data.wanted.push_back(cap_);
                        }
 
-                       user->Extend("CAP_REGHOLD");
-                       Event event((char*) &Data, this->creator, "cap_req");
-                       event.Send(this->ServerInstance);
+                       reghold.set(user, 1);
+                       Data.Send();
 
                        if (Data.ack.size() > 0)
                        {
@@ -82,19 +84,18 @@ class CommandCAP : public Command
                }
                else if (subcommand == "END")
                {
-                       user->Shrink("CAP_REGHOLD");
+                       reghold.set(user, 0);
                }
                else if ((subcommand == "LS") || (subcommand == "LIST"))
                {
-                       CapData Data;
+                       CapEvent Data(creator, subcommand == "LS" ? "cap_ls" : "cap_list");
 
                        Data.type = subcommand;
                        Data.user = user;
                        Data.creator = this->creator;
 
-                       user->Extend("CAP_REGHOLD");
-                       Event event((char*) &Data, this->creator, subcommand == "LS" ? "cap_ls" : "cap_list");
-                       event.Send(this->ServerInstance);
+                       reghold.set(user, 1);
+                       Data.Send();
 
                        std::string Result;
                        if (Data.wanted.size() > 0)
@@ -106,15 +107,14 @@ class CommandCAP : public Command
                }
                else if (subcommand == "CLEAR")
                {
-                       CapData Data;
+                       CapEvent Data(creator, "cap_clear");
 
                        Data.type = subcommand;
                        Data.user = user;
                        Data.creator = this->creator;
 
-                       user->Extend("CAP_REGHOLD");
-                       Event event((char*) &Data, this->creator, "cap_clear");
-                       event.Send(this->ServerInstance);
+                       reghold.set(user, 1);
+                       Data.Send();
 
                        std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
                        user->WriteServ("CAP * ACK :%s", Result.c_str());
@@ -130,33 +130,34 @@ class CommandCAP : public Command
 
 class ModuleCAP : public Module
 {
-       CommandCAP newcommand;
+       CommandCAP cmd;
  public:
-       ModuleCAP(InspIRCd* Me)
-               : Module(Me), newcommand(Me, this)
+       ModuleCAP()
+               : cmd(this)
        {
-               ServerInstance->AddCommand(&newcommand);
+               ServerInstance->AddCommand(&cmd);
+               Extensible::Register(&cmd.reghold);
 
                Implementation eventlist[] = { I_OnCheckReady };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       virtual ModResult OnCheckReady(User* user)
+       ModResult OnCheckReady(User* user)
        {
                /* Users in CAP state get held until CAP END */
-               if (user->GetExt("CAP_REGHOLD"))
+               if (cmd.reghold.get(user))
                        return MOD_RES_DENY;
 
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleCAP()
+       ~ModuleCAP()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Client CAP extension support", VF_VENDOR);
        }
 };