Revert automated conversion by Special, as it (unfortunately) neglects some details...

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

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 5fe3f7d4bac2298b661ae41bfdbe73b77843e8da..d70f4a2704f0f0ca3b59082a3d6ab9df2a9ca2a0 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -25,48 +25,48 @@
 class ChanFilter : public ListModeBase
 {
  public:
-       ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
-       
+       ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
+
        virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
        {
                if ((word.length() > 35) || (word.empty()))
                {
-                       user->WriteServ("935 %s %s %s :word is too %s for censor list",user->nick, chan->name,word.c_str(), (word.empty() ? "short" : "long"));
+                       user->WriteNumeric(935, "%s %s %s :word is too %s for censor list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
                        return false;
                }
-               
+
                return true;
        }
-       
+
        virtual bool TellListTooLong(User* user, Channel* chan, std::string &word)
        {
-               user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str());
+               user->WriteNumeric(939, "%s %s %s :Channel spamfilter list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
                return true;
        }
-       
+
        virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
        {
-               user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
+               user->WriteNumeric(937, "%s %s :The word %s is already on the spamfilter list",user->nick.c_str(), chan->name.c_str(), word.c_str());
        }
-       
+
        virtual void TellNotSet(User* user, Channel* chan, std::string &word)
        {
-               user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name);
+               user->WriteNumeric(938, "%s %s :No such spamfilter word is set",user->nick.c_str(), chan->name.c_str());
        }
 };
 
 class ModuleChanFilter : public Module
 {
-       
+
        ChanFilter* cf;
-       
+
  public:
- 
+
        ModuleChanFilter(InspIRCd* Me)
                : Module(Me)
        {
                cf = new ChanFilter(ServerInstance);
-               if (!ServerInstance->AddMode(cf))
+               if (!ServerInstance->Modes->AddMode(cf))
                        throw ModuleException("Could not add new modes!");
 
                cf->DoImplements(this);
@@ -86,7 +86,7 @@ class ModuleChanFilter : public Module
 
        virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
        {
-               if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
+               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP))
                        return 0;
 
                // Create a copy of the string in irc::string
@@ -101,7 +101,7 @@ class ModuleChanFilter : public Module
                        {
                                if (line.find(i->mask.c_str()) != std::string::npos)
                                {
-                                       user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, i->mask.c_str());
+                                       user->WriteNumeric(936, "%s %s %s :Your message contained a censored word, and was blocked",user->nick.c_str(), chan->name.c_str(), i->mask.c_str());
                                        return 1;
                                }
                        }
@@ -116,19 +116,19 @@ class ModuleChanFilter : public Module
                {
                        return ProcessMessages(user,(Channel*)dest,text);
                }
-               else return 0;
+               return 0;
        }
 
        virtual void OnCleanup(int target_type, void* item)
        {
                cf->DoCleanup(target_type, item);
        }
-       
+
        virtual int 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 OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                cf->DoSyncChannel(chan, proto, opaque);
@@ -136,9 +136,9 @@ class ModuleChanFilter : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
        virtual ~ModuleChanFilter()
        {
                ServerInstance->Modes->DelMode(cf);