]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanfilter.cpp
Decide that it wasn't quite appropriate :(
[user/henk/code/inspircd.git] / src / modules / m_chanfilter.cpp
index 810c0da023bca06f4808c9704e2a72d254488671..ecb4e6db342301a519cb9c6a3842e833ba8ba099 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <vector>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
 
-typedef std::vector<std::string> SpamList;
+typedef std::vector<irc::string> SpamList;
 
 class ModuleChanFilter : public Module
 {
@@ -33,34 +37,28 @@ class ModuleChanFilter : public Module
        
  public:
  
-       ModuleChanFilter()
+       ModuleChanFilter(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Conf = new ConfigReader;
                Srv->AddExtendedListMode('g');
                MaxEntries = Conf->ReadInteger("chanfilter","maxsize",0,true);
+               if (MaxEntries == 0)
+                       MaxEntries = 32;
+       }
+
+       void Implements(char* List) 
+       { 
+               List[I_On005Numeric] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = List[I_OnSendList] = List[I_OnSyncChannel] = 1;
        }
        
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=g" + temp1;
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
+               InsertMode(output,"g",1);
         }
 
-       virtual void OnUserPart(userrec* user, chanrec* channel)
+       virtual void OnUserPart(userrec* user, chanrec* channel, std::string partreason)
        {
                // when the last user parts, delete the list
                if (Srv->CountUsers(channel) == 1)
@@ -74,7 +72,7 @@ class ModuleChanFilter : public Module
                }
        }
 
-       virtual void OnRehash()
+       virtual void OnRehash(std::string parameter)
        {
                delete Conf;
                Conf = new ConfigReader;
@@ -84,14 +82,18 @@ class ModuleChanFilter : public Module
 
         virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
         {
+
+               // Create a copy of the string in irc::string
+               irc::string line = text.c_str();
+
                SpamList* spamlist = (SpamList*)chan->GetExt("spam_list");
                if (spamlist)
                {
                        for (SpamList::iterator i = spamlist->begin(); i != spamlist->end(); i++)
                        {
-                               if (strcasestr(text.c_str(),i->c_str()))
+                               if (line.find(*i) != std::string::npos)
                                {
-                                       WriteServ(user->fd,"936 %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name);
+                                       WriteServ(user->fd,"936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, i->c_str());
                                        return 1;
                                }
                        }
@@ -99,7 +101,7 @@ class ModuleChanFilter : public Module
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -108,13 +110,9 @@ class ModuleChanFilter : public Module
                else return 0;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
-               if (target_type == TYPE_CHANNEL)
-               {
-                       return ProcessMessages(user,(chanrec*)dest,text);
-               }
-               else return 0;
+               return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
        virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
@@ -122,8 +120,9 @@ class ModuleChanFilter : public Module
                if ((modechar == 'g') && (type == MT_CHANNEL))
                {
                        chanrec* chan = (chanrec*)target;
-                       std::string param = params[0];
-               
+
+                       irc::string word = params[0].c_str();
+
                        if (mode_on)
                        {
                                SpamList* spamlist = (SpamList*)chan->GetExt("spam_list");
@@ -132,17 +131,17 @@ class ModuleChanFilter : public Module
                                        spamlist = new SpamList;
                                        chan->Extend("spam_list",(char*)spamlist);
                                }
-                               if (spamlist->size() < MaxEntries)
+                               if (spamlist->size() < (unsigned)MaxEntries)
                                {
                                        for (SpamList::iterator i = spamlist->begin(); i != spamlist->end(); i++)
                                        {
-                                               if (*i == params[0])
+                                               if (*i == word)
                                                {
-                                                       WriteServ(user->fd,"937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,i->c_str());
+                                                       WriteServ(user->fd,"937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
                                                        return -1;
                                                }
                                        }
-                                       spamlist->push_back(params[0]);
+                                       spamlist->push_back(word);
                                        return 1;
                                }
                                WriteServ(user->fd,"939 %s %s :Channel spamfilter list is full",user->nick, chan->name);
@@ -155,7 +154,7 @@ class ModuleChanFilter : public Module
                                {
                                        for (SpamList::iterator i = spamlist->begin(); i != spamlist->end(); i++)
                                        {
-                                               if (*i == params[0])
+                                               if (*i == word)
                                                {
                                                        spamlist->erase(i);
                                                        return 1;
@@ -189,7 +188,6 @@ class ModuleChanFilter : public Module
        virtual ~ModuleChanFilter()
        {
                delete Conf;
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -197,7 +195,7 @@ class ModuleChanFilter : public Module
                return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
        
-       virtual string_list OnChannelSync(chanrec* chan)
+       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
        {
                SpamList* spamlist = (SpamList*)chan->GetExt("spam_list");
                string_list commands;
@@ -205,10 +203,9 @@ class ModuleChanFilter : public Module
                {
                        for (SpamList::iterator i = spamlist->begin(); i != spamlist->end(); i++)
                        {
-                               commands.push_back("M "+std::string(chan->name)+" +g "+*i);
+                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+g "+std::string(i->c_str()));
                        }
                }
-               return commands;
        }
 
 };
@@ -225,9 +222,9 @@ class ModuleChanFilterFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleChanFilter;
+               return new ModuleChanFilter(Me);
        }
        
 };