Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 6394ba9d011a357512157613abb47a575de3efa4..a97cc8fcc2f2f85324e7a6135a9d861ce6a6436c 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -23,7 +23,7 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-typedef insp::flat_map<irc::string, irc::string> censor_t;
+typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> censor_t;
 
 class ModuleCensor : public Module
 {
@@ -41,43 +41,60 @@ class ModuleCensor : public Module
        }
 
        // format of a config entry is <badword text="shit" replace="poo">
-       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               bool active = false;
+               int numeric = 0;
+               const char* targetname = NULL;
 
-               if (target_type == TYPE_USER)
-                       active = ((User*)dest)->IsModeSet(cu);
-               else if (target_type == TYPE_CHANNEL)
+               switch (target.type)
                {
-                       Channel* c = (Channel*)dest;
-                       active = c->IsModeSet(cc);
-                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "censor");
+                       case MessageTarget::TYPE_USER:
+                       {
+                               User* targuser = target.Get<User>();
+                               if (!targuser->IsModeSet(cu))
+                                       return MOD_RES_PASSTHRU;
+
+                               numeric = ERR_CANTSENDTOUSER;
+                               targetname = targuser->nick.c_str();
+                               break;
+                       }
+
+                       case MessageTarget::TYPE_CHANNEL:
+                       {
+                               Channel* targchan = target.Get<Channel>();
+                               if (!targchan->IsModeSet(cc))
+                                       return MOD_RES_PASSTHRU;
+
+                               ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor");
+                               if (result == MOD_RES_ALLOW)
+                                       return MOD_RES_PASSTHRU;
 
-                       if (res == MOD_RES_ALLOW)
+                               numeric = ERR_CANNOTSENDTOCHAN;
+                               targetname = targchan->name.c_str();
+                               break;
+                       }
+
+                       default:
                                return MOD_RES_PASSTHRU;
                }
 
-               if (!active)
-                       return MOD_RES_PASSTHRU;
-
-               irc::string text2 = text.c_str();
                for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
                {
-                       if (text2.find(index->first) != irc::string::npos)
+                       size_t censorpos;
+                       while ((censorpos = irc::find(details.text, index->first)) != std::string::npos)
                        {
                                if (index->second.empty())
                                {
-                                       user->WriteNumeric(ERR_WORDFILTERED, ((target_type == TYPE_CHANNEL) ? ((Channel*)dest)->name : ((User*)dest)->nick), index->first.c_str(), "Your message contained a censored word, and was blocked");
+                                       user->WriteNumeric(numeric, targetname, "Your message contained a censored word (" + index->first + "), and was blocked");
                                        return MOD_RES_DENY;
                                }
 
-                               stdalgo::string::replace_all(text2, index->first, index->second);
+                               details.text.replace(censorpos, index->first.size(), index->second);
                        }
                }
-               text = text2.c_str();
                return MOD_RES_PASSTHRU;
        }
 
@@ -87,22 +104,25 @@ class ModuleCensor : public Module
                 * reload our config file on rehash - we must destroy and re-allocate the classes
                 * to call the constructor again and re-read our data.
                 */
-               censors.clear();
+               censor_t newcensors;
 
                ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
                for (ConfigIter i = badwords.first; i != badwords.second; ++i)
                {
                        ConfigTag* tag = i->second;
-                       std::string str = tag->getString("text");
-                       irc::string pattern(str.c_str());
-                       str = tag->getString("replace");
-                       censors[pattern] = irc::string(str.c_str());
+                       const std::string text = tag->getString("text");
+                       if (text.empty())
+                               throw ModuleException("<badword:text> is empty! at " + tag->getTagLocation());
+
+                       const std::string replace = tag->getString("replace");
+                       newcensors[text] = replace;
                }
+               censors.swap(newcensors);
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user and channel +G mode",VF_VENDOR);
+               return Version("Provides user and channel mode +G", VF_VENDOR);
        }
 
 };