X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ojoin.cpp;h=e4314873bcb073998cb14d0013dde61e5e9569ce;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=b0c206ab312731dc8d5d724da81f51dfb0e069ec;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index b0c206ab3..e4314873b 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -84,16 +84,14 @@ class CommandOjoin : public SplitCommand
 
 /** channel mode +Y
  */
-class NetworkPrefix : public ModeHandler
+class NetworkPrefix : public PrefixMode
 {
  public:
 	NetworkPrefix(Module* parent, char NPrefix)
-		: ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+		: PrefixMode(parent, "official-join", 'Y')
 	{
-		list = true;
 		prefix = NPrefix;
 		levelrequired = INT_MAX;
-		m_paramtype = TR_NICK;
 		prefixrank = NETWORK_VALUE;
 	}
 
@@ -106,12 +104,6 @@ class NetworkPrefix : public ModeHandler
 
 		return MOD_RES_PASSTHRU;
 	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		return MODEACTION_ALLOW;
-	}
-
 };
 
 class ModuleOjoin : public Module
@@ -128,9 +120,6 @@ class ModuleOjoin : public Module
 
 	void init() CXX11_OVERRIDE
 	{
-		/* Load config stuff */
-		OnRehash(NULL);
-
 		std::string npre = ServerInstance->Config->ConfValue("ojoin")->getString("prefix");
 		char NPrefix = npre.empty() ? 0 : npre[0];
 		if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
@@ -141,7 +130,6 @@ class ModuleOjoin : public Module
 		mycommand.npmh = np;
 
 		ServerInstance->Modules->AddService(*np);
-		ServerInstance->Modules->AddService(mycommand);
 	}
 
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
@@ -157,7 +145,7 @@ class ModuleOjoin : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin");
 		mycommand.notice = Conf->getBool("notice", true);
@@ -174,7 +162,7 @@ class ModuleOjoin : public Module
 		if (source == memb->user)
 			return MOD_RES_PASSTHRU;
 
-		source->WriteNumeric(484, source->nick+" "+memb->chan->name+" :Can't kick "+memb->user->nick+" as they're on official network business.");
+		source->WriteNumeric(ERR_RESTRICTED, memb->chan->name+" :Can't kick "+memb->user->nick+" as they're on official network business.");
 		return MOD_RES_DENY;
 	}