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 cb2bec85a9c70077241471d461cabf2959a3bc66..a97cc8fcc2f2f85324e7a6135a9d861ce6a6436c 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -46,23 +46,41 @@ class ModuleCensor : public Module
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               bool active = false;
+               int numeric = 0;
+               const char* targetname = NULL;
 
-               if (target.type == MessageTarget::TYPE_USER)
-                       active = target.Get<User>()->IsModeSet(cu);
-               else if (target.type == MessageTarget::TYPE_CHANNEL)
+               switch (target.type)
                {
-                       Channel* c = target.Get<Channel>();
-                       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;
 
-                       if (res == MOD_RES_ALLOW)
+                               ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor");
+                               if (result == MOD_RES_ALLOW)
+                                       return MOD_RES_PASSTHRU;
+
+                               numeric = ERR_CANNOTSENDTOCHAN;
+                               targetname = targchan->name.c_str();
+                               break;
+                       }
+
+                       default:
                                return MOD_RES_PASSTHRU;
                }
 
-               if (!active)
-                       return MOD_RES_PASSTHRU;
-
                for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
                {
                        size_t censorpos;
@@ -70,8 +88,7 @@ class ModuleCensor : public Module
                        {
                                if (index->second.empty())
                                {
-                                       const std::string targname = target.type == MessageTarget::TYPE_CHANNEL ? target.Get<Channel>()->name : target.Get<User>()->nick;
-                                       user->WriteNumeric(ERR_WORDFILTERED, targname, 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;
                                }
 
@@ -87,7 +104,7 @@ 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)
@@ -95,16 +112,17 @@ class ModuleCensor : public Module
                        ConfigTag* tag = i->second;
                        const std::string text = tag->getString("text");
                        if (text.empty())
-                               continue;
+                               throw ModuleException("<badword:text> is empty! at " + tag->getTagLocation());
 
                        const std::string replace = tag->getString("replace");
-                       censors[text] = 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);
        }
 
 };