X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ojoin.cpp;h=76e66bdc23cbff3d54b128d6253558cce20f42fc;hb=ff3b706b2506d7614bce5e54bc88657bd62ebd4d;hp=c3ceb38d98f9dd5b11e5763d15f777b62a6013f8;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index c3ceb38d9..76e66bdc2 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -21,20 +21,20 @@
 
 #define NETWORK_VALUE 9000000
 
-char NPrefix;
-bool notice;
-bool op;
-
 /** Handle /OJOIN
  */
 class CommandOjoin : public SplitCommand
 {
  public:
 	bool active;
-	CommandOjoin(Module* parent) :
-		SplitCommand(parent, "OJOIN", 1)
+	bool notice;
+	bool op;
+	ModeHandler* npmh;
+	CommandOjoin(Module* parent, ModeHandler& mode)
+		: SplitCommand(parent, "OJOIN", 1)
+		, npmh(&mode)
 	{
-		flags_needed = 'o'; Penalty = 0; syntax = "<channel>";
+		flags_needed = 'o'; syntax = "<channel>";
 		active = false;
 	}
 
@@ -58,23 +58,24 @@ class CommandOjoin : public SplitCommand
 
 			if (notice)
 			{
-				channel = ServerInstance->FindChan(parameters[0]);
-				channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s joined on official network business.",
-					parameters[0].c_str(), user->nick.c_str());
-				ServerInstance->PI->SendChannelNotice(channel, 0, user->nick + " joined on official network business.");
+				const std::string msg = user->nick + " joined on official network business.";
+				channel->WriteNotice(msg);
+				ServerInstance->PI->SendChannelNotice(channel, 0, msg);
 			}
 		}
 		else
 		{
+			channel = ServerInstance->FindChan(parameters[0]);
+			if (!channel)
+				return CMD_FAILURE;
+
 			ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN in "+parameters[0]);
 			// they're already in the channel
-			std::vector<std::string> modes;
-			modes.push_back(parameters[0]);
-			modes.push_back(op ? "+Yo" : "+Y");
-			modes.push_back(user->nick);
+			Modes::ChangeList changelist;
+			changelist.push_add(npmh, user->nick);
 			if (op)
-				modes.push_back(user->nick);
-			ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+				changelist.push_add(ServerInstance->Modes->FindMode('o', MODETYPE_CHANNEL), user->nick);
+			ServerInstance->Modes->Process(ServerInstance->FakeClient, channel, NULL, changelist);
 		}
 		return CMD_SUCCESS;
 	}
@@ -82,16 +83,13 @@ class CommandOjoin : public SplitCommand
 
 /** channel mode +Y
  */
-class NetworkPrefix : public ModeHandler
+class NetworkPrefix : public PrefixMode
 {
  public:
-	NetworkPrefix(Module* parent) : ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+	NetworkPrefix(Module* parent, char NPrefix)
+		: PrefixMode(parent, "official-join", 'Y', NETWORK_VALUE, NPrefix)
 	{
-		list = true;
-		prefix = NPrefix;
 		levelrequired = INT_MAX;
-		m_paramtype = TR_NICK;
-		prefixrank = NETWORK_VALUE;
 	}
 
 	ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -103,47 +101,27 @@ 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
 {
-	NetworkPrefix* np;
+	NetworkPrefix np;
 	CommandOjoin mycommand;
 
  public:
 
 	ModuleOjoin()
-		: np(NULL), mycommand(this)
+		: np(this, ServerInstance->Config->ConfValue("ojoin")->getString("prefix").c_str()[0])
+		, mycommand(this, np)
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		/* Load config stuff */
-		OnRehash(NULL);
-
-		/* Initialise module variables */
-		np = new NetworkPrefix(this);
-
-		ServerInstance->Modules->AddService(*np);
-		ServerInstance->Modules->AddService(mycommand);
-
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (mycommand.active)
 		{
-			privs += 'Y';
-			if (op)
+			privs += np.GetModeChar();
+			if (mycommand.op)
 				privs += 'o';
 			return MOD_RES_ALLOW;
 		}
@@ -151,44 +129,28 @@ 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");
-
-		if (!np)
-		{
-			// This is done on module load only
-			std::string npre = Conf->getString("prefix");
-			NPrefix = npre.empty() ? 0 : npre[0];
-
-			if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
-				throw ModuleException("Looks like the +Y prefix you picked for m_ojoin is already in use. Pick another.");
-		}
-
-		notice = Conf->getBool("notice", true);
-		op = Conf->getBool("op", true);
+		mycommand.notice = Conf->getBool("notice", true);
+		mycommand.op = Conf->getBool("op", true);
 	}
 
 	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
 	{
 		// Don't do anything if they're not +Y
-		if (!memb->hasMode('Y'))
+		if (!memb->HasMode(&np))
 			return MOD_RES_PASSTHRU;
 
 		// Let them do whatever they want to themselves.
 		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;
 	}
 
-	~ModuleOjoin()
-	{
-		delete np;
-	}
-
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST);
 	}