Remove a redundant method here, call the mode manager directly

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index b80dd4070653d0951e8b51fbb9c5e9b889055493..11b57e09be9d2530f320750f0231dfb3c4b89b61 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,60 +2,80 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
-class ModuleNoNotice : public Module
+class NoNotice : public ModeHandler
 {
-       Server *Srv;
  public:
- 
-       ModuleNoNotice(Server* Me)
-               : Module::Module(Me)
+       NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               Srv = Me;
-               Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+               if (adding)
+               {
+                       if (!channel->IsModeSet('T'))
+                       {
+                               channel->SetMode('T',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (channel->IsModeSet('T'))
+                       {
+                               channel->SetMode('T',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
        }
+};
 
-       void Implements(char* List)
+class ModuleNoNotice : public Module
+{
+       
+       NoNotice* nt;
+ public:
+ 
+       ModuleNoNotice(InspIRCd* Me)
+               : Module(Me)
        {
-               List[I_OnUserPreNotice] = List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+               
+               nt = new NoNotice(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(nt))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
+
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (target_type == TYPE_CHANNEL)
+               if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       chanrec* c = (chanrec*)dest;
-                       if (c->IsCustomModeSet('T'))
+                       Channel* c = (Channel*)dest;
+                       if (c->IsModeSet('T'))
                        {
-                               if ((Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+                               if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
                                {
                                        // ops and halfops can still /NOTICE the channel
                                        return 0;
                                }
                                else
                                {
-                                       WriteServ(user->fd,"404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+                                       user->WriteServ("404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
                                        return 1;
                                }
                        }
@@ -63,70 +83,16 @@ class ModuleNoNotice : public Module
                return 0;
        }
 
-        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=" + temp1 + "T";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
-
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'T') && (type == MT_CHANNEL))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
-       
        virtual ~ModuleNoNotice()
        {
+               ServerInstance->Modes->DelMode(nt);
+               delete nt;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
-
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-       ModuleNoNoticeFactory()
-       {
-       }
-       
-       ~ModuleNoNoticeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleNoNotice(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)