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 170fe8b07932d4d88591f1960d61dcd293a50b36..a97cc8fcc2f2f85324e7a6135a9d861ce6a6436c 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -20,123 +20,109 @@
  */
 
 
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
-
 #include "inspircd.h"
-#include <iostream>
-
-typedef std::map<irc::string,irc::string> censor_t;
-
-/* $ModDesc: Provides user and channel +G mode */
-
-/** Handles usermode +G
- */
-class CensorUser : public SimpleUserModeHandler
-{
- public:
-       CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { }
-};
+#include "modules/exemption.h"
 
-/** Handles channel mode +G
- */
-class CensorChannel : public SimpleChannelModeHandler
-{
- public:
-       CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { }
-};
+typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> censor_t;
 
 class ModuleCensor : public Module
 {
+       CheckExemption::EventProvider exemptionprov;
        censor_t censors;
-       CensorUser cu;
-       CensorChannel cc;
+       SimpleUserModeHandler cu;
+       SimpleChannelModeHandler cc;
 
  public:
-       ModuleCensor() : cu(this), cc(this) { }
-
-       void init()
-       {
-               /* Read the configuration file on startup.
-                */
-               OnRehash(NULL);
-               ServerInstance->Modules->AddService(cu);
-               ServerInstance->Modules->AddService(cc);
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-       }
-
-
-       virtual ~ModuleCensor()
+       ModuleCensor()
+               : exemptionprov(this)
+               , cu(this, "u_censor", 'G')
+               , cc(this, "censor", 'G')
        {
        }
 
        // format of a config entry is <badword text="shit" replace="poo">
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       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('G');
-               else if (target_type == TYPE_CHANNEL)
+               switch (target.type)
                {
-                       active = ((Channel*)dest)->IsModeSet('G');
-                       Channel* c = (Channel*)dest;
-                       ModResult res = ServerInstance->OnCheckExemption(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, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str());
+                                       user->WriteNumeric(numeric, targetname, "Your message contained a censored word (" + index->first + "), and was blocked");
                                        return MOD_RES_DENY;
                                }
 
-                               SearchAndReplace(text2, index->first, index->second);
+                               details.text.replace(censorpos, index->first.size(), index->second);
                        }
                }
-               text = text2.c_str();
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-       }
-
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                /*
                 * reload our config file on rehash - we must destroy and re-allocate the classes
                 * to call the constructor again and re-read our data.
                 */
-               ConfigReader MyConf;
-               censors.clear();
+               censor_t newcensors;
 
-               for (int index = 0; index < MyConf.Enumerate("badword"); index++)
+               ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
+               for (ConfigIter i = badwords.first; i != badwords.second; ++i)
                {
-                       irc::string pattern = (MyConf.ReadValue("badword","text",index)).c_str();
-                       irc::string replace = (MyConf.ReadValue("badword","replace",index)).c_str();
-                       censors[pattern] = replace;
+                       ConfigTag* tag = i->second;
+                       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);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user and channel +G mode",VF_VENDOR);
+               return Version("Provides user and channel mode +G", VF_VENDOR);
        }
 
 };