X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=1669fe2f20d8a699c750fc0250c92e680692a797;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=17e2e86054db6561c21c9a816efbdfc6ac13f92d;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 17e2e8605..1669fe2f2 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -24,32 +24,10 @@
 
 /** Handles user mode +I
  */
-class HideChans : public ModeHandler
+class HideChans : public SimpleUserModeHandler
 {
  public:
-	HideChans(Module* Creator) : ModeHandler(Creator, "hidechans", 'I', PARAM_NONE, MODETYPE_USER) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		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
@@ -59,15 +37,14 @@ class ModuleHideChans : public Module
  public:
 	ModuleHideChans() : 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()
+	void init()
 	{
+		ServerInstance->Modules->AddService(hm);
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		OnRehash(NULL);
 	}
 
 	virtual Version GetVersion()
@@ -77,8 +54,7 @@ class ModuleHideChans : public Module
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader conf;
-		AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
+		AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
 	}
 
 	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
@@ -108,5 +84,4 @@ class ModuleHideChans : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleHideChans)