Simple user/channel mode patch

[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 18a594c31bcf94b50c8a6ec495dc838c468abe09..7cc0504038630ad9d22d94e1ae6e9932ecad152a 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,32 +17,10 @@
 
 /** 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(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'B') { }
 };
 
 class ModuleBotMode : public Module
@@ -55,24 +33,22 @@ class ModuleBotMode : public Module
        {
                
                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);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhois] = 1;
-       }
        
        virtual ~ModuleBotMode()
        {
                ServerInstance->Modes->DelMode(bm);
-               DELETE(bm);
+               delete bm;
        }
        
        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 void OnWhois(User* src, User* dst)