Add new cross-module event system

[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 9e074b21947fc1d05a929933d5bc451a2f191df0..db5d85f0f09dc92f001d9cfb962176a6965470a1 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -42,7 +42,7 @@ class CommandCAP : public Command
  public:
        LocalIntExt reghold;
        CommandCAP (Module* mod) : Command(mod, "CAP", 1),
-               reghold("CAP_REGHOLD", mod)
+               reghold("CAP_REGHOLD", ExtensionItem::EXT_USER, mod)
        {
                works_before_reg = true;
        }
@@ -74,13 +74,13 @@ class CommandCAP : public Command
 
                        if (Data.ack.size() > 0)
                        {
-                               std::string AckResult = irc::stringjoiner(Data.ack).GetJoined();
+                               std::string AckResult = irc::stringjoiner(Data.ack);
                                user->WriteCommand("CAP", "ACK :" + AckResult);
                        }
 
                        if (Data.wanted.size() > 0)
                        {
-                               std::string NakResult = irc::stringjoiner(Data.wanted).GetJoined();
+                               std::string NakResult = irc::stringjoiner(Data.wanted);
                                user->WriteCommand("CAP", "NAK :" + NakResult);
                        }
                }
@@ -95,7 +95,7 @@ class CommandCAP : public Command
                        reghold.set(user, 1);
                        Data.Send();
 
-                       std::string Result = irc::stringjoiner(Data.wanted).GetJoined();
+                       std::string Result = irc::stringjoiner(Data.wanted);
                        user->WriteCommand("CAP", subcommand + " :" + Result);
                }
                else if (subcommand == "CLEAR")
@@ -105,7 +105,7 @@ class CommandCAP : public Command
                        reghold.set(user, 1);
                        Data.Send();
 
-                       std::string Result = irc::stringjoiner(Data.ack).GetJoined();
+                       std::string Result = irc::stringjoiner(Data.ack);
                        user->WriteCommand("CAP", "ACK :" + Result);
                }
                else