Omit the server name internally when building a /STATS reply and prepend it later

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index ffac281377a70b848093c14da19c6a558ff27682..e2d752d183565f4a17bfe7e67d811549a1d3ee54 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -78,7 +78,7 @@ class MsgFlood : public ModeHandler
                        std::string::size_type colon = parameter.find(':');
                        if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
                        {
-                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+                               source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
                                return MODEACTION_DENY;
                        }
 
@@ -89,7 +89,7 @@ class MsgFlood : public ModeHandler
 
                        if ((nlines<2) || (nsecs<1))
                        {
-                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+                               source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
                                return MODEACTION_DENY;
                        }
 
@@ -124,8 +124,12 @@ class ModuleMsgFlood : public Module
        {
        }
 
-       ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
+       ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
        {
+               if (target_type != TYPE_CHANNEL)
+                       return MOD_RES_PASSTHRU;
+
+               Channel* dest = static_cast<Channel*>(voiddest);
                if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf))
                        return MOD_RES_PASSTHRU;
 
@@ -160,14 +164,6 @@ class ModuleMsgFlood : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
-       {
-               if (target_type == TYPE_CHANNEL)
-                       return ProcessMessages(user,(Channel*)dest,text);
-
-               return MOD_RES_PASSTHRU;
-       }
-
        void Prioritize()
        {
                // we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.)