m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[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 36674b9c5a41c41f5f88629e65d3a2cadcaca470..35c24fd23c4aca0b84233452ccd33da46c101477 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -19,9 +19,7 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
-
-/* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */
+#include "modules/cap.h"
 
 /*
 CAP LS
@@ -55,19 +53,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_))
                        {
@@ -79,13 +72,13 @@ class CommandCAP : public Command
 
                        if (Data.ack.size() > 0)
                        {
-                               std::string AckResult = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+                               std::string AckResult = irc::stringjoiner(Data.ack).GetJoined();
                                user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), AckResult.c_str());
                        }
 
                        if (Data.wanted.size() > 0)
                        {
-                               std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+                               std::string NakResult = irc::stringjoiner(Data.wanted).GetJoined();
                                user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), NakResult.c_str());
                        }
                }
@@ -95,43 +88,31 @@ 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();
 
-                       std::string Result;
-                       if (Data.wanted.size() > 0)
-                               Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
-                       else
-                               Result = "";
-
+                       std::string Result = irc::stringjoiner(Data.wanted).GetJoined();
                        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 = irc::stringjoiner(Data.ack).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,14 +123,15 @@ class ModuleCAP : public Module
        ModuleCAP()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->Extensions.Register(&cmd.reghold);
+       }
 
-               Implementation eventlist[] = { I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+       void init() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->AddService(cmd);
+               ServerInstance->Modules->AddService(cmd.reghold);
        }
 
-       ModResult OnCheckReady(LocalUser* user)
+       ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
        {
                /* Users in CAP state get held until CAP END */
                if (cmd.reghold.get(user))
@@ -158,15 +140,10 @@ class ModuleCAP : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ~ModuleCAP()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Client CAP extension support", VF_VENDOR);
        }
 };
 
 MODULE_INIT(ModuleCAP)
-