1 files changed, 13 insertions, 46 deletions

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 8f8d3ca90..ff92f3fae 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -45,28 +45,30 @@ bool op;
 
 /** Handle /OJOIN
  */
-class CommandOjoin : public Command
+class CommandOjoin : public SplitCommand
 {
  public:
 	bool active;
-	CommandOjoin(Module* parent) : Command(parent,"OJOIN", 1)
+	CommandOjoin(Module* parent) :
+		SplitCommand(parent, "OJOIN", 1)
 	{
 		flags_needed = 'o'; Penalty = 0; syntax = "<channel>";
 		active = false;
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
 	{
 		// Make sure the channel name is allowable.
-		if (!ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
+		if (!ServerInstance->IsChannel(parameters[0]))
 		{
-			user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long");
+			user->WriteNotice("*** Invalid characters in channel name or name too long");
 			return CMD_FAILURE;
 		}
 
 		active = true;
-		Channel* channel = Channel::JoinUser(user, parameters[0].c_str(), false, "", false);
+		// override is false because we want OnUserPreJoin to run
+		Channel* channel = Channel::JoinUser(user, parameters[0], false);
 		active = false;
 
 		if (channel)
@@ -110,45 +112,11 @@ class NetworkPrefix : public ModeHandler
 		m_paramtype = TR_NICK;
 	}
 
-	void RemoveMode(Channel* channel, irc::modestacker* stack)
-	{
-		const UserMembList* cl = channel->GetUsers();
-		std::vector<std::string> mode_junk;
-		mode_junk.push_back(channel->name);
-		irc::modestacker modestack(false);
-		std::deque<std::string> stackresult;
-
-		for (UserMembCIter i = cl->begin(); i != cl->end(); i++)
-		{
-			if (i->second->hasMode('Y'))
-			{
-				if (stack)
-					stack->Push(this->GetModeChar(), i->first->nick);
-				else
-					modestack.Push(this->GetModeChar(), i->first->nick);
-			}
-		}
-
-		if (stack)
-			return;
-
-		while (modestack.GetStackedLine(stackresult))
-		{
-			mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
-			ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
-			mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
-		}
-	}
-
 	unsigned int GetPrefixRank()
 	{
 		return NETWORK_VALUE;
 	}
 
-	void RemoveMode(User* user, irc::modestacker* stack)
-	{
-	}
-
 	ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
 	{
 		User* theuser = ServerInstance->FindNick(parameter);
@@ -178,7 +146,7 @@ class ModuleOjoin : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		/* Load config stuff */
 		OnRehash(NULL);
@@ -193,7 +161,7 @@ class ModuleOjoin : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (mycommand.active)
 		{
@@ -206,7 +174,7 @@ class ModuleOjoin : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin");
 
@@ -224,7 +192,7 @@ class ModuleOjoin : public Module
 		op = Conf->getBool("op", true);
 	}
 
-	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
+	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'))
@@ -248,11 +216,10 @@ class ModuleOjoin : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Network Business Join", VF_VENDOR);
 	}
 };
 
 MODULE_INIT(ModuleOjoin)
-