X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=423398b7348b054d480bd607c7f2c838d098bb97;hb=219f8e62623ff0c3002be764c1dbf7201d0293db;hp=96f5ef560911722ea96f2fc05a8beeea8846847c;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 96f5ef560..423398b73 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -1,106 +1,85 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for hiding channels with user mode +I */
+#include "inspircd.h"
+#include "modules/whois.h"
 
 /** Handles user mode +I
  */
-class HideChans : public ModeHandler
+class HideChans : public SimpleUserModeHandler
 {
  public:
-	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('I'))
-			{
-				dest->SetMode('I',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('I'))
-			{
-				dest->SetMode('I',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	HideChans(Module* Creator) : SimpleUserModeHandler(Creator, "hidechans", 'I') { }
 };
 
-class ModuleHideChans : public Module
+class ModuleHideChans : public Module, public Whois::LineEventListener
 {
 	bool AffectsOpers;
 	HideChans hm;
  public:
-	ModuleHideChans(InspIRCd* Me) : Module(Me), hm(Me)
+	ModuleHideChans()
+		: Whois::LineEventListener(this)
+		, hm(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&hm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-		OnRehash(NULL);
 	}
 
-	virtual ~ModuleHideChans()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(&hm);
+		return Version("Adds user mode I (hidechans) which hides the channels users with it set are in from their /WHOIS response.", VF_VENDOR);
 	}
 
-	virtual Version GetVersion()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
 	}
 
-	virtual void OnRehash(User* user)
-	{
-		ConfigReader conf(ServerInstance);
-		AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
-	}
-
-	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
 		/* always show to self */
-		if (user == dest)
-			return 0;
+		if (whois.IsSelfWhois())
+			return MOD_RES_PASSTHRU;
 
 		/* don't touch anything except 319 */
-		if (numeric != 319)
-			return 0;
+		if (numeric.GetNumeric() != 319)
+			return MOD_RES_PASSTHRU;
 
 		/* don't touch if -I */
-		if (!dest->IsModeSet('I'))
-			return 0;
+		if (!whois.GetTarget()->IsModeSet(hm))
+			return MOD_RES_PASSTHRU;
 
 		/* if it affects opers, we don't care if they are opered */
 		if (AffectsOpers)
-			return 1;
+			return MOD_RES_DENY;
 
 		/* doesn't affect opers, sender is opered */
-		if (user->HasPrivPermission("users/auspex"))
-			return 0;
+		if (whois.GetSource()->HasPrivPermission("users/auspex"))
+			return MOD_RES_PASSTHRU;
 
 		/* user must be opered, boned. */
-		return 1;
+		return MOD_RES_DENY;
 	}
 };
 
-
 MODULE_INIT(ModuleHideChans)