X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=44241e82c5e83151391bb48a33cba37865f50a77;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=2aa5047bf63ab7ba47b63aaaa7e054c6848450a1;hpb=40e990ed06126c1ba6164738527127d1f58fc032;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 2aa5047bf..44241e82c 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -1,127 +1,87 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-#include "configreader.h"
 #include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/whois.h"
 
-/* $ModDesc: Provides support for unreal-style umode +B */
-
-
-
-class BotMode : public ModeHandler
+enum
 {
- public:
-	BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
-		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;
-	}
+	// From UnrealIRCd.
+	RPL_WHOISBOT = 335
 };
 
-class ModuleBotMode : public Module
+class BotTag : public ClientProtocol::MessageTagProvider
 {
-	
-	BotMode* bm;
+ private:
+	SimpleUserModeHandler& botmode;
+	Cap::Reference ctctagcap;
+
  public:
-	ModuleBotMode(InspIRCd* Me)
-		: Module::Module(Me)
+	BotTag(Module* mod, SimpleUserModeHandler& bm)
+		: ClientProtocol::MessageTagProvider(mod)
+		, botmode(bm)
+		, ctctagcap(mod, "message-tags")
 	{
-		
-		bm = new BotMode(ServerInstance);
-		ServerInstance->AddMode(bm, 'B');
 	}
 
-	void Implements(char* List)
+	void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
 	{
-		List[I_OnWhois] = 1;
-	}
-	
-	virtual ~ModuleBotMode()
-	{
-		ServerInstance->Modes->DelMode(bm);
-		DELETE(bm);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		User* const user = msg.GetSourceUser();
+		if (user && user->IsModeSet(botmode))
+			msg.AddTag("inspircd.org/bot", this, "");
 	}
 
-	virtual void OnWhois(userrec* src, userrec* dst)
+	bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE
 	{
-		if (dst->IsModeSet('B'))
-		{
-			src->WriteServ("335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+ServerInstance->Config->Network);
-		}
+		return ctctagcap.get(user);
 	}
-
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleBotModeFactory : public ModuleFactory
+class ModuleBotMode : public Module, public Whois::EventListener
 {
+ private:
+	SimpleUserModeHandler bm;
+	BotTag tag;
+
  public:
-	ModuleBotModeFactory()
+	ModuleBotMode()
+		: Whois::EventListener(this)
+		, bm(this, "bot", 'B')
+		, tag(this, bm)
 	{
 	}
-	
-	~ModuleBotModeFactory()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 	{
-		return new ModuleBotMode(Me);
+		if (whois.GetTarget()->IsModeSet(bm))
+		{
+			whois.SendLine(RPL_WHOISBOT, "is a bot on " + ServerInstance->Config->Network);
+		}
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBotModeFactory;
-}
+MODULE_INIT(ModuleBotMode)