X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_botmode.cpp;h=4c8007b8b8b41022d211589fc9dd1e3b7931e2c8;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=909befee011da3ae0d51b04a1ed1cc18d31263a0;hpb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 909befee0..4c8007b8b 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,103 +2,60 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
+/** Handles user mode +B
+ */
+class BotMode : public SimpleUserModeHandler
+{
+ public:
+	BotMode(Module* Creator) : SimpleUserModeHandler(Creator, 'B') { }
+};
+
 class ModuleBotMode : public Module
 {
-	Server *Srv; 
+	BotMode bm;
  public:
-	ModuleBotMode(Server* Me)
-		: Module::Module(Me)
+	ModuleBotMode()
+		: bm(this)
 	{
-		Srv = Me;
-		
-		if (!Srv->AddExtendedMode('B',MT_CLIENT,false,0,0))
-		{
-			Srv->Log(DEFAULT,"*** m_botmode: ERROR, failed to allocate user mode +B!");
-			return;
-		}
+		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] = List[I_OnExtendedMode] = 1;
-	}
-	
+
 	virtual ~ModuleBotMode()
 	{
+		ServerInstance->Modes->DelMode(&bm);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		if ((modechar == 'B') && (type == MT_CLIENT))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		return Version("Provides support for unreal-style umode +B",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnWhois(userrec* src, userrec* dst)
+	virtual void OnWhois(User* src, User* dst)
 	{
-		if (strchr(dst->modes,'B'))
+		if (dst->IsModeSet('B'))
 		{
-			Srv->SendTo(NULL,src,"335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+Srv->GetNetworkName());
+			ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
 		}
 	}
 
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleBotModeFactory : public ModuleFactory
-{
- public:
-	ModuleBotModeFactory()
-	{
-	}
-	
-	~ModuleBotModeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleBotMode(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBotModeFactory;
-}
 
+MODULE_INIT(ModuleBotMode)