Run DelMode and DelModeWatcher in RemoveModule

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

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 037c78d91989b96d1caea22687d23ed4b7f2f35c..cc792027c2ed5baa022f705e7e79bc62f350f15f 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -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.
@@ -17,60 +17,33 @@
 
 /** Handles user mode +B
  */
-class BotMode : public ModeHandler
+class BotMode : public SimpleUserModeHandler
 {
  public:
-       BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('B'))
-                       {
-                               dest->SetMode('B',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('B'))
-                       {
-                               dest->SetMode('B',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               
-               return MODEACTION_DENY;
-       }
+       BotMode(Module* Creator) : SimpleUserModeHandler(Creator, 'B') { }
 };
 
 class ModuleBotMode : public Module
 {
-       
-       BotMode* bm;
+       BotMode bm;
  public:
-       ModuleBotMode(InspIRCd* Me)
-               : Module(Me)
+       ModuleBotMode()
+               : bm(this)
        {
-               
-               bm = new BotMode(ServerInstance);
-               if (!ServerInstance->AddMode(bm))
+               if (!ServerInstance->Modes->AddMode(&bm))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnWhois };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       
+
        virtual ~ModuleBotMode()
        {
-               ServerInstance->Modes->DelMode(bm);
-               delete bm;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for unreal-style umode +B",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual void OnWhois(User* src, User* dst)