Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

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

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index 139c70e7646697016ac9faaadc08eda376fd73f5..b82dbcc7d9310ac457b1de70a3d745a44060e4ec 100644 (file)
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -79,10 +79,10 @@ class IRCv3::Monitor::Manager
 
                void unset(Extensible* container)
                {
-                       free(unset_raw(container));
+                       free(container, unset_raw(container));
                }
 
-               std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
+               std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
                {
                        std::string ret;
                        if (format == FORMAT_NETWORK)
@@ -99,9 +99,9 @@ class IRCv3::Monitor::Manager
                        return ret;
                }
 
-               void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+               void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 
-               void free(void* item)
+               void free(Extensible* container, void* item) CXX11_OVERRIDE
                {
                        delete static_cast<ExtData*>(item);
                }
@@ -245,7 +245,8 @@ class IRCv3::Monitor::Manager
        WatchedList emptywatchedlist;
 };
 
-void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+// inline is needed in static builds to support m_watch including the Manager code from this file
+inline void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 {
        if (format == FORMAT_NETWORK)
                return;
@@ -285,7 +286,7 @@ class CommandMonitor : public SplitCommand
                        if (result == IRCv3::Monitor::Manager::WR_TOOMANY)
                        {
                                // List is full, send error which includes the remaining nicks that were not processed
-                               user->WriteNumeric(ERR_MONLISTFULL, "%u %s%s%s :Monitor list is full", maxmonitor, nick.c_str(), (ss.StreamEnd() ? "" : ","), ss.GetRemaining().c_str());
+                               user->WriteNumeric(ERR_MONLISTFULL, maxmonitor, InspIRCd::Format("%s%s%s", nick.c_str(), (ss.StreamEnd() ? "" : ","), ss.GetRemaining().c_str()), "Monitor list is full");
                                break;
                        }
                        else if (result != IRCv3::Monitor::Manager::WR_OK)
@@ -315,10 +316,10 @@ class CommandMonitor : public SplitCommand
        {
                Penalty = 2;
                allow_empty_last_param = false;
-               syntax = "[C|L|S|+ <nick1>[,<nick2>]|- <nick1>[,<nick2>]";
+               syntax = "C|L|S|(+|-) <nick>[,<nick>]+";
        }
 
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
                char subcmd = toupper(parameters[0][0]);
                if (subcmd == '+')
@@ -346,7 +347,7 @@ class CommandMonitor : public SplitCommand
                                out.Add(entry->GetNick());
                        }
                        out.Flush();
-                       user->WriteNumeric(RPL_ENDOFMONLIST, ":End of MONITOR list");
+                       user->WriteNumeric(RPL_ENDOFMONLIST, "End of MONITOR list");
                }
                else if (subcmd == 'S')
                {
@@ -401,7 +402,7 @@ class ModuleMonitor : public Module
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("monitor");
-               cmd.maxmonitor = tag->getInt("maxentries", 30, 1);
+               cmd.maxmonitor = tag->getUInt("maxentries", 30, 1);
        }
 
        void OnPostConnect(User* user) CXX11_OVERRIDE