]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_censor.cpp
Remove InspIRCd* parameters and fields
[user/henk/code/inspircd.git] / src / modules / m_censor.cpp
index f220b0710c946754a700923fb1a23a68586fe462..29410962ba93d829364cf069ae762a1c2a2c7cde 100644 (file)
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,6 +15,7 @@
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
+#include <iostream>
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -22,157 +23,99 @@ typedef std::map<irc::string,irc::string> censor_t;
 
 /** Handles usermode +G
  */
-class CensorUser : public ModeHandler
+class CensorUser : public SimpleUserModeHandler
 {
  public:
-       CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('G'))
-                       {
-                               dest->SetMode('G',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('G'))
-                       {
-                               dest->SetMode('G',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, 'G') { }
 };
 
 /** Handles channel mode +G
  */
-class CensorChannel : public ModeHandler
+class CensorChannel : public SimpleChannelModeHandler
 {
  public:
-       CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('G'))
-                       {
-                               channel->SetMode('G',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('G'))
-                       {
-                               channel->SetMode('G',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_ALLOW;
-       }
+       CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, 'G') { }
 };
 
 class ModuleCensor : public Module
 {
-
-       
        censor_t censors;
-       CensorUser *cu;
-       CensorChannel *cc;
+       CensorUser cu;
+       CensorChannel cc;
+
  public:
-       ModuleCensor(InspIRCd* Me)
-               : Module(Me)
+       ModuleCensor()
+               : cu(this), cc(this)
        {
                /* Read the configuration file on startup.
                 */
-               OnRehash(NULL,"");
-               cu = new CensorUser(ServerInstance);
-               cc = new CensorChannel(ServerInstance);
-               if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G'))
+               OnRehash(NULL);
+               if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
 
        virtual ~ModuleCensor()
        {
-               ServerInstance->Modes->DelMode(cu);
-               ServerInstance->Modes->DelMode(cc);
-               delete cu;
-               delete cc;
-       }
-
-       virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
-       {
-               if ((!pattern.empty()) && (!text.empty()))
-               {
-                       std::string::size_type pos;
-                       while ((pos = text.find(pattern)) != irc::string::npos)
-                       {
-                               text.erase(pos,pattern.length());
-                               text.insert(pos,replace);
-                       }
-               }
+               ServerInstance->Modes->DelMode(&cu);
+               ServerInstance->Modes->DelMode(&cc);
        }
 
        // format of a config entry is <badword text="shit" replace="poo">
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (!IS_LOCAL(user))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                bool active = false;
 
                if (target_type == TYPE_USER)
                        active = ((User*)dest)->IsModeSet('G');
                else if (target_type == TYPE_CHANNEL)
+               {
                        active = ((Channel*)dest)->IsModeSet('G');
+                       Channel* c = (Channel*)dest;
+                       if (CHANOPS_EXEMPT('G') && c->GetPrefixValue(user) == OP_VALUE)
+                       {
+                               return MOD_RES_PASSTHRU;
+                       }
+               }
 
                if (!active)
-                       return 0;
+                       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)
                        {
                                if (index->second.empty())
                                {
-                                       user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str());
-                                       return 1;
+                                       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());
+                                       return MOD_RES_DENY;
                                }
-                               
-                               this->ReplaceLine(text2,index->first,index->second);
+
+                               SearchAndReplace(text2, index->first, index->second);
                        }
                }
                text = text2.c_str();
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+
+       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, const std::string &parameter)
+
+       virtual void OnRehash(User* user)
        {
                /*
                 * 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 = new ConfigReader(ServerInstance);
+               ConfigReader* MyConf = new ConfigReader;
                censors.clear();
 
                for (int index = 0; index < MyConf->Enumerate("badword"); index++)
@@ -184,12 +127,12 @@ class ModuleCensor : public Module
 
                delete MyConf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleCensor)